Merge branch 'setup-to-pyproject'

Author: flozz

.github/workflows/gh-pages.yml

@@ -22,11 +22,11 @@ jobs:
       - name: "Set up Python"
         uses: actions/setup-python@v6
         with:
-          python-version: "3.13"
+          python-version: "3.14"
 
       - name: "Install Python dependencies"
         run: |
-          pip3 install setuptools nox
+          pip3 install nox
 
       - name: "Build Sphinx Doc"
         run: |

.github/workflows/python-ci.yml

@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
 
     name: "Lint and Test"
     runs-on: macos-latest
@@ -27,7 +27,7 @@ jobs:
 
       - name: "Install Python dependencies"
         run: |
-          pip install setuptools nox
+          pip install nox
 
       - name: "Lint with flake8 and Black"
         run: |

.github/workflows/python-packages.yml

@@ -21,24 +21,24 @@ jobs:
       - name: "Set up Python"
         uses: actions/setup-python@v6
         with:
-          python-version: "3.13"
+          python-version: "3.14"
 
       - name: "Install Python build dependencies"
         run: |
-          pip install setuptools wheel nox
+          pip install build
 
       - name: "Build source distribution"
         run: |
-          python setup.py sdist
+          python -m build --sdist
 
       - name: "Build wheel"
         run: |
-          python setup.py bdist_wheel
+          python -m build --wheel
 
       - name: "Upload artifacts"
         uses: actions/upload-artifact@v5
         with:
-          name: rivalcfg-dist
+          name: dist
           path: dist/
           retention-days: 1
 
@@ -53,11 +53,12 @@ jobs:
 
       - name: "Download artifacts"
         uses: actions/download-artifact@v6
+        with:
+          path: dist/
 
-      - name: "Move packages to the dist/ folder"
+      - name: "List packages"
         run: |
-          mkdir dist/
-          mv rivalcfg-dist/* dist/
+          find . -name "*.whl" -o -name "*.tar.gz"
 
       - name: "Publish packages on PyPI"
         uses: pypa/gh-action-pypi-publish@release/v1

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2024, Wanadev <http://www.wanadev.fr/>
+Copyright (c) 2024-2025, Wanadev <http://www.wanadev.fr/>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

README.rst

@@ -116,8 +116,9 @@ Changelog
 
 * **[NEXT]** (changes on ``master``, but not released yet):
 
-  * misc: Added Python 3.13 support (@flozz)
-  * misc!: Removed Python 3.8 support (@flozz)
+  * misc: Replaced setup.py by pyproject.toml (@flozz)
+  * misc: Added Python 3.13, 3.14 support (@flozz)
+  * misc!: Removed Python 3.8, 3.9 support (@flozz)
 
 * **v1.0.0:**
 

RELEASE.rst

@@ -14,7 +14,7 @@ This file is a memo for the maintainer.
 1. Release
 ----------
 
-* Update version number in ``setup.py``
+* Update version number in ``pyproject.toml``
 * Update version number in ``doc/conf.py``
 * Edit / update changelog in ``README.rst``
 * Commit / tag (``git commit -m vX.Y.Z && git tag vX.Y.Z && git push && git push --tags``)

doc/conf.py

@@ -7,7 +7,7 @@
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
 
 project = "Scanline Python Wrapper"
-copyright = "2024, Wanadev"
+copyright = "2024-2025, Wanadev"
 author = "Wanadev"
 release = "1.0.0"
 

noxfile.py

@@ -3,37 +3,37 @@
 
 PYTHON_FILES = [
     "scanline_wrapper.py",
-    "setup.py",
     "noxfile.py",
     "test",
     "doc",
 ]
 
-PYTHON_VERSIONS = ["3.9", "3.10", "3.11", "3.12", "3.13"]
+PYTHON_VERSIONS = ["3.10", "3.11", "3.12", "3.13", "3.14"]
 
 
 @nox.session(reuse_venv=True)
 def lint(session):
-    session.install("flake8", "black")
+    session.install("-e", ".[dev]")
     session.run("flake8", *PYTHON_FILES)
     session.run("black", "--check", "--diff", "--color", *PYTHON_FILES)
+    session.run("validate-pyproject", "pyproject.toml")
 
 
 @nox.session(reuse_venv=True)
 def black_fix(session):
-    session.install("black")
+    session.install("-e", ".[dev]")
     session.run("black", *PYTHON_FILES)
 
 
 @nox.session(python=PYTHON_VERSIONS, reuse_venv=True)
 def test(session):
-    session.install("pytest")
+    session.install("-e", ".[dev]")
     session.install(".")
     session.run("pytest", "-v", "test")
 
 
 @nox.session(reuse_venv=True)
 def gendoc(session):
-    session.install("sphinx", "sphinx-rtd-theme")
+    session.install("-e", ".[dev]")
     session.install(".")
     session.run("sphinx-build", "-M", "html", "doc", "build")

pyproject.toml

@@ -0,0 +1,49 @@
+[build-system]
+requires = ["setuptools", "setuptools-scm"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "scanline-python-wrapper"
+version = "1.0.0"
+authors = [
+    {name = "Wanadev", email = "contact@wanadev.fr"},
+]
+description = "Python wrapper for the scanline CLI scanner tool for macOS"
+readme = "README.rst"
+keywords = ["scan", "scanline", "macos", "icc"]
+license = "bsd-3-clause"
+license-files = ["LICENSE"]
+requires-python = ">=3.10"
+
+[project.optional-dependencies]
+dev = [
+    "nox",
+    "flit",
+    "black",
+    "flake8",
+    "flake8-pyproject",
+    "validate-pyproject",
+    "pytest",
+    "sphinx",
+    "sphinx-rtd-theme",
+]
+
+[project.urls]
+source = "https://github.com/wanadev/scanline-python-wrapper"
+documentation = "https://wanadev.github.io/scanline-python-wrapper/"
+changelog = "https://github.com/wanadev/scanline-python-wrapper?tab=readme-ov-file#changelog"
+issues = "https://github.com/wanadev/scanline-python-wrapper/issues"
+chat = "https://discord.gg/BmUkEdMuFp"
+
+[tool.setuptools]
+py-modules = ["scanline_wrapper"]
+
+[tool.black]
+target-version = ["py310"]
+
+[tool.flake8]
+ignore = [
+    # ↓↓ Black handles that its way... :)
+    "W503",  # line break before binary operator
+    "E501",  # line too long (> 79 characters)
+]