Bump version: 0.29.0.6 → 0.29.1

erepublik/__init__.py

@@ -4,7 +4,7 @@
 
 __author__ = """Eriks Karls"""
 __email__ = "eriks@72.lv"
-__version__ = "0.29.0"
+__version__ = "0.29.1"
 
 from erepublik.citizen import Citizen
 

erepublik/citizen.py

@@ -327,7 +327,7 @@ class BaseCitizen(access_points.CitizenAPI):
                 r"((?P<amount>\d+) item\(s\) )?[eE]xpires? on Day (?P<eday>\d,\d{3}), (?P<time>\d\d:\d\d)",
                 _expire_value,
             ).groupdict()
-            eday = utils.date_from_eday(int(_data["eday"].replace(",", "")))
+            eday = utils.date_from_eday(int(_data["eday"].replace(",", ""))).date()
             dt = constants.erep_tz.localize(datetime.combine(eday, time(*[int(_) for _ in _data["time"].split(":")])))
             return {"amount": _data.get("amount"), "expiration": dt}
 
@@ -2281,9 +2281,9 @@ class _Citizen(
                     if data and kind in self.config.auto_sell:
                         if kind in ["food", "weapon", "house", "airplane"]:
                             for quality, amount in data.items():
-                                self.sell_produced_product(kind, quality)
+                                self.sell_produced_product(kind, quality, int(data))
                         elif kind.endswith("Raw"):
-                            self.sell_produced_product(kind, 1)
+                            self.sell_produced_product(kind, 1, int(data))
                         else:
                             raise classes.ErepublikException(f"Unknown kind produced '{kind}'")
         elif self.config.auto_buy_raw and re.search(r"not_enough_[^_]*_raw", response.get("message")):

erepublik/classes.py

@@ -382,18 +382,20 @@ class MyCompanies:
                     return raw_factories.pop(-1)
             else:
                 if raw:
-                    raw += inv_raw.get(constants.INDUSTRIES[ids[1]], {}).get(0, {}).get("amount", 0.0)
+                    raw += Decimal(
+                        inv_raw.get(constants.INDUSTRIES[ids[1]], {}).get(0, {}).get("amount", Decimal("0.0"))
+                    )
                     if raw > 0:
                         to_remove = sorted(raw_factories, key=lambda c: (c.industry not in ids, c.raw_usage))
                         if to_remove:
-                            return raw_factories.remove(to_remove[0])
+                            return raw_factories.pop(raw_factories.index(to_remove[0]))
                     else:
                         to_remove = sorted(final_factories, key=lambda c: (c.industry != ids[0], c.raw_usage))
                         if to_remove:
-                            return final_factories.remove(to_remove[0])
+                            return final_factories.pop(final_factories.index(to_remove[0]))
 
-    def get_raw_usage_for_companies(self, *companies: Company) -> Tuple[float, float, float, float]:
-        frm = wrm = hrm = arm = 0.0
+    def get_raw_usage_for_companies(self, *companies: Company) -> Tuple[Decimal, Decimal, Decimal, Decimal]:
+        frm = wrm = hrm = arm = Decimal("0.00")
         for company in companies:
             if company.industry in self._frm_fab_ids:
                 frm += company.raw_usage

erepublik/constants.py

@@ -121,7 +121,6 @@ class Industries:
         14: "WRM q3",
         15: "WRM q4",
         16: "WRM q5",
-        17: "houseRaw",
         18: "houseRaw",
         19: "HRM q2",
         20: "HRM q3",

erepublik/utils.py

@@ -93,7 +93,7 @@ def eday_from_date(date: Union[datetime.date, datetime.datetime] = None) -> int:
     return (date - datetime.datetime(2007, 11, 20, 0, 0, 0)).days
 
 
-def date_from_eday(eday: int) -> datetime.date:
+def date_from_eday(eday: int) -> datetime.datetime:
     return localize_dt(datetime.date(2007, 11, 20)) + datetime.timedelta(days=eday)
 
 

setup.cfg

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

setup.py

@@ -49,6 +49,6 @@ setup(
     test_suite="tests",
     tests_require=test_requirements,
     url="https://github.com/eeriks/erepublik/",
-    version="0.29.0",
+    version="0.29.1",
     zip_safe=False,
 )

tests/test_erepublik_script.py

@@ -102,7 +102,8 @@ class TestErepublik(unittest.TestCase):
     #         self.citizen.my_companies.ff_lockdown = 160
     #         self.assertEqual(
     #             self.citizen.should_fight(),
-    #             (435, "Fight count modified (old count: 595 | FF: 595 | WAM ff_lockdown: 160 | New count: 435)", False),
+    #             (435, "Fight count modified (old count: 595 | FF: 595
+    #             | WAM ff_lockdown: 160 | New count: 435)", False),
     #         )
     #         self.citizen.my_companies.ff_lockdown = 0
     #
@@ -112,7 +113,8 @@ class TestErepublik(unittest.TestCase):
     #         self.citizen.my_companies.ff_lockdown = 160
     #         self.assertEqual(
     #             self.citizen.should_fight(),
-    #             (240, "Fight count modified (old count: 400 | FF: 400 | WAM ff_lockdown: 160 | New count: 240)", False),
+    #             (240, "Fight count modified (old count: 400 | FF: 400
+    #             | WAM ff_lockdown: 160 | New count: 240)", False),
     #         )
     #         self.citizen.my_companies.ff_lockdown = 0
     #         self.citizen.config.all_in = False
@@ -124,7 +126,8 @@ class TestErepublik(unittest.TestCase):
     #         self.citizen.my_companies.ff_lockdown = 160
     #         self.assertEqual(
     #             self.citizen.should_fight(),
-    #             (160, "Fight count modified (old count: 320 | FF: 400 | WAM ff_lockdown: 160 | New count: 160)", False),
+    #             (160, "Fight count modified (old count: 320 | FF: 400
+    #             | WAM ff_lockdown: 160 | New count: 160)", False),
     #         )
     #         self.citizen.my_companies.ff_lockdown = 0
     #         self.citizen.energy.limit = 3000