mathsman5133
diff --git a/‎.github/workflows/push-to-pypi.yml
Lines changed: 21 additions & 10 deletions b/‎.github/workflows/push-to-pypi.yml
Lines changed: 21 additions & 10 deletions
diff --git a/‎.github/workflows/tests.yml
Lines changed: 1 addition & 4 deletions b/‎.github/workflows/tests.yml
Lines changed: 1 addition & 4 deletions
diff --git a/‎.readthedocs.yml
Lines changed: 3 additions & 2 deletions b/‎.readthedocs.yml
Lines changed: 3 additions & 2 deletions
diff --git a/‎README.rst
Lines changed: 5 additions & 5 deletions b/‎README.rst
Lines changed: 5 additions & 5 deletions
diff --git a/‎coc/__init__.py
Lines changed: 9 additions & 4 deletions b/‎coc/__init__.py
Lines changed: 9 additions & 4 deletions
@@ -1,24 +1,35 @@
 on:
+  workflow_dispatch:
+    inputs:
+      confirmation:
+        description: 'I want to manually trigger a PyPi push, without publishing a GitHub release (not recommended!)'
+        required: true
+        type: boolean
   release:
     types: [created]
 
 jobs:
   deploy:
+    name: Upload release to PyPI
     runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/p/coc.py
+    permissions:
+      id-token: write
+    if: github.event_name != 'workflow_dispatch' || (github.event_name == 'workflow_dispatch' &&  github.event.inputs.confirmation != 'false')
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: '3.x'
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
-        pip install setuptools wheel twine
-    - name: Build and publish
-      env:
-        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+        pip install --upgrade pip
+        pip install --upgrade build
+    - name: Build
       run: |
-        python setup.py sdist bdist_wheel
-        twine upload dist/*
+        python -m build
+    - name: Publish package distributions to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
@@ -11,7 +11,7 @@ jobs:
       # For example, pypy2 and pypy3
       matrix:
 #        python-version: ["3.7.13", "3.8.13", "3.9.13", "3.10"]
-         python-version: [3.8]
+         python-version: [3.9]
 
     steps:
     - uses: actions/checkout@v3
@@ -31,10 +31,7 @@ jobs:
         DEV_SITE_EMAIL: ${{ secrets.DEV_SITE_EMAIL }}
         DEV_SITE_PASSWORD: ${{ secrets.DEV_SITE_PASSWORD }}
         DISCORD_BOT_TOKEN: ${{ secrets.DISCORD_BOT_TOKEN }}
-        LINKS_API_USERNAME: ${{ secrets.LINKS_API_USERNAME }}
-        LINKS_API_PASSWORD: ${{ secrets.LINKS_API_PASSWORD }}
         RUNNING_TESTS: true
       run: |
-        python -m examples.discord_links
         python -m examples.events_example
         python -m examples.war_logs
@@ -2,15 +2,16 @@ version: 2
 formats: []
 
 build:
-  image: latest
+  os: ubuntu-22.04
+  tools:
+    python: "3.9"
 
 sphinx:
   configuration: docs/conf.py
   fail_on_warning: false
   builder: html
 
 python:
-  version: 3.7
   install:
     - method: pip
       path: .
 
@@ -26,7 +26,7 @@ Getting Started
 
 Installing
 -----------
-**Python 3.7 or higher is required**
+**Python 3.9 or higher is required**
 
 .. code:: sh
 
@@ -55,18 +55,18 @@ This example will get a player with a certain tag, and search for 5 clans with a
         async with coc.Client() as coc_client:
             try:
                 await coc_client.login("email", "password")
-            except coc.invalidcredentials as error:
+            except coc.InvalidCredentials as error:
                 exit(error)
 
-            player = await client.get_player("tag")
+            player = await coc_client.get_player("tag")
             print(f"{player.name} has {player.trophies} trophies!")
 
-            clans = await client.search_clans(name="best clan ever", limit=5)
+            clans = await coc_client.search_clans(name="best clan ever", limit=5)
             for clan in clans:
                 print(f"{clan.name} ({clan.tag}) has {clan.member_count} members")
 
             try:
-                war = await client.get_current_war("#clantag")
+                war = await coc_client.get_current_war("#clantag")
                 print(f"{war.clan_tag} is currently in {war.state} state.")
             except coc.privatewarlog:
                 print("uh oh, they have a private war log!")
 
@@ -22,22 +22,27 @@
 SOFTWARE.
 """
 
-__version__ = "2.3.1"
+__version__ = "3.9.1"
 
 from .abc import BasePlayer, BaseClan
 from .clans import RankedClan, Clan
 from .client import Client
 from .events import PlayerEvents, ClanEvents, WarEvents, EventsClient, ClientEvents
 from .enums import (
+    PlayerHouseElementType,
     Resource,
     Role,
     WarRound,
     ACHIEVEMENT_ORDER,
     BUILDER_TROOPS_ORDER,
     HERO_ORDER,
     PETS_ORDER,
+    ELIXIR_TROOP_ORDER,
+    DARK_ELIXIR_TROOP_ORDER,
     HOME_TROOP_ORDER,
     SIEGE_MACHINE_ORDER,
+    ELIXIR_SPELL_ORDER,
+    DARK_ELIXIR_SPELL_ORDER,
     SPELL_ORDER,
     SUPER_TROOP_ORDER,
     UNRANKED_LEAGUE_DATA,
@@ -53,8 +58,7 @@
     GatewayError,
     PrivateWarLog,
 )
-from .login import login, login_with_keys
-from .hero import Hero, Pet
+from .hero import Equipment, Hero, Pet
 from .http import BasicThrottler, BatchThrottler, HTTPClient
 from .iterators import (
     ClanIterator,
@@ -73,10 +77,11 @@
     LegendStatistics,
     LoadGameData,
     Location,
+    PlayerHouseElement,
     Timestamp,
     TimeDelta,
     Label,
-    WarLeague,
+    BaseLeague
 )
 from .players import Player, ClanMember, RankedPlayer
 from .player_clan import PlayerClan