Compare commits
3 Commits
v0.20.3.11
...
v0.20.4
Author | SHA1 | Date | |
---|---|---|---|
9e678d6b51 | |||
88517cb076 | |||
01c8aef012 |
@ -4,7 +4,7 @@
|
||||
|
||||
__author__ = """Eriks Karls"""
|
||||
__email__ = 'eriks@72.lv'
|
||||
__version__ = '0.20.3.11'
|
||||
__version__ = '0.20.4'
|
||||
|
||||
from erepublik import classes, utils, constants
|
||||
from erepublik.citizen import Citizen
|
||||
|
@ -1757,7 +1757,7 @@ class CitizenMilitary(CitizenTravel):
|
||||
if not rang or elite is None:
|
||||
r = self._get_main_citizen_profile_json(self.details.citizen_id).json()
|
||||
if not rang:
|
||||
rang = r['military']['militaryData']['air']['rankNumber']
|
||||
rang = r['military']['militaryData']['aircraft']['rankNumber']
|
||||
if elite is None:
|
||||
elite = r['citizenAttributes']['level'] > 100
|
||||
|
||||
|
@ -110,7 +110,7 @@ COUNTRIES: Dict[int, Country] = {
|
||||
44: Country(44, 'Greece', 'Greece', 'GRC'), 45: Country(45, 'Japan', 'Japan', 'JPN'),
|
||||
47: Country(47, 'South Korea', 'South-Korea', 'KOR'), 48: Country(48, 'India', 'India', 'IND'),
|
||||
49: Country(49, 'Indonesia', 'Indonesia', 'IDN'), 50: Country(50, 'Australia', 'Australia', 'AUS'),
|
||||
51: Country(51, 'South Africa', 'South Africa', 'ZAF'),
|
||||
51: Country(51, 'South Africa', 'South-Africa', 'ZAF'),
|
||||
52: Country(52, 'Republic of Moldova', 'Republic-of-Moldova', 'MDA'),
|
||||
53: Country(53, 'Portugal', 'Portugal', 'PRT'), 54: Country(54, 'Ireland', 'Ireland', 'IRL'),
|
||||
55: Country(55, 'Denmark', 'Denmark', 'DNK'), 56: Country(56, 'Iran', 'Iran', 'IRN'),
|
||||
|
@ -1,5 +1,5 @@
|
||||
[bumpversion]
|
||||
current_version = 0.20.3.11
|
||||
current_version = 0.20.4
|
||||
commit = True
|
||||
tag = True
|
||||
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\.?(?P<dev>\d+)?
|
||||
|
4
setup.py
4
setup.py
@ -11,7 +11,7 @@ with open('README.rst') as readme_file:
|
||||
with open('HISTORY.rst') as history_file:
|
||||
history = history_file.read()
|
||||
|
||||
requirements = ['pytz==2020.1', 'requests==2.23.0']
|
||||
requirements = ['pytz==2020.1', 'requests==2.24.0']
|
||||
|
||||
setup_requirements = []
|
||||
|
||||
@ -43,6 +43,6 @@ setup(
|
||||
test_suite='tests',
|
||||
tests_require=test_requirements,
|
||||
url='https://github.com/eeriks/erepublik/',
|
||||
version='0.20.3.11',
|
||||
version='0.20.4',
|
||||
zip_safe=False,
|
||||
)
|
||||
|
Reference in New Issue
Block a user