From 3479a7c3b197e68db1faa66ce56e2980d29cc872 Mon Sep 17 00:00:00 2001 From: Eriks K Date: Tue, 1 Feb 2022 22:35:12 +0200 Subject: [PATCH] Bugfix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump version: 0.29.0 → 0.29.0.1 Bugfixes Bump version: 0.29.0.1 → 0.29.0.2 bugfix --- erepublik/__init__.py | 2 +- erepublik/classes.py | 6 +++--- setup.cfg | 2 +- setup.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/erepublik/__init__.py b/erepublik/__init__.py index 51ce329..bf5ace7 100644 --- a/erepublik/__init__.py +++ b/erepublik/__init__.py @@ -4,7 +4,7 @@ __author__ = """Eriks Karls""" __email__ = "eriks@72.lv" -__version__ = "0.29.0" +__version__ = "0.29.0.2" from erepublik.citizen import Citizen diff --git a/erepublik/classes.py b/erepublik/classes.py index d12dc31..4c13436 100644 --- a/erepublik/classes.py +++ b/erepublik/classes.py @@ -382,7 +382,7 @@ 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 += 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: @@ -392,8 +392,8 @@ class MyCompanies: if to_remove: return final_factories.remove(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 diff --git a/setup.cfg b/setup.cfg index dac338a..9542c40 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.29.0 +current_version = 0.29.0.2 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)\.?(?P\d+)? diff --git a/setup.py b/setup.py index bce33bb..4fd4dc7 100644 --- a/setup.py +++ b/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.0.2", zip_safe=False, )