diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ddcdc8c5..0630c6f1 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 bb9e2ab1..30d4c4a8 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 9471daac..6e38e35e 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 8345bf13..9f8d45a0 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,34 +15,38 @@ classifiers = [ "Topic :: Games/Entertainment :: Board Games" ] -[tool.poetry-dynamic-versioning] -enable = true - -[tool.poetry-dynamic-versioning.from-file] -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 +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 = "*" -polib = "*" +black = "^24.8.0" +polib = "^1.2.0" [tool.poetry.group.test.dependencies] -pytest = "*" +pytest = "^8.3.2" [tool.poetry.scripts] katrain = "katrain.__main__:run_app" [tool.black] line-length = 120 + +[tool.poetry-dynamic-versioning] +enable = true + +[tool.poetry-dynamic-versioning.from-file] +source = "katrain/core/constants.py" +pattern = "^VERSION\\s*=\\s*\"(.*)\"" + +[build-system] +requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning>=1.0.0,<2.0.0"] +build-backend = "poetry_dynamic_versioning.backend"