Bump version: 0.20.3.3 → 0.20.3.4

erepublik/__init__.py

@@ -4,8 +4,8 @@
 
 __author__ = """Eriks Karls"""
 __email__ = 'eriks@72.lv'
-__version__ = '0.20.3.2'
-__commit_id__ = "0061503"
+__version__ = '0.20.3.4'
+__commit_id__ = "8ce56a3"
 
 from erepublik import classes, utils
 from erepublik.citizen import Citizen

erepublik/citizen.py

@@ -763,9 +763,10 @@ class CitizenTravel(BaseCitizen):
         if data.get('alreadyInRegion'):
             return True
         else:
-            r_json = self._travel(data.get('preselectCountryId'), region_id).json()
+            country = COUNTRIES[data.get('preselectCountryId')]
+            r_json = self._travel(country, region_id).json()
             if r_json.get('message', '') == 'success':
-                self._update_citizen_location(data.get('preselectCountryId'), region_id)
+                self._update_citizen_location(country, region_id)
                 self._report_action("TRAVEL", "Traveled to region", response=r_json)
                 return True
             return False
@@ -848,8 +849,9 @@ class CitizenCompanies(BaseCitizen):
             fin_factories = wam_holding.get_wam_companies(raw_factory=False)
 
             free_inventory = self.inventory["total"] - self.inventory["used"]
-            wam_list = [raw_factories + fin_factories][:self.energy.food_fights]
-            while wam_list and free_inventory < self.my_companies.get_needed_inventory_usage(companies=wam_list):
+            wam_list = raw_factories + fin_factories
+            wam_list = wam_list[:self.energy.food_fights]
+            while wam_list and free_inventory < self.my_companies.get_needed_inventory_usage(wam_list):
                 wam_list.pop(-1)
 
         if wam_list:

setup.cfg

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

setup.py

@@ -43,6 +43,6 @@ setup(
     test_suite='tests',
     tests_require=test_requirements,
     url='https://github.com/eeriks/erepublik/',
-    version='0.20.3.2',
+    version='0.20.3.4',
     zip_safe=False,
 )