From dd089f74faa61d1c740870a4f0b3ad0ff7c28d85 Mon Sep 17 00:00:00 2001
From: Sander Land <48946947+sanderland@users.noreply.github.com>
Date: Sat, 17 Aug 2024 22:33:08 +0200
Subject: [PATCH] fix release (#706)

---
 .github/workflows/release.yaml |  4 +--
 .github/workflows/test.yaml    |  1 +
 poetry.lock                    |  2 +-
 pyproject.toml                 | 56 +++++++++++++++++-----------------
 4 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index ddcdc8c..0630c6f 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -19,6 +19,7 @@ jobs:
     - name: Install dependencies
       run: |
         pip3 install poetry
+        poetry self add "poetry-dynamic-versioning[plugin]"
         poetry install --with dev,test
 
     - name: Run tests
@@ -33,6 +34,5 @@ jobs:
 
     - name: Release to PyPI
       env:
-        POETRY_HTTP_BASIC_KATRAIN_USERNAME: ${{ secrets.PYPI_USER }}
-        POETRY_HTTP_BASIC_KATRAIN_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+        POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}
       run: poetry publish --verbose
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index bb9e2ab..30d4c4a 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -24,6 +24,7 @@ jobs:
     - name: Install dependencies
       run: |
         pip3 install poetry
+        poetry self add "poetry-dynamic-versioning[plugin]"
         poetry install --with dev,test
 
     - name: Run tests
diff --git a/poetry.lock b/poetry.lock
index 9471daa..6e38e35 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -959,4 +959,4 @@ zstd = ["zstandard (>=0.18.0)"]
 [metadata]
 lock-version = "2.0"
 python-versions = ">=3.9,<4.0"
-content-hash = "86e012f44f22d825088a90baddce7bc5192601aef8337db639fcf52242dbec5a"
+content-hash = "d92d402e27176e6cbe4c1d3cd14ccce5ebc470471137afe4f20c7905a8b41c76"
diff --git a/pyproject.toml b/pyproject.toml
index 8345bf1..9f8d45a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,3 @@
-[build-system]
-requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning>=1.0.0,<2.0.0"]
-build-backend = "poetry_dynamic_versioning.backend"
-
 [tool.poetry]
 name = "KaTrain"
 version = "0.0.0"  # Placeholder. The poetry-dynamic-versioning sets the version
@@ -19,6 +15,31 @@ classifiers = [
     "Topic :: Games/Entertainment :: Board Games"
 ]
 
+[tool.poetry.dependencies]
+python = ">=3.9,<4.0"
+kivy = {extras = ["full"], version = ">=2.1.0"}
+kivymd = "==0.104.1"  # TODO: upgrade this, the latest version is 1.1.1
+ffpyplayer = "*"
+urllib3 = "*"
+pygame = {version = "^2.0", markers = "platform_system == 'Darwin'"}    # some mac versions need this for kivy
+screeninfo = {version = "^0.8.1", markers = "platform_system != 'Darwin'"}  # for screen resolution, has problems on macos
+chardet = "^5.2.0"  # for automatic encoding detection
+# Avoid PyPI/Poetry problem: https://github.com/python-poetry/poetry/issues/9293
+docutils = ">=0.21.2"
+
+[tool.poetry.group.dev.dependencies]
+black = "^24.8.0"
+polib = "^1.2.0"
+
+[tool.poetry.group.test.dependencies]
+pytest = "^8.3.2"
+
+[tool.poetry.scripts]
+katrain = "katrain.__main__:run_app"
+
+[tool.black]
+line-length = 120
+
 [tool.poetry-dynamic-versioning]
 enable = true
 
@@ -26,27 +47,6 @@ enable = true
 source = "katrain/core/constants.py"
 pattern = "^VERSION\\s*=\\s*\"(.*)\""
 
-[tool.poetry.dependencies]
-python = ">=3.9,<4.0"
-kivy = {extras = ["full"], version = ">=2.1.0"}
-kivymd = "==0.104.1"  # TODO: upgrade this, the latest version is 1.1.1
-ffpyplayer = "*"
-urllib3 = "*"
-pygame = {version = "*", markers = "platform_system == 'Darwin'"}    # some mac versions need this for kivy
-screeninfo = {version = "*", markers = "platform_system != 'Darwin'"}  # for screen resolution, has problems on macos
-chardet = "*"  # for automatic encoding detection
-# Avoid PyPI/Poetry problem: https://github.com/python-poetry/poetry/issues/9293
-docutils = ">=0.21.2"
-
-[tool.poetry.group.dev.dependencies]
-black = "*"
-polib = "*"
-
-[tool.poetry.group.test.dependencies]
-pytest = "*"
-
-[tool.poetry.scripts]
-katrain = "katrain.__main__:run_app"
-
-[tool.black]
-line-length = 120
+[build-system]
+requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning>=1.0.0,<2.0.0"]
+build-backend = "poetry_dynamic_versioning.backend"