Bump version: 0.20.4 → 0.21.0

Merge branch 'master' of github.com:eeriks/erepublik
Typo
2020-07-11 09:39:25 +03:00 · 2020-07-11 09:38:20 +03:00 · 2020-07-11 09:37:22 +03:00 · 2020-07-10 17:13:15 +03:00 · 2020-07-10 17:09:28 +03:00 · 2020-07-10 17:08:58 +03:00
6 changed files with 13 additions and 11 deletions
--- a/erepublik/init.py
+++ b/erepublik/init.py
@ -4,7 +4,7 @@

 __author__ = """Eriks Karls"""
 __email__ = 'eriks@72.lv'
-__version__ = '0.20.3.9'
+__version__ = '0.21.0'

 from erepublik import classes, utils, constants
 from erepublik.citizen import Citizen
--- a/erepublik/citizen.py
+++ b/erepublik/citizen.py
@ -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

--- a/erepublik/constants.py
+++ b/erepublik/constants.py
@ -47,15 +47,17 @@ class Country:

 class Industries:
    __by_name = {'food': 1, 'weapons': 2, 'house': 4, 'aircraft': 23,
+                 'foodRaw': 7, 'weaponRaw': 12, 'weaponsRaw': 12, 'houseRaw': 18, 'aircraftRaw': 24,
+                 'frm': 7, 'wrm': 12, 'hrm': 18, 'arm': 24,
                 'frm q1': 7, 'frm q2': 8, 'frm q3': 9, 'frm q4': 10, 'frm q5': 11,
                 'wrm q1': 12, 'wrm q2': 13, 'wrm q3': 14, 'wrm q4': 15, 'wrm q5': 16,
                 'hrm q1': 18, 'hrm q2': 19, 'hrm q3': 20, 'hrm q4': 21, 'hrm q5': 22,
                 'arm q1': 24, 'arm q2': 25, 'arm q3': 26, 'arm q4': 27, 'arm q5': 28}
    __by_id = {1: "Food", 2: "Weapons", 4: "House", 23: "Aircraft",
-               7: "FRM q1", 8: "FRM q2", 9: "FRM q3", 10: "FRM q4", 11: "FRM q5",
-               12: "WRM q1", 13: "WRM q2", 14: "WRM q3", 15: "WRM q4", 16: "WRM q5",
-               18: "HRM q1", 19: "HRM q2", 20: "HRM q3", 21: "HRM q4", 22: "HRM q5",
-               24: "ARM q1", 25: "ARM q2", 26: "ARM q3", 27: "ARM q4", 28: "ARM q5"}
+               7: "foodRaw", 8: "FRM q2", 9: "FRM q3", 10: "FRM q4", 11: "FRM q5",
+               12: "weaponsRaw", 13: "WRM q2", 14: "WRM q3", 15: "WRM q4", 16: "WRM q5",
+               18: "houseRaw", 19: "HRM q2", 20: "HRM q3", 21: "HRM q4", 22: "HRM q5",
+               24: "aircraftRaw", 25: "ARM q2", 26: "ARM q3", 27: "ARM q4", 28: "ARM q5"}

    def __getitem__(self, item) -> Optional[Union[int, str]]:
        if isinstance(item, int):
@ -108,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'),
--- a/erepublik/utils.py
+++ b/erepublik/utils.py
@ -184,7 +184,7 @@ def send_email(name: str, content: List[Any], player=None, local_vars: Mapping[A
    from erepublik import Citizen

    file_content_template = "<html><head><title>{title}</title></head><body>{body}</body></html>"
-    if isinstance(player, Citizen):
+    if isinstance(player, Citizen) and player.r:
        resp = write_request(player.r, is_error=True)
    else:
        resp = {"name": "None.html", "mimetype": "text/html",
--- a/setup.cfg
+++ b/setup.cfg
@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.20.3.9
+current_version = 0.21.0
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\.?(?P<dev>\d+)?
--- a/setup.py
+++ b/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.9',
+    version='0.21.0',
    zip_safe=False,
 )
Author	SHA1	Message	Date
Eriks K	a45dd7e0c3	Bump version: 0.20.4 → 0.21.0	2020-07-11 09:39:25 +03:00
Eriks K	316a826c93	Merge branch 'master' of github.com:eeriks/erepublik	2020-07-11 09:38:20 +03:00
Eriks Karls	c9710733e2	Typo	2020-07-11 09:37:22 +03:00
Eriks K	9e678d6b51	Bump version: 0.20.3.11 → 0.20.4	2020-07-10 17:13:15 +03:00
Eriks K	88517cb076	Bugfix	2020-07-10 17:09:28 +03:00
Eriks K	01c8aef012	Bugfix: South Africa link	2020-07-10 17:08:58 +03:00
Eriks K	d7ac66bd69	Bump version: 0.20.3.10 → 0.20.3.11	2020-07-10 12:16:53 +03:00
Eriks K	e8739caca1	fix	2020-07-10 12:16:18 +03:00
Eriks K	9df9c1cd87	Bump version: 0.20.3.9 → 0.20.3.10	2020-07-10 00:47:42 +03:00
Eriks K	1b004f163a	bugfix	2020-07-10 00:47:36 +03:00