Bump version: 0.27.2 → 0.28.0

fix

.flake8

@@ -0,0 +1,5 @@
+[flake8]
+ignore = E203,E722
+exclude = .git,__pycache__,venv,docs,debug,log
+max-line-length = 120
+#max-complexity = 10

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,71 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '16 0 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'python' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/pythonpackage.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8]
+        python-version: [3.8, 3.9]
 
     steps:
     - uses: actions/checkout@v2

CONTRIBUTING.rst

@@ -58,10 +58,10 @@ Ready to contribute? Here's how to set up `erepublik` for local development.
 
     $ git clone git@github.com:your_name_here/erepublik.git
 
-3. Install your local copy into a virtualenv. Assuming you have virtualenvwrapper installed, this is how you set up your fork for local development::
+3. This is how you set up your fork for local development::
 
-    $ mkvirtualenv erepublik
     $ cd erepublik/
+    $ python3 -m venv venv
     $ python setup.py develop
 
 4. Create a branch for local development::
@@ -73,8 +73,7 @@ Ready to contribute? Here's how to set up `erepublik` for local development.
 5. When you're done making changes, check that your changes pass flake8, isort and the
    tests::
 
-    $ flake8 erepublik tests
+    $ make lint
-    $ isort erepublik
     $ python setup.py test
 
    To get flake8 and isort, just pip install them into your virtualenv.
@@ -115,8 +114,6 @@ A reminder for the maintainers on how to deploy.
 Make sure all your changes are committed (including an entry in HISTORY.rst).
 Then run::
 
-$ bumpversion patch # possible: major / minor / patch
+$ bumpversion patch # possible: major / minor / patch / dev
 $ git push
 $ git push --tags
-
-Travis will then deploy to PyPI if tests pass.

Makefile

@@ -52,8 +52,9 @@ clean-test: ## remove test and coverage artifacts
 	rm -fr .pytest_cache
 
 lint: ## check style with flake8
-	black erepublik tests
+	isort erepublik examples tests
-	flake8 erepublik tests
+	black erepublik examples tests
+	flake8 erepublik examples tests
 
 test: ## run tests quickly with the default Python
 	python -m unittest

docs/conf.py

@@ -23,9 +23,12 @@ import sys
 
 sys.path.insert(0, os.path.abspath(".."))
 
-import erepublik
+import datetime
+
 import edx_theme
 
+import erepublik
+
 # -- General configuration ---------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
@@ -50,7 +53,7 @@ master_doc = "index"
 
 # General information about the project.
 project = "eRepublik script"
-copyright = "2019, Eriks Karls"
+copyright = "2017-%i, Eriks Karls" % datetime.date.today().year
 author = "Eriks Karls"
 
 # The version info for the project you're documenting, acts as replacement
@@ -145,5 +148,13 @@ man_pages = [(master_doc, "erepublik", "eRepublik script Documentation", [author
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, "erepublik", "eRepublik script Documentation", author, "erepublik", "One line description of project.", "Miscellaneous"),
+    (
+        master_doc,
+        "erepublik",
+        "eRepublik script Documentation",
+        author,
+        "erepublik",
+        "One line description of project.",
+        "Miscellaneous",
+    ),
 ]

docs/erepublik.rst

@@ -44,14 +44,6 @@ erepublik.utils module
    :undoc-members:
    :show-inheritance:
 
-erepublik.ws module
--------------------
-
-.. automodule:: erepublik.ws
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 Module contents
 ---------------
 

docs/index.html

@@ -8,12 +8,10 @@
     <meta name="generator" content="Jekyll v4.0.1">
     <title>eBot configuration</title>
     <!-- CSS only -->
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css" integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/css/bootstrap.min.css" integrity="sha384-B0vP5xmATw1+K9KRQjQERJvTumQW0nPEzvF6L/Z6nronJ3oUOFUFpCjEUQouq2+l" crossorigin="anonymous">
-
     <!-- JS, Popper.js, and jQuery -->
     <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-Piv4xVNRyMGpqkS2by6br4gNJ7DXjqk09RmUpJ8jgGtD7zP9yug3goQfGII0yAns" crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/js/bootstrap.min.js" integrity="sha384-w1Q4orYjBQndcko6MimVbzY0tgp4pWB4lZ7lr30WKz0vr/aWKhXdBNmNb5D92v7s" crossorigin="anonymous"></script>
 </head>
 <body>
 <div class="container">
@@ -120,57 +118,57 @@
                     </div>
 
                     <div class="col-12 col-sm-6">
-                        <h3>Fighting</h3>
+                        <h3><span style="text-decoration: line-through;">Fighting</span></h3>
                         <div class="form-group">
                             <div class="custom-control custom-switch">
-                                <input type="checkbox" class="custom-control-input" onchange="updateJson()" id="fight" checked>
+                                <input type="checkbox" class="custom-control-input" onchange="updateJson()" id="fight" disabled>
                                 <label class="custom-control-label" for="fight">Fight</label>
                             </div>
                             <div class="custom-control custom-switch custom-control-inline">
-                                <input type="checkbox" class="custom-control-input" onchange="updateJson()" id="air" checked>
+                                <input type="checkbox" class="custom-control-input" onchange="updateJson()" id="air" disabled>
                                 <label class="custom-control-label" for="air">Air</label>
                             </div>
                             <div class="custom-control custom-switch custom-control-inline">
-                                <input type="checkbox" class="custom-control-input" onchange="updateJson()" id="ground">
+                                <input type="checkbox" class="custom-control-input" onchange="updateJson()" id="ground" disabled>
                                 <label class="custom-control-label" for="ground">Ground</label>
                             </div>
                             <div class="custom-control custom-switch">
-                                <input type="checkbox" class="custom-control-input" onchange="updateJson()" id="boosters">
+                                <input type="checkbox" class="custom-control-input" onchange="updateJson()" id="boosters" disabled>
                                 <label class="custom-control-label" for="boosters">Use ground boosters</label>
                             </div>
                             <div class="custom-control custom-switch">
-                                <input type="checkbox" class="custom-control-input" onchange="updateJson()" id="continuous_fighting">
+                                <input type="checkbox" class="custom-control-input" onchange="updateJson()" id="continuous_fighting" disabled>
                                 <label class="custom-control-label" for="continuous_fighting">Continue fighting all FF in round</label>
                             </div>
                             <div class="custom-control custom-switch">
-                                <input type="checkbox" class="custom-control-input" onchange="updateJson()" id="next_energy" checked>
+                                <input type="checkbox" class="custom-control-input" onchange="updateJson()" id="next_energy" disabled>
                                 <label class="custom-control-label" for="next_energy">Fight for next WC +1hp/6min if reachable by FF</label>
                             </div>
                         </div>
                         <div class="form-group">
                             <div class="form-check form-check-inline">
-                                <input type="radio" class="form-check-input" onchange="updateJson()" id="all_in" name="fight_amount" value="all_in">
+                                <input type="radio" class="form-check-input" onchange="updateJson()" id="all_in" name="fight_amount" value="all_in" disabled>
                                 <label class="form-check-label" for="all_in">All energy</label>
                             </div>
                             <div class="form-check form-check-inline">
-                                <input type="radio" class="form-check-input" onchange="updateJson()" id="h_energy" name="fight_amount" value="h_energy" checked>
+                                <input type="radio" class="form-check-input" onchange="updateJson()" id="h_energy" name="fight_amount" value="h_energy"  disabled>
                                 <label class="form-check-label" for="h_energy">1h energy</label>
                             </div>
                         </div>
                         <div class="custom-control custom-switch">
-                            <input type="checkbox" class="custom-control-input" onchange="updateJson()" id="rw_def_side" checked>
+                            <input type="checkbox" class="custom-control-input" onchange="updateJson()" id="rw_def_side" disabled>
                             <label class="custom-control-label" for="rw_def_side">In RWs fight on right side (occupier/defender)</label>
                         </div>
                         <div class="custom-control custom-switch">
-                            <input type="checkbox" class="custom-control-input" onchange="updateJson()" id="travel_to_fight" checked>
+                            <input type="checkbox" class="custom-control-input" onchange="updateJson()" id="travel_to_fight" disabled>
                             <label class="custom-control-label" for="travel_to_fight">Travel to fight</label>
                         </div>
                         <div class="custom-control custom-switch">
-                            <input type="checkbox" class="custom-control-input" onchange="updateJson()" id="epic_hunt">
+                            <input type="checkbox" class="custom-control-input" onchange="updateJson()" id="epic_hunt" disabled>
                             <label class="custom-control-label" for="epic_hunt">Hunt epics</label>
                         </div>
                         <div class="custom-control custom-switch">
-                            <input type="checkbox" class="custom-control-input" onchange="updateJson()" id="epic_hunt_ebs">
+                            <input type="checkbox" class="custom-control-input" onchange="updateJson()" id="epic_hunt_ebs" disabled>
                             <label class="custom-control-label" for="epic_hunt_ebs">Spend <small>[all]</small> EBs in epics</label>
                         </div>
                     </div>
@@ -262,7 +260,13 @@
             </form>
         </div>
         <div class="col-12">
-            <pre id="json-output"></pre>
+            <div class="card">
+                <div class="card-body">
+                    <h5 class="card-title">config.json</h5>
+                    <h6 class="card-subtitle mb-2 text-muted">Copy-paste the content below into 'config.json' file</h6>
+                    <pre id="json-output" class="bg-light card-text"></pre>
+                </div>
+            </div>
         </div>
     </div>
 </div>

erepublik/__init__.py

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

erepublik/_logging.py

@@ -133,7 +133,9 @@ class ErepublikErrorHTTTPHandler(handlers.HTTPHandler):
         except:  # noqa
             resp_time = slugify(response.headers.get("date"))
         return dict(
-            name=f"{resp_time}_{name}.{ext}", content=html.encode("utf-8"), mimetype="application/json" if ext == "json" else "text/html"
+            name=f"{resp_time}_{name}.{ext}",
+            content=html.encode("utf-8"),
+            mimetype="application/json" if ext == "json" else "text/html",
         )
 
     def _get_local_vars(self) -> str:

erepublik/access_points.py

@@ -115,7 +115,9 @@ class SlowRequests(Session):
         firefox_template = "Mozilla/5.0 ({osystem}; rv:{version}.0) Gecko/20100101 Firefox/{version}.0"
         firefox_versions = range(85, 92)
 
-        chrome_template = "Mozilla/5.0 ({osystem}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/{version} Safari/537.36"
+        chrome_template = (
+            "Mozilla/5.0 ({osystem}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/{version} Safari/537.36"
+        )
         chrome_versions = [
             "85.0.4183.121",
             "86.0.4240.183",
@@ -187,15 +189,19 @@ class CitizenBaseAPI:
     ) -> Response:
         c = [cookie.name for cookie in self._req.cookies if not cookie.has_nonstandard_attr("HttpOnly")]
         env = dict(l=["tets"], s=[], c=c, m=0)
-        cookies = dict(
+
-            sh=hashlib.sha256(",".join(env["l"] + env["s"]).encode("utf8")).hexdigest(),
+        session_hash = hashlib.sha256(",".join(env["l"] + env["s"]).encode("utf8")).hexdigest()
-            ch=hashlib.sha256(",".join(env["c"]).encode("utf8")).hexdigest(),
+        cookies_hash = hashlib.sha256(",".join(env["c"]).encode("utf8")).hexdigest()
-        )
+
         cookie_kwargs = dict(
-            expires=int(time.time()) + 120, path="/en/main/sessionUnlock", domain=".www.erepublik.com", secure=True, rest={"HttpOnly": True}
+            expires=int(time.time()) + 120,
+            path="/en/main/sessionUnlock",
+            domain=".www.erepublik.com",
+            secure=True,
+            rest={"HttpOnly": True},
         )
-        self._req.cookies.set("sh", cookies["sh"], **cookie_kwargs)
+        self._req.cookies.set("sh", session_hash, **cookie_kwargs)
-        self._req.cookies.set("ch", cookies["ch"], **cookie_kwargs)
+        self._req.cookies.set("ch", cookies_hash, **cookie_kwargs)
         b64_env = utils.b64json(env)
         data = dict(
             _token=self.token,
@@ -271,7 +277,13 @@ class ErepublikArticleAPI(CitizenBaseAPI):
         return self.post(f"{self.url}/main/donate-article", data=data)
 
     def _post_main_write_article(self, title: str, content: str, country_id: int, kind_id: int) -> Response:
-        data = dict(_token=self.token, article_name=title, article_body=content, article_location=country_id, article_category=kind_id)
+        data = dict(
+            _token=self.token,
+            article_name=title,
+            article_body=content,
+            article_location=country_id,
+            article_category=kind_id,
+        )
         return self.post(f"{self.url}/main/write-article", data=data)
 
     def _post_main_vote_article(self, article_id: int) -> Response:
@@ -286,7 +298,9 @@ class ErepublikCompanyAPI(CitizenBaseAPI):
 
     def _post_economy_create_company(self, industry_id: int, building_type: int = 1) -> Response:
         data = {"_token": self.token, "company[industry_id]": industry_id, "company[building_type]": building_type}
-        return self.post(f"{self.url}/economy/create-company", data=data, headers={"Referer": f"{self.url}/economy/create-company"})
+        return self.post(
+            f"{self.url}/economy/create-company", data=data, headers={"Referer": f"{self.url}/economy/create-company"}
+        )
 
     def _get_economy_inventory_items(self) -> Response:
         return self.get(f"{self.url}/economy/inventory-items/")
@@ -366,9 +380,13 @@ class ErepublikCountryAPI(CitizenBaseAPI):
     def _get_country_military(self, country_name: str) -> Response:
         return self.get(f"{self.url}/country/military/{country_name}")
 
-    def _post_main_country_donate(self, country_id: int, action: str, value: Union[int, float], quality: int = None) -> Response:
+    def _post_main_country_donate(
+        self, country_id: int, action: str, value: Union[int, float], quality: int = None
+    ) -> Response:
         data = dict(countryId=country_id, action=action, _token=self.token, value=value, quality=quality)
-        return self.post(f"{self.url}/main/country-donate", data=data, headers={"Referer": f"{self.url}/country/economy/Latvia"})
+        return self.post(
+            f"{self.url}/main/country-donate", data=data, headers={"Referer": f"{self.url}/country/economy/Latvia"}
+        )
 
 
 class ErepublikEconomyAPI(CitizenBaseAPI):
@@ -396,13 +414,17 @@ class ErepublikEconomyAPI(CitizenBaseAPI):
     def _post_economy_donate_items_action(self, citizen_id: int, amount: int, industry: int, quality: int) -> Response:
         data = dict(citizen_id=citizen_id, amount=amount, industry_id=industry, quality=quality, _token=self.token)
         return self.post(
-            f"{self.url}/economy/donate-items-action", data=data, headers={"Referer": f"{self.url}/economy/donate-items/{citizen_id}"}
+            f"{self.url}/economy/donate-items-action",
+            data=data,
+            headers={"Referer": f"{self.url}/economy/donate-items/{citizen_id}"},
         )
 
     def _post_economy_donate_money_action(self, citizen_id: int, amount: float = 0.0, currency: int = 62) -> Response:
         data = dict(citizen_id=citizen_id, _token=self.token, currency_id=currency, amount=amount)
         return self.post(
-            f"{self.url}/economy/donate-money-action", data=data, headers={"Referer": f"{self.url}/economy/donate-money/{citizen_id}"}
+            f"{self.url}/economy/donate-money-action",
+            data=data,
+            headers={"Referer": f"{self.url}/economy/donate-money/{citizen_id}"},
         )
 
     def _post_economy_exchange_purchase(self, amount: float, currency: int, offer: int) -> Response:
@@ -434,7 +456,12 @@ class ErepublikEconomyAPI(CitizenBaseAPI):
     def _post_economy_marketplace_actions(self, action: str, **kwargs) -> Response:
         if action == "buy":
             data = dict(
-                _token=self.token, offerId=kwargs["offer"], amount=kwargs["amount"], orderBy="price_asc", currentPage=1, buyAction=1
+                _token=self.token,
+                offerId=kwargs["offer"],
+                amount=kwargs["amount"],
+                orderBy="price_asc",
+                currentPage=1,
+                buyAction=1,
             )
         elif action == "sell":
             data = dict(
@@ -454,16 +481,24 @@ class ErepublikEconomyAPI(CitizenBaseAPI):
 
 
 class ErepublikLeaderBoardAPI(CitizenBaseAPI):
-    def _get_main_leaderboards_damage_aircraft_rankings(self, country_id: int, weeks: int = 0, mu_id: int = 0) -> Response:  # noqa
+    def _get_main_leaderboards_damage_aircraft_rankings(
+        self, country_id: int, weeks: int = 0, mu_id: int = 0
+    ) -> Response:  # noqa
         return self.get(f"{self.url}/main/leaderboards-damage-aircraft-rankings/{country_id}/{weeks}/{mu_id}/0")
 
-    def _get_main_leaderboards_damage_rankings(self, country_id: int, weeks: int = 0, mu_id: int = 0, div: int = 0) -> Response:  # noqa
+    def _get_main_leaderboards_damage_rankings(
+        self, country_id: int, weeks: int = 0, mu_id: int = 0, div: int = 0
+    ) -> Response:  # noqa
         return self.get(f"{self.url}/main/leaderboards-damage-rankings/{country_id}/{weeks}/{mu_id}/{div}")
 
-    def _get_main_leaderboards_kills_aircraft_rankings(self, country_id: int, weeks: int = 0, mu_id: int = 0) -> Response:  # noqa
+    def _get_main_leaderboards_kills_aircraft_rankings(
+        self, country_id: int, weeks: int = 0, mu_id: int = 0
+    ) -> Response:  # noqa
         return self.get(f"{self.url}/main/leaderboards-kills-aircraft-rankings/{country_id}/{weeks}/{mu_id}/0")
 
-    def _get_main_leaderboards_kills_rankings(self, country_id: int, weeks: int = 0, mu_id: int = 0, div: int = 0) -> Response:  # noqa
+    def _get_main_leaderboards_kills_rankings(
+        self, country_id: int, weeks: int = 0, mu_id: int = 0, div: int = 0
+    ) -> Response:  # noqa
         return self.get(f"{self.url}/main/leaderboards-kills-rankings/{country_id}/{weeks}/{mu_id}/{div}")
 
 
@@ -543,7 +578,14 @@ class ErepublikMilitaryAPI(CitizenBaseAPI):
         return self.post(f"{self.url}/military/battle-console", data=data)
 
     def _post_military_deploy_bomb(self, battle_id: int, division_id: int, side_id: int, bomb_id: int) -> Response:
-        data = dict(battleId=battle_id, battleZoneId=division_id, sideId=side_id, sideCountryId=side_id, bombId=bomb_id, _token=self.token)
+        data = dict(
+            battleId=battle_id,
+            battleZoneId=division_id,
+            sideId=side_id,
+            sideCountryId=side_id,
+            bombId=bomb_id,
+            _token=self.token,
+        )
         return self.post(f"{self.url}/military/deploy-bomb", data=data)
 
     def _post_military_fight_air(self, battle_id: int, side_id: int, zone_id: int) -> Response:
@@ -599,7 +641,9 @@ class ErepublikPoliticsAPI(CitizenBaseAPI):
         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))
+        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}")
@@ -611,11 +655,24 @@ class ErepublikPresidentAPI(CitizenBaseAPI):
         return self.post(f"{self.url}/wars/attack-region/{war_id}/{region_id}", data=data)
 
     def _post_new_war(self, self_country_id: int, attack_country_id: int, debate: str = "") -> Response:
-        data = dict(requirments=1, _token=self.token, debate=debate, countryNameConfirm=constants.COUNTRIES[attack_country_id].link)
+        data = dict(
+            requirments=1,
+            _token=self.token,
+            debate=debate,
+            countryNameConfirm=constants.COUNTRIES[attack_country_id].link,
+        )
         return self.post(f"{self.url}/{constants.COUNTRIES[self_country_id].link}/new-war", data=data)
 
     def _post_new_donation(self, country_id: int, amount: int, org_name: str, debate: str = "") -> Response:
-        data = dict(requirments=1, _token=self.token, debate=debate, currency=1, value=amount, commit="Propose", type_name=org_name)
+        data = dict(
+            requirments=1,
+            _token=self.token,
+            debate=debate,
+            currency=1,
+            value=amount,
+            commit="Propose",
+            type_name=org_name,
+        )
         return self.post(f"{self.url}/{constants.COUNTRIES[country_id].link}/new-donation", data=data)
 
 
@@ -705,7 +762,12 @@ class ErepublikProfileAPI(CitizenBaseAPI):
 
     def _post_main_messages_compose(self, subject: str, body: str, citizens: List[int]) -> Response:
         url_pk = 0 if len(citizens) > 1 else str(citizens[0])
-        data = dict(citizen_name=",".join([str(x) for x in citizens]), citizen_subject=subject, _token=self.token, citizen_message=body)
+        data = dict(
+            citizen_name=",".join([str(x) for x in citizens]),
+            citizen_subject=subject,
+            _token=self.token,
+            citizen_message=body,
+        )
         return self.post(f"{self.url}/main/messages-compose/{url_pk}", data=data)
 
     def _post_military_group_missions(self) -> Response:
@@ -810,7 +872,8 @@ class ErepublikWallPostAPI(CitizenBaseAPI):
     # ## Medal posting
     def _post_main_wall_post_automatic(self, message: str, achievement_id: int) -> Response:
         return self.post(
-            f"{self.url}/main/wall-post/automatic", data=dict(_token=self.token, message=message, achievementId=achievement_id)
+            f"{self.url}/main/wall-post/automatic",
+            data=dict(_token=self.token, message=message, achievementId=achievement_id),
         )
 
 

erepublik/classes.py

@@ -129,7 +129,13 @@ class Holding:
 
     @property
     def as_dict(self) -> Dict[str, Union[str, int, List[Dict[str, Union[str, int, bool, float, Decimal]]]]]:
-        return dict(name=self.name, id=self.id, region=self.region, companies=[c.as_dict for c in self.companies], wam_count=self.wam_count)
+        return dict(
+            name=self.name,
+            id=self.id,
+            region=self.region,
+            companies=[c.as_dict for c in self.companies],
+            wam_count=self.wam_count,
+        )
 
     @property
     def citizen(self):
@@ -303,7 +309,13 @@ class MyCompanies:
         """
         for holding in holdings.values():
             if holding.get("id") not in self.holdings:
-                self.holdings.update({int(holding.get("id")): Holding(holding["id"], holding["region_id"], self.citizen, holding["name"])})
+                self.holdings.update(
+                    {
+                        int(holding.get("id")): Holding(
+                            holding["id"], holding["region_id"], self.citizen, holding["name"]
+                        )
+                    }
+                )
         if not self.holdings.get(0):
             self.holdings.update({0: Holding(0, 0, self.citizen, "Unassigned")})  # unassigned
 
@@ -373,7 +385,12 @@ class MyCompanies:
         self,
     ) -> Dict[
         str,
-        Union[str, int, datetime.datetime, Dict[str, Dict[str, Union[str, int, List[Dict[str, Union[str, int, bool, float, Decimal]]]]]]],
+        Union[
+            str,
+            int,
+            datetime.datetime,
+            Dict[str, Dict[str, Union[str, int, List[Dict[str, Union[str, int, bool, float, Decimal]]]]]],
+        ],
     ]:
         return dict(
             name=str(self),
@@ -530,12 +547,16 @@ class Energy:
 
     @property
     def is_recoverable_full(self):
-        warnings.warn("Deprecated since auto auto-eat! Will be removed soon. Use Energy.is_energy_full", DeprecationWarning)
+        warnings.warn(
+            "Deprecated since auto auto-eat! Will be removed soon. Use Energy.is_energy_full", DeprecationWarning
+        )
         return self.is_energy_full
 
     @property
     def is_recovered_full(self):
-        warnings.warn("Deprecated since auto auto-eat! Will be removed soon. Use Energy.is_energy_full", DeprecationWarning)
+        warnings.warn(
+            "Deprecated since auto auto-eat! Will be removed soon. Use Energy.is_energy_full", DeprecationWarning
+        )
         return self.is_energy_full
 
     @property
@@ -691,13 +712,18 @@ class Reporter:
     @property
     def as_dict(self) -> Dict[str, Union[bool, int, str, List[Dict[Any, Any]]]]:
         return dict(
-            name=self.name, email=self.email, citizen_id=self.citizen_id, key=self.key, allowed=self.allowed, queue=self.__to_update
+            name=self.name,
+            email=self.email,
+            citizen_id=self.citizen_id,
+            key=self.key,
+            allowed=self.allowed,
+            queue=self.__to_update,
         )
 
     def __init__(self, citizen):
         self._citizen = weakref.ref(citizen)
         self._req = Session()
-        self.url = "https://api.erep.lv"
+        self.url = "https://erep.lv"
         self._req.headers.update(
             {
                 "user-agent": "eRepublik Script Reporter v3",
@@ -751,7 +777,10 @@ class Reporter:
             r = self.__bot_update(dict(key=self.key, check=True, player_id=self.citizen_id))
             if r:
                 if not r.json().get("status"):
-                    self._req.post(f"{self.url}/bot/register", json=dict(name=self.name, email=self.email, player_id=self.citizen_id))
+                    self._req.post(
+                        f"{self.url}/bot/register",
+                        json=dict(name=self.name, email=self.email, player_id=self.citizen_id),
+                    )
                 self.__registered = True
                 self.allowed = True
                 self.report_action("STARTED", value=utils.now().strftime("%F %T"))
@@ -790,7 +819,9 @@ class Reporter:
         self._bot_update(data)
 
     def report_action(self, action: str, json_val: Dict[Any, Any] = None, value: str = None):
-        json_data = dict(player_id=getattr(self, "citizen_id", None), log={"action": action}, key=getattr(self, "key", None))
+        json_data = dict(
+            player_id=getattr(self, "citizen_id", None), log={"action": action}, key=getattr(self, "key", None)
+        )
         if json_val:
             json_data["log"].update(dict(json=json_val))
         if value:
@@ -836,14 +867,18 @@ class Reporter:
         try:
             battle_response = self._req.get(f"{self.url}/api/v1/battles/{country.id}")
             return [
-                self.citizen.all_battles[bid] for bid in battle_response.json().get("battle_ids", []) if bid in self.citizen.all_battles
+                self.citizen.all_battles[bid]
+                for bid in battle_response.json().get("battle_ids", [])
+                if bid in self.citizen.all_battles
             ]
         except:  # noqa
             return []
 
     def fetch_tasks(self) -> List[Dict[str, Any]]:
         try:
-            task_response = self._req.post(f"{self.url}/api/v1/command", data=dict(citizen=self.citizen_id, key=self.key)).json()
+            task_response = self._req.post(
+                f"{self.url}/api/v1/command", data=dict(citizen=self.citizen_id, key=self.key)
+            ).json()
             if task_response.get("status"):
                 return task_response.get("data")
             else:
@@ -894,7 +929,13 @@ class BattleSide:
 
     @property
     def as_dict(self) -> Dict[str, Union[int, constants.Country, bool, List[constants.Country]]]:
-        return dict(points=self.points, country=self.country, is_defender=self.is_defender, allies=self.allies, deployed=self.deployed)
+        return dict(
+            points=self.points,
+            country=self.country,
+            is_defender=self.is_defender,
+            allies=self.allies,
+            deployed=self.deployed,
+        )
 
     @property
     def battle(self):
@@ -917,7 +958,12 @@ class BattleDivision:
     @property
     def as_dict(self):
         return dict(
-            id=self.id, division=self.div, terrain=(self.terrain, self.terrain_display), wall=self.wall, epic=self.epic, end=self.div_end
+            id=self.id,
+            division=self.div,
+            terrain=(self.terrain, self.terrain_display),
+            wall=self.wall,
+            epic=self.epic,
+            end=self.div_end,
         )
 
     @property
@@ -1210,7 +1256,8 @@ class TelegramReporter:
 
     def report_item_donation(self, citizen_id: int, amount: float, product: str):
         self.send_message(
-            f"*Donation*: {amount} x {product} to citizen " f"[{citizen_id}](https://www.erepublik.com/en/citizen/profile/{citizen_id})"
+            f"*Donation*: {amount} x {product} to citizen "
+            f"[{citizen_id}](https://www.erepublik.com/en/citizen/profile/{citizen_id})"
         )
 
     def report_money_donation(self, citizen_id: int, amount: float, is_currency: bool = True):
@@ -1228,7 +1275,9 @@ class TelegramReporter:
         message = "\n\n".join(self.__queue)
         if self.player_name:
             message = f"Player *{self.player_name}*\n\n" + message
-        response = post(f"{self.api_url}/sendMessage", json=dict(chat_id=self.chat_id, text=message, parse_mode="Markdown"))
+        response = post(
+            f"{self.api_url}/sendMessage", json=dict(chat_id=self.chat_id, text=message, parse_mode="Markdown")
+        )
         self._last_time = utils.now()
         if response.json().get("ok"):
             self.__queue.clear()
@@ -1275,5 +1324,11 @@ class Inventory:
     @property
     def as_dict(self) -> Dict[str, Union[types.InvFinal, types.InvRaw, int]]:
         return dict(
-            active=self.active, final=self.final, boosters=self.boosters, raw=self.raw, offers=self.offers, total=self.total, used=self.used
+            active=self.active,
+            final=self.final,
+            boosters=self.boosters,
+            raw=self.raw,
+            offers=self.offers,
+            total=self.total,
+            used=self.used,
         )

erepublik/utils.py

@@ -182,7 +182,14 @@ def slugify(value, allow_unicode=False) -> str:
 
 
 def calculate_hit(
-    strength: float, rang: int, tp: bool, elite: bool, ne: bool, booster: int = 0, weapon: int = 200, is_deploy: bool = False
+    strength: float,
+    rang: int,
+    tp: bool,
+    elite: bool,
+    ne: bool,
+    booster: int = 0,
+    weapon: int = 200,
+    is_deploy: bool = False,
 ) -> Decimal:
     dec = 3 if is_deploy else 0
     base_str = 1 + Decimal(str(round(strength, 3))) / 400
@@ -217,7 +224,12 @@ def get_air_hit_dmg_value(
 
 
 def get_final_hit_dmg(
-    base_dmg: Union[Decimal, float, str], rang: int, tp: bool = False, elite: bool = False, ne: bool = False, booster: int = 0
+    base_dmg: Union[Decimal, float, str],
+    rang: int,
+    tp: bool = False,
+    elite: bool = False,
+    ne: bool = False,
+    booster: int = 0,
 ) -> Decimal:
     dmg = Decimal(str(base_dmg))
 
@@ -313,7 +325,11 @@ class ErepublikJSONEncoder(json.JSONEncoder):
                 return dict(__type__="date", date=o.strftime("%Y-%m-%d"))
             elif isinstance(o, datetime.timedelta):
                 return dict(
-                    __type__="timedelta", days=o.days, seconds=o.seconds, microseconds=o.microseconds, total_seconds=o.total_seconds()
+                    __type__="timedelta",
+                    days=o.days,
+                    seconds=o.seconds,
+                    microseconds=o.microseconds,
+                    total_seconds=o.total_seconds(),
                 )
             elif isinstance(o, Response):
                 return dict(headers=dict(o.__dict__["headers"]), url=o.url, text=o.text, status_code=o.status_code)

examples/eat_work_train.py

@@ -60,7 +60,9 @@ def main():
                 player.write_log("Doing task: Work as manager")
                 success = player.work_as_manager()
                 if success:
-                    next_time = utils.good_timedelta(now.replace(hour=14, minute=0, second=0, microsecond=0), timedelta(days=1))
+                    next_time = utils.good_timedelta(
+                        now.replace(hour=14, minute=0, second=0, microsecond=0), timedelta(days=1)
+                    )
                 else:
                     next_time = utils.good_timedelta(now.replace(second=0, microsecond=0), timedelta(minutes=30))
 
@@ -86,7 +88,9 @@ def main():
             if sleep_seconds <= 0:
                 player.write_log(f"Loop detected! Offending task: '{next_tasks[0]}'")
             player.write_log("My next Tasks and there time:\n" + "\n".join(sorted(next_tasks)))
-            player.write_log(f"Sleeping until (eRep): {closest_next_time.strftime('%F %T')}" f" (sleeping for {sleep_seconds}s)")
+            player.write_log(
+                f"Sleeping until (eRep): {closest_next_time.strftime('%F %T')}" f" (sleeping for {sleep_seconds}s)"
+            )
             seconds_to_sleep = sleep_seconds if sleep_seconds > 0 else 0
             player.sleep(seconds_to_sleep)
         except Exception as e:

pyproject.toml

@@ -1,4 +1,11 @@
 [tool.black]
-line-length = 140
+line-length = 120
 target-version = ['py38', 'py39']
+extend-exclude = 'venv'
+workers = 4
 
+
+[tool.isort]
+profile = "black"
+multi_line_output = 3
+line_length = 120

requirements-dev.txt

@@ -0,0 +1,16 @@
+-r requirements.txt
+-r requirements-tests.txt
+bump2version==1.0.1
+coverage==6.1.1
+edx-sphinx-theme==3.0.0
+flake8==4.0.1
+ipython>=7.29.0
+jedi!=0.18.0
+isort==5.9.3
+pre-commit==2.15.0
+pur==5.4.2
+responses==0.15.0
+Sphinx==4.2.0
+twine==3.4.2
+wheel==0.37.0
+black==21.7b0

requirements-tests.txt

@@ -0,0 +1,2 @@
+-r requirements.txt
+pytest==6.2.5

requirements.txt

@@ -0,0 +1,4 @@
+PySocks==1.7.1
+pytz==2021.3
+requests==2.26.0
+requests-toolbelt==0.9.1

requirements_dev.txt

@@ -1,22 +0,0 @@
-bump2version==1.0.1
-coverage==5.5
-edx-sphinx-theme==3.0.0
-flake8==3.9.2
-ipython>=7.26.0
-jedi!=0.18.0
-isort==5.9.3
-pip==21.2.4
-pre-commit==2.14.0
-pur==5.4.2
-PyInstaller==4.5.1
-PySocks==1.7.1
-pytest==6.2.4
-pytz==2021.1
-requests==2.26.0
-requests-toolbelt==0.9.1
-responses==0.13.4
-setuptools==57.4.0
-Sphinx==4.1.2
-twine==3.4.2
-wheel==0.37.0
-black==21.7b0

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.26.0.1
+current_version = 0.28.0
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\.?(?P<dev>\d+)?
@@ -29,7 +29,7 @@ max-line-length = 140
 exclude = .git,log,debug,venv, build
 
 [mypy]
-python_version = 3.8
+python_version = 3.9
 check_untyped_defs = True
 ignore_missing_imports = False
 warn_unused_ignores = True

setup.py

@@ -11,18 +11,17 @@ with open("README.rst") as readme_file:
 with open("HISTORY.rst") as history_file:
     history = history_file.read()
 
-requirements = [
+with open("requirements.txt") as requirements_file:
-    "PySocks==1.7.1",
+    requirements = requirements_file.read()
-    "pytz==2021.1",
+    requirements = requirements.split()
-    "requests==2.26.0",
-    "requests-toolbelt==0.9.1",
-]
 
 setup_requirements = []
 
-test_requirements = [
+with open("requirements-tests.txt") as test_req_file:
-    "pytest==6.2.4",
+    test_requirements = test_req_file.read()
-]
+    test_requirements = [
+        line.strip() for line in test_requirements.split() if line.strip()[:2].strip() not in ("#", "-r")
+    ]
 
 setup(
     author="Eriks Karls",
@@ -30,7 +29,7 @@ setup(
     classifiers=[
         "Development Status :: 4 - Beta",
         "Intended Audience :: Developers",
-        "License :: OSI Approved :: GPLv3 License",
+        "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
         "Natural Language :: English",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.8",
@@ -39,7 +38,7 @@ setup(
     description="Python package for automated eRepublik playing",
     entry_points={},
     install_requires=requirements,
-    license="GPLv3 license",
+    license="GPLv3",
     long_description=readme + "\n\n" + history,
     include_package_data=True,
     keywords="erepublik",
@@ -50,6 +49,6 @@ setup(
     test_suite="tests",
     tests_require=test_requirements,
     url="https://github.com/eeriks/erepublik/",
-    version="0.26.0.1",
+    version="0.28.0",
     zip_safe=False,
 )

tests/test_erepublik_script.py

@@ -3,10 +3,10 @@
 
 """Tests for `erepublik` package."""
 
-from erepublik import Citizen
-
 import unittest
 
+from erepublik import Citizen
+
 
 class TestErepublik(unittest.TestCase):
     """Tests for `erepublik` package."""