Compare commits

..

No commits in common. "master" and "v0.29.2.2" have entirely different histories.

4 changed files with 5 additions and 7 deletions

View File

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

View File

@ -412,10 +412,8 @@ class MyCompanies:
return (c for c in self._companies) return (c for c in self._companies)
def get_wam_holdings(self) -> Generator[Holding, None, None]: def get_wam_holdings(self) -> Generator[Holding, None, None]:
for holding in sorted( for holding in sorted(self.holdings.values(), key=lambda h: (-len(h.get_wam_companies(False)), -len(h.get_wam_companies()))):
self.holdings.values(), key=lambda h: (-len(h.get_wam_companies(False)), -len(h.get_wam_companies()))
):
yield holding
def __str__(self): def __str__(self):
return f"MyCompanies: {sum(1 for _ in self.companies)} companies in {len(self.holdings)} holdings" return f"MyCompanies: {sum(1 for _ in self.companies)} companies in {len(self.holdings)} holdings"

View File

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

View File

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