Bump version: 0.22.1.5 → 0.22.2

HISTORY.rst

@@ -2,6 +2,11 @@
 History
 =======
 
+0.22.2 (2020-11-9)
+-------------------
+* Allow querying market offers for q2-q5 aircrafts
+* Added "Ticket" industry
+
 0.22.1 (2020-11-4)
 -------------------
 * Requirement update

erepublik/__init__.py

@@ -4,7 +4,7 @@
 
 __author__ = """Eriks Karls"""
 __email__ = 'eriks@72.lv'
-__version__ = '0.22.1.5'
+__version__ = '0.22.2'
 
 from erepublik import classes, utils, constants
 from erepublik.citizen import Citizen

erepublik/citizen.py

@@ -1151,7 +1151,8 @@ class CitizenEconomy(CitizenTravel):
         self, product_name: str, quality: int = None, country: constants.Country = None
     ) -> Dict[str, classes.OfferItem]:
         raw_short_names = dict(frm="foodRaw", wrm="weaponRaw", hrm="houseRaw", arm="airplaneRaw")
-        q1_industries = ["aircraft"] + list(raw_short_names.values())
+        q1_industries = list(raw_short_names.values())
+        q5_industries = ['house', 'aircraft', 'ticket']
         if product_name in raw_short_names:
             quality = 1
             product_name = raw_short_names[product_name]
@@ -1165,7 +1166,7 @@ class CitizenEconomy(CitizenTravel):
         if quality:
             offers[f"q{quality}"] = classes.OfferItem()
         else:
-            max_quality = 1 if product_name in q1_industries else 5 if product_name.lower() == 'house' else 7
+            max_quality = 1 if product_name in q1_industries else 5 if product_name.lower() in q5_industries else 7
             for q in range(max_quality):
                 offers[f"q{q + 1}"] = classes.OfferItem()
 

erepublik/constants.py

@@ -53,14 +53,14 @@ class Country:
 
 
 class Industries:
-    __by_name = {'food': 1, 'weapon': 2, 'house': 4, 'aircraft': 23,
+    __by_name = {'food': 1, 'weapon': 2, 'ticket':3, 'house': 4, 'aircraft': 23,
                  'foodraw': 7, 'weaponraw': 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: "Weapon", 4: "House", 23: "Aircraft",
+    __by_id = {1: "Food", 2: "Weapon", 3: "Ticket", 4: "House", 23: "Aircraft",
                7: "foodRaw", 8: "FRM q2", 9: "FRM q3", 10: "FRM q4", 11: "FRM q5",
                12: "weaponRaw", 13: "WRM q2", 14: "WRM q3", 15: "WRM q4", 16: "WRM q5",
                17: "houseRaw", 18: "houseRaw", 19: "HRM q2", 20: "HRM q3", 21: "HRM q4", 22: "HRM q5",

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.22.1.5
+current_version = 0.22.2
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\.?(?P<dev>\d+)?

setup.py

@@ -20,7 +20,7 @@ requirements = [
 setup_requirements = []
 
 test_requirements = [
-    "pytest==6.1.0",
+    "pytest==6.1.2",
     "responses==0.12.0"
 ]
 
@@ -50,6 +50,6 @@ setup(
     test_suite='tests',
     tests_require=test_requirements,
     url='https://github.com/eeriks/erepublik/',
-    version='0.22.1.5',
+    version='0.22.2',
     zip_safe=False,
 )