Bump version: 0.21.2.1 → 0.21.2.2

Makefile

@@ -88,9 +88,3 @@ dist: clean ## builds source and wheel package
 
 install: clean ## install the package to the active Python's site-packages
 	python setup.py install
-
-setcommit:
-	bash set_commit_id.sh
-# 	commit=`git log -1 --pretty=format:%h`
-# 	sed -i.bak -E "s|COMMIT_ID = \".+\"|COMMIT_ID = \"$(commit)\"|g" erepublik/utils.py
-# 	mv erepublik/utils.py.bak erepublik/utils.py

erepublik/__init__.py

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

erepublik/access_points.py

@@ -433,7 +433,7 @@ class ErepublikMilitaryAPI(CitizenBaseAPI):
 
 class ErepublikPoliticsAPI(CitizenBaseAPI):
     def _get_candidate_party(self, party_slug: str) -> Response:
-        return self.post(f"{self.url}/candidate/{party_slug}")
+        return self.get(f"{self.url}/candidate/{party_slug}")
 
     def _get_main_party_members(self, party_id: int) -> Response:
         return self.get(f"{self.url}/main/party-members/{party_id}")
@@ -448,6 +448,13 @@ class ErepublikPoliticsAPI(CitizenBaseAPI):
     def _get_presidential_elections(self, country_id: int, timestamp: int) -> Response:
         return self.get(f"{self.url}/main/presidential-elections/{country_id}/{timestamp}")
 
+    def _post_propose_president_candidate(self, party_slug: str, citizen_id: int) -> Response:
+        return self.post(f"{self.url}/propose-president-candidate/{party_slug}",
+                         data=dict(_token=self.token, citizen=citizen_id))
+
+    def _get_auto_propose_president_candidate(self, party_slug: str) -> Response:
+        return self.get(f"{self.url}/auto-propose-president-candidate/{party_slug}")
+
 
 class ErepublikPresidentAPI(CitizenBaseAPI):
     def _post_wars_attack_region(self, war_id: int, region_id: int, region_name: str) -> Response:

erepublik/citizen.py

@@ -1540,8 +1540,8 @@ class CitizenMilitary(CitizenTravel):
                         else:
                             ground_divs.append((medal.get('1').get('raw_value'), division))
 
-        air_divs.sort(key=lambda dmg, div: (dmg, div.start))
-        ground_divs.sort(key=lambda dmg, div: (dmg, div.start))
+        air_divs.sort(key=lambda z: (z[0],z[1].battle.start))
+        ground_divs.sort(key=lambda z:(z[0],z[1].battle.start))
         return {'air': air_divs, 'ground': ground_divs}
 
     @property

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.21.2
+current_version = 0.21.2.2
 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.21.2',
+    version='0.21.2.2',
     zip_safe=False,
 )