dh1tw/pyhamtools
1
0
Fork 0
mirror of https://github.com/dh1tw/pyhamtools.git synced 2026-02-28 02:14:27 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

updated tests and fixtures. Changed Macedonia to North Macedonia

Browse source
This commit is contained in:
Tobias Wellnitz, DH1TW 2019-05-30 14:24:22 +02:00
parent a4cfdd0dd1
commit 492b281a55
11 changed files with 32667 additions and 13711 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitignore vendored
View file

@ -1,3 +1,7 @@
docs/build
settings.json
apikeysrc
apikeysrc
coverage*
.coverage
.cache/*
MANIFEST

9
docs/source/changelog.rst
View file

@ -1,6 +1,15 @@
Changelog
---------
PyHamTools 0.7.2
================
01. June 2019
* Changed Macedonia to North Macedonia
* Updated test fixtures
* bumped dependencies to current versions
PyHamTools 0.7.1
================

2
pyhamtools/countryfilemapping.json
View file

@ -350,7 +350,7 @@
"Johnston Island": 123,
"Mayotte": 169,
"New Caledonia": 162,
"Macedonia": 502,
"North Macedonia": 502,
"Crete": 40,
"Myanmar": 309,
"Tunisia": 474,

2
pyhamtools/version.py
View file

@ -1,3 +1,3 @@
VERSION = (0, 7, 1)
VERSION = (0, 7, 2)
__release__ = ''.join(['-.'[type(x) == int]+str(x) for x in VERSION])[1:]
__version__ = '.'.join((str(VERSION[0]), str(VERSION[1])))

10
setup.py
View file

@ -16,12 +16,12 @@ setup(name='pyhamtools',
package_data={'': ['countryfilemapping.json']},
packages=['pyhamtools'],
install_requires=[
"pytz>=2017.3",
"requests>=2.18.4",
"pytz>=2019.1",
"requests>=2.22.0",
"pyephem>=3.7.6.0",
"beautifulsoup4>=4.6.0",
"future>=0.16.0",
"redis>=2.10.6",
"beautifulsoup4>=4.7.1",
"future>=0.17.1",
"redis>=2.22.0",
],
**kw
)

9831
test/fixtures/cty.plist vendored
View file

File diff suppressed because it is too large Load diff

36402
test/fixtures/cty.xml vendored
View file

File diff suppressed because it is too large Load diff

4
test/test_callinfo.py
View file

@ -124,8 +124,8 @@ response_Exception_VP8STI_with_start_and_stop_date = {
'adif': 240,
'country': u'SOUTH SANDWICH ISLANDS',
'continent': u'SA',
'latitude': -59.45,
'longitude': -27.4,
'latitude': -59.48,
'longitude': -27.29,
'cqz': 13,
}

4
test/test_lookuplib_clublogxml.py
View file

@ -46,8 +46,8 @@ response_Exception_VK9XX_with_end_date = {
'adif': 35,
'country': u'CHRISTMAS ISLAND',
'continent': u'OC',
'latitude': -10.50,
'longitude': 105.70,
'latitude': -10.40,
'longitude': 105.71,
'cqz': 29,
}

104
test/test_lookuplib_qrz.py
View file

@ -20,71 +20,30 @@ except Exception:
#Fixtures
#===========================================================
response_XX2XX = {
u'adif': 446,
u'bio': u'349',
u'biodate': datetime(2017, 9, 5, 22, 28, 42, tzinfo=UTC),
u'born': 1932,
u'callsign': u'XX2XX',
u'ccode': 1230,
u'codes': u'ZZ',
u'country': u'Temotu',
u'cqz': 4,
u'email': 'dummy2@qrz.com',
u'eqsl': False,
u'fname': u'Gooberd',
u'geoloc': u'grid',
u'image': u'https://s3.amazonaws.com/files.qrz.com/x/xx2xx/oval_bumper_sticker4.png',
u'imageinfo': u'285:500:44218',
u'iota': u'NA-022',
u'ituz': 5,
u'land': u'Morocco',
u'latitude': 52.1875,
u'license_class': u'A',
u'locator': u'JO02be',
u'longitude': 0.125,
u'lotw': False,
u'moddate': datetime(2017, 6, 16, 19, 22, 21, tzinfo=UTC),
u'mqsl': False,
u'name': u'Blufferd',
u'qslmgr': u'nobody here. gone fishing, permanently',
u'state': u'mt',
u'user': u'XX1XX',
u'zipcode': u'112233'
}
response_XX3XX = {
u'addr1': u'1234 Main St.3',
u'addr2': u'Shady Circle Roads',
u'adif': 79,
u'aliases': [u'XX3XX/W7'],
u'bio': u'16',
u'biodate': datetime(2018, 1, 24, 20, 55, 27, tzinfo=UTC),
u'born': 2010,
u'callsign': u'XX3XX',
u'ccode': 130,
u'country': u'Jamaica',
u'email': u'fred@qrz.com',
u'eqsl': False,
u'fname': u'TEST CALLSIGN',
u'geoloc': u'user',
u'image': u'https://s3.amazonaws.com/files.qrz.com/x/xx3xx/oval_bumper_sticker_600.png',
u'imageinfo': u'600:600:87971',
u'land': u'Guadeloupe',
u'latitude': 51.396953,
u'license_class': u'3',
u'locator': u'FO51sj',
u'longitude': -68.41959,
u'lotw': False,
u'moddate': datetime(2016, 4, 21, 19, 19, 6, tzinfo=UTC),
u'mqsl': False,
u'name': u'DO NOT QSL',
u'qslmgr': u'Via BURO or AA7BQ',
u'state': u'JJ',
# u'user': u'KF7WIS',
u'zipcode': u'00033'
}
response_1A1AB = {
u'biodate': datetime(2018, 9, 7, 21, 17, 7, tzinfo=UTC),
u'bio': u'0',
u'license_class': u'C',
u'moddate': datetime(2008, 11, 2, 15, 0, 38, tzinfo=UTC),
u'locator': u'JN61fw',
u'callsign': u'1A1AB',
u'addr2': u'00187 Rome',
u'user': u'1A1AB',
u'adif': 246,
u'addr1': u'Via Condotti, 68',
u'mqsl': True,
u'ccode': 128,
u'land': u'SMO Malta',
u'codes': u'HVB',
u'name': u'Morgan',
u'geoloc': u'user',
u'country': u'Italy',
u'lotw': True,
u'longitude': 12.456779,
u'eqsl': True,
u'fname': u'Jonas',
u'latitude': 41.94417
}
response_333 = {
const.COUNTRY: u'Iraq',
@ -126,20 +85,15 @@ class TestQrz_Callsign_Lookup:
def test_lookup_callsign(self, fix_qrz):
data = fix_qrz._lookup_qrz_callsign("XX2XX", fix_qrz._apikey)
data = fix_qrz._lookup_qrz_callsign("1A1AB", fix_qrz._apikey)
data.pop('u_views', None)
assert data == response_XX2XX
assert len(data) == len(response_XX2XX)
data = fix_qrz._lookup_qrz_callsign("XX3XX", fix_qrz._apikey)
data.pop('u_views', None)
assert data == response_XX3XX
assert len(data) == len(response_XX3XX)
assert data == response_1A1AB
assert len(data) == len(response_1A1AB)
def test_lookup_callsign_with_unicode_escaping(self, fix_qrz):
data = fix_qrz._lookup_qrz_callsign("XX2XX", fix_qrz._apikey)
data = fix_qrz._lookup_qrz_callsign("1A1AB", fix_qrz._apikey)
data.pop('u_views', None)
assert data == response_XX2XX
assert data == response_1A1AB
def test_lookup_callsign_does_not_exist(self, fix_qrz):
with pytest.raises(KeyError):

4
test/test_lookuplib_redis.py
View file

@ -17,8 +17,8 @@ response_Exception_VP8STI_with_start_and_stop_date = {
'adif': 240,
'country': u'SOUTH SANDWICH ISLANDS',
'continent': u'SA',
'latitude': -59.45,
'longitude': -27.4,
'latitude': -59.48,
'longitude': -27.29,
'cqz': 13,
}