use pyproject.toml instead of setup.cfg

Author: andreax79

.github/workflows/release.yml

@@ -5,6 +5,9 @@ on:
     tags:
       - v*
 
+permissions:
+  contents: read
+
 jobs:
 
   wait:
@@ -25,13 +28,12 @@ jobs:
         if: steps.wait-for-tests.outputs.conclusion != 'success'
 
   build:
-    name: Build package
     runs-on: ubuntu-latest
-    needs: [wait]
 
     strategy:
       matrix:
-        python-version: ['3.12']
+        python-version:
+        - "3.12"
 
     steps:
       - name: Checkout code
@@ -42,50 +44,39 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Cache pip
-        uses: actions/cache@v3
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-python-${{ matrix.python }}-pip-${{ hashFiles('**/requirements*.txt') }}-git-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-python-${{ matrix.python }}-pip-${{ hashFiles('**/requirements*.txt') }}
-            ${{ runner.os }}-python-${{ matrix.python }}-pip-
-            ${{ runner.os }}-python
-            ${{ runner.os }}-
-
-      - name: Upgrade pip and install dependencies
+      - name: Install uv
         run: |
-          python -m pip install --upgrade pip
-          python -m pip install --upgrade setuptools wheel
-          python -m pip install -r requirements.txt
-          python -m pip install -r requirements-dev.txt
-
-      - name: Build package
-        run:  python -m build
+          pip install uv
 
-      - name: Check package
-        run:  twine check dist/*
-
-      - name: Publish package
-        env:
-          TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-          TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+      - name: Build release distributions
         run: |
-          twine upload --skip-existing dist/*
+          uv pip install --system build
+          python -m build
 
-  release:
-    name: Release version
+      - name: Upload distributions
+        uses: actions/upload-artifact@v4
+        with:
+          name: release-dists
+          path: dist/
+
+  pypi-publish:
     runs-on: ubuntu-latest
     needs: [wait, build]
+    permissions:
+      id-token: write
+
+    environment:
+      name: pypi
+      url: https://pypi.org/project/otp-mcp-server/
 
     steps:
-      - name: Create release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Retrieve release distributions
+        uses: actions/download-artifact@v4
+        with:
+          name: release-dists
+          path: dist/
+
+      - name: Publish release distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          tag_name: ${{ github.ref }}
-          release_name: ${{ github.ref }}
-          draft: false
-          prerelease: false
+          packages-dir: dist/

.github/workflows/tests.yml

@@ -11,7 +11,6 @@ jobs:
     strategy:
       matrix:
         python:
-        - "3.8"
         - "3.9"
         - "3.10"
         - "3.11"
@@ -26,17 +25,17 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python }}
 
     - name: Cache pip
       uses: actions/cache@v3
       with:
         path: ~/.cache/pip
-        key: ${{ runner.os }}-python-${{ matrix.python }}-pip-${{ hashFiles('**/requirements*.txt') }}-git-${{ github.sha }}
+        key: ${{ runner.os }}-python-${{ matrix.python }}-pip-${{ hashFiles('**/pyproject.toml') }}-git-${{ github.sha }}
         restore-keys: |
-          ${{ runner.os }}-python-${{ matrix.python }}-pip-${{ hashFiles('**/requirements*.txt') }}
+          ${{ runner.os }}-python-${{ matrix.python }}-pip-${{ hashFiles('**/pyproject.toml') }}
           ${{ runner.os }}-python-${{ matrix.python }}-pip-
           ${{ runner.os }}-python-${{ matrix.python }}-
           ${{ runner.os }}-python
@@ -45,9 +44,7 @@ jobs:
     - name: Upgrade pip and install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install --upgrade setuptools wheel
-        python -m pip install -r requirements.txt
-        python -m pip install pytest
+        pip install -e .[test]
 
     - name: Run tests
       run: pytest

.gitignore

@@ -41,3 +41,4 @@ nosetests.xml
 pyvenv.cfg
 site/
 __pycache__
+.venv

.python-version

@@ -0,0 +1 @@
+3.13

Makefile

@@ -1,8 +1,8 @@
 SHELL=/bin/bash -e
+VERSION := $(shell grep '__version__ = ' cstruct/__init__.py | sed 's/__version__ = "\(.*\)"/\1/')
 
 help:
-	@echo - make black ------ Format code
-	@echo - make isort ------ Sort imports
+	@echo - make ruff ------- Format code and sort imports
 	@echo - make clean ------ Clean virtual environment
 	@echo - make coverage --- Run tests coverage
 	@echo - make docs ------- Make docs
@@ -12,44 +12,49 @@ help:
 	@echo - make typecheck -- Typecheck
 	@echo - make venv ------- Create virtual environment
 
-.PHONY: isort
+.PHONY: codespell
 codespell:
-	@codespell -w cstruct tests examples setup.py
+	uv run codespell -w cstruct tests examples
 
-.PHONY: isort
-isort:
-	@isort --profile black cstruct tests examples setup.py
-
-.PHONY: black
-black: isort
-	@black -S cstruct tests examples setup.py
+.PHONY: ruff
+ruff:
+	uv run ruff format cstruct tests examples
 
+.PHONY: clean
 clean:
-	-rm -rf build dist
-	-rm -rf *.egg-info
-	-rm -rf bin lib lib64 share include pyvenv.cfg
+	-rm -rf build dist pyvenv.cfg *.egg-info .venv
 
+.PHONY: coverage
 coverage:
-	@pytest --cov --cov-report=term-missing
+	uv run pytest --cov --cov-report=term-missing
 
 .PHONY: docs
 docs:
-	@mkdocs build
-	@mkdocs gh-deploy
+	uv run mkdocs build
+	uv run mkdocs gh-deploy
 
+.PHONY: lint
 lint:
-	flake8 cstruct tests
+	uv run ruff check cstruct tests
 
+.PHONY: test
 test:
-	pytest
+	uv run pytest
 
+.PHONY: test-32bit
 test-32bit:
-	@make -C docker/i386 test
+	make -C docker/i386 test
 
+.PHONY: typecheck
 typecheck:
-	mypy --strict --no-warn-unused-ignores cstruct
+	uv run mypy --strict --no-warn-unused-ignores cstruct
+
+.PHONY: tag
+tag:
+	git tag v${VERSION}
 
+.PHONY: venv
 venv:
-	python3 -m venv . || python3 -m virtualenv .
-	. bin/activate; pip install -Ur requirements.txt
-	. bin/activate; pip install -Ur requirements-dev.txt
+	uv venv
+	uv pip install -e .
+	uv pip install -e ".[dev]"

pyproject.toml

@@ -1,10 +1,73 @@
 [build-system]
-requires = ["setuptools"]
+requires = ["setuptools>=61.0", "wheel"]
 build-backend = "setuptools.build_meta"
 
-[tool.black]
+[project]
+name = "cstruct"
+dynamic = ["version"]
+description = "C-style structs for Python"
+readme = "README.md"
+license = "MIT"
+license-files = ["LICENSE"]
+authors = [
+    { name = "Andrea Bonomi", email = "andrea.bonomi@gmail.com" }
+]
+keywords = ["struct", "cstruct", "enum", "binary", "pack", "unpack"]
+requires-python = ">=3.7"
+
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Environment :: Console",
+    "Intended Audience :: Developers",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+    "Programming Language :: Python :: 3",
+]
+
+[project.urls]
+Homepage = "http://github.com/andreax79/python-cstruct"
+Source = "http://github.com/andreax79/python-cstruct"
+Issues = "http://github.com/andreax79/python-cstruct/issues"
+Documentation = "https://python-cstruct.readthedocs.io/en/latest/"
+
+[project.optional-dependencies]
+dev = [
+    "pytest",
+    "pytest-cov",
+    "codespell",
+    "coverage[toml]",
+    "ruff",
+    "markdown_include",
+    "mkdocs",
+    "mkdocs-material",
+    "mkdocstrings",
+    "mkdocstrings-python",
+    "mypy"
+]
+test = [
+    "pytest",
+    "pytest-cov",
+    "coverage[toml]"
+]
+
+[tool.setuptools]
+zip-safe = true
+include-package-data = true
+
+[tool.setuptools.dynamic]
+version = { attr = "cstruct.__version__" }
+
+[tool.setuptools.packages.find]
+include = ["cstruct*"]
+exclude = ["ez_setup", "examples", "tests"]
+
+[tool.ruff]
 line-length = 132
 
+[tool.ruff.lint]
+ignore = [ "E731", "E711" ]
+
 [tool.coverage.run]
 source = ["cstruct"]
 
@@ -13,3 +76,6 @@ exclude_lines = [ "# pragma: no cover", "if TYPE_CHECKING:" ]
 
 [tool.isort]
 profile = "black"
+
+[tool.black]
+line-length = 132

requirements-dev.txt

@@ -1,16 +1,4 @@
-black
-build
-codespell
-coverage[toml]
-flake8
-isort
 markdown_include
 mkdocs
 mkdocs-material
 mkdocstrings[python]
-mypy
-pytest
-pytest-cov
-setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability
-tox
-twine<3.4