Bump version: 0.23.3.1 → 0.23.3.2

erepublik/__init__.py

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

erepublik/access_points.py

@@ -16,13 +16,9 @@ class SlowRequests(Session):
     uas: List[str] = [
         # Chrome
         'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.183 Safari/537.36',
-        # noqa
         'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.125 Safari/537.36',
-        # noqa
         'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36',
-        # noqa
         'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.106 Safari/537.36',
-        # noqa
         'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.183 Safari/537.36',
         'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.125 Safari/537.36',
         'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36',

erepublik/citizen.py

@@ -1863,7 +1863,18 @@ class CitizenMilitary(CitizenTravel):
                     self.travel_to_battle(battle, countries)
                 err = True
         elif r_json.get("message") == "ENEMY_KILLED":
-            hits = (self.energy.recovered - r_json["details"]["wellness"]) // 10
+            # Non-InfantryKit players
+            if r_json['user']['earnedXp']:
+                hits = r_json['user']['earnedXp']
+            # InfantryKit player
+            # The almost always safe way (breaks on levelup hit)
+            elif self.energy.recovered >= r_json["details"]["wellness"]:  # Haven't reached levelup
+                hits = (self.energy.recovered - r_json["details"]["wellness"]) // 10
+            else:
+                hits = r_json['hits']
+                if r_json['user']['epicBattle']:
+                    hits /= 1+r_json['user']['epicBattle']
+
             self.energy.recovered = r_json["details"]["wellness"]
             self.details.xp = int(r_json["details"]["points"])
             damage = r_json["user"]["givenDamage"] * (1.1 if r_json["oldEnemy"]["isNatural"] else 1)
@@ -1905,9 +1916,10 @@ class CitizenMilitary(CitizenTravel):
                         battle.defender.country] + battle.invader.deployed + battle.defender.deployed
             if self.details.current_country not in involved:
                 count = 0
+        side = battle.invader if inv_side else battle.defender
         errors = deployed_count = 0
         while (not deployed_count == count) and errors < 10:
-            r = self._post_military_deploy_bomb(battle.id, division.id, bomb_id).json()
+            r = self._post_military_deploy_bomb(battle.id, division.id, side.id, bomb_id).json()
             if not r.get('error'):
                 deployed_count += 1
             elif r.get('message') == 'LOCKED':

erepublik/classes.py

@@ -10,6 +10,7 @@ from requests import Response, Session, post
 from . import utils, constants
 
 __all__ = ['Battle', 'BattleDivision', 'BattleSide', 'Company', 'Config', 'Details', 'Energy', 'ErepublikException',
+           'ErepublikNetworkException', 'EnergyToFight',
            'Holding', 'MyCompanies', 'MyJSONEncoder', 'OfferItem', 'Politics', 'Reporter', 'TelegramReporter']
 
 

erepublik/utils.py

@@ -21,10 +21,10 @@ try:
 except ImportError:
     import json
 
-__all__ = ['VERSION', 'calculate_hit', 'caught_error', 'date_from_eday', 'eday_from_date',
+__all__ = ['VERSION', 'calculate_hit', 'caught_error', 'date_from_eday', 'eday_from_date', 'deprecation',
            'get_air_hit_dmg_value', 'get_file', 'get_ground_hit_dmg_value', 'get_sleep_seconds', 'good_timedelta',
            'interactive_sleep', 'json', 'localize_dt', 'localize_timestamp', 'normalize_html_json', 'now',
-           'process_error', 'process_warning', 'send_email', 'silent_sleep', 'slugify', 'write_file',
+           'process_error', 'process_warning', 'send_email', 'silent_sleep', 'slugify', 'write_file', 'write_request',
            'write_interactive_log', 'write_silent_log', 'get_final_hit_dmg', 'wait_for_lock']
 
 if not sys.version_info >= (3, 6):

requirements_dev.txt

@@ -4,16 +4,16 @@ edx-sphinx-theme==1.5.0
 flake8==3.8.4
 ipython>=7.19.0
 isort==5.6.4
-pip==20.3
+pip==20.3.1
 PyInstaller==4.1
 pytz==2020.4
 pytest==6.1.2
 responses==0.12.1
-setuptools==50.3.2
+setuptools==51.0.0
 Sphinx==3.3.1
 requests==2.25.0
 PySocks==1.7.1
 tox==3.20.1
 twine==3.2.0
-watchdog==0.10.4
+watchdog==1.0.0
-wheel==0.35.1
+wheel==0.36.1

setup.cfg

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

setup.py

@@ -45,11 +45,11 @@ setup(
     keywords='erepublik',
     name='eRepublik',
     packages=find_packages(include=['erepublik']),
-    python_requires='>=3.6, <4',
+    python_requires='>=3.7, <4',
     setup_requires=setup_requirements,
     test_suite='tests',
     tests_require=test_requirements,
     url='https://github.com/eeriks/erepublik/',
-    version='0.23.3',
+    version='0.23.3.2',
     zip_safe=False,
 )