Require 3.12 in pyproject.toml

Author: adamtheturtle

.github/workflows/ci.yml

@@ -4,9 +4,9 @@ name: CI
 
 on:
   push:
-    branches: [master]
+    branches: [main]
   pull_request:
-    branches: [master]
+    branches: [main]
   schedule:
     # * is a special character in YAML so you have to quote this string
     # Run at 1:00 every day

.github/workflows/windows-ci.yml

@@ -4,9 +4,9 @@ name: Windows CI
 
 on:
   push:
-    branches: [master]
+    branches: [main]
   pull_request:
-    branches: [master]
+    branches: [main]
   schedule:
     # * is a special character in YAML so you have to quote this string
     # Run at 1:00 every day

.vscode/extensions.json

@@ -1,6 +1,5 @@
 {
     "recommendations": [
-        "ms-python.black-formatter",
         "charliermarsh.ruff",
         "ms-python.python"
     ]

.vscode/settings.json

@@ -3,7 +3,7 @@
         "editor.codeActionsOnSave": {
             "source.fixAll": true
         },
-        "editor.defaultFormatter": "ms-python.black-formatter",
+        "editor.defaultFormatter": "charliermarsh.ruff",
         "editor.formatOnSave": true
     }
 }

Makefile

@@ -7,14 +7,14 @@ SPHINXOPTS := -W
 
 .PHONY: lint
 lint: \
-    black \
     check-manifest \
     doc8 \
     linkcheck \
     mypy \
     ruff \
     pip-extra-reqs \
     pip-missing-reqs \
+    pyproject-fmt \
     pyright \
     pyroma \
     spelling \
@@ -23,7 +23,7 @@ lint: \
 
 .PHONY: fix-lint
 fix-lint: \
-    fix-black \
+    fix-pyproject-fmt \
     fix-ruff
 
 .PHONY: docs

README.rst

@@ -96,7 +96,7 @@ documentation <https://vws-python.readthedocs.io/en/latest>`__.
 
 .. |Build Status| image:: https://github.com/VWS-Python/vws-python/workflows/CI/badge.svg
    :target: https://github.com/VWS-Python/vws-python/actions
-.. |codecov| image:: https://codecov.io/gh/VWS-Python/vws-python/branch/master/graph/badge.svg
+.. |codecov| image:: https://codecov.io/gh/VWS-Python/vws-python/branch/main/graph/badge.svg
    :target: https://codecov.io/gh/VWS-Python/vws-python
 .. |PyPI| image:: https://badge.fury.io/py/VWS-Python.svg
    :target: https://badge.fury.io/py/VWS-Python

lint.mk

@@ -2,14 +2,6 @@
 
 SHELL := /bin/bash -euxo pipefail
 
-.PHONY: black
-black:
-	black --check .
-
-.PHONY: fix-black
-fix-black:
-	black .
-
 .PHONY: mypy
 mypy:
 	mypy .
@@ -25,10 +17,12 @@ doc8:
 .PHONY: ruff
 ruff:
 	ruff .
+	ruff format --check .
 
 .PHONY: fix-ruff
 fix-ruff:
 	ruff --fix .
+	ruff format .
 
 .PHONY: pip-extra-reqs
 pip-extra-reqs:
@@ -58,6 +52,14 @@ vulture:
 linkcheck:
 	$(MAKE) -C docs/ linkcheck SPHINXOPTS=$(SPHINXOPTS)
 
+.PHONY: pyproject-fmt
+ pyproject-fmt:
+	pyproject-fmt --keep-full-version --check --indent=4 pyproject.toml
+
+ .PHONY: fix-pyproject-fmt
+ fix-pyproject-fmt:
+	pyproject-fmt --keep-full-version --indent=4 pyproject.toml
+
 .PHONY: spelling
 spelling:
 	$(MAKE) -C docs/ spelling SPHINXOPTS=$(SPHINXOPTS)

pyproject.toml

@@ -84,10 +84,6 @@
     # --spelling-private-dict-file option instead of raising a message.
     spelling-store-unknown-words = 'no'
 
-[tool.black]
-
-line-length = 79
-
 [tool.coverage.run]
 
 branch = true
@@ -151,19 +147,20 @@ module = [
 ignore_missing_imports = true
 
 [build-system]
+build-backend = "setuptools.build_meta"
 requires = [
     "pip",
     "setuptools",
-    "setuptools_scm[toml]>=7.1.0",
+    "setuptools_scm[toml]>=7.1",
     "wheel",
 ]
-build-backend = "setuptools.build_meta"
 
 [tool.distutils.bdist_wheel]
 universal = true
 
 [tool.ruff]
 select = ["ALL"]
+line-length = 79
 
 ignore = [
     # We do not annotate the type of 'self'.
@@ -206,63 +203,68 @@ unfixable = ["ERA001"]
 ]
 
 [project]
+name = "vws-python"
+description = "Interact with the Vuforia Web Services (VWS) API."
+readme = { file = "README.rst", content-type = "text/x-rst"}
+keywords = [
+    "client",
+    "vuforia",
+    "vws",
+]
+license = { file = "LICENSE" }
 authors = [ { name = "Adam Dangoor", email = "adamdangoor@gmail.com"} ]
+requires-python = ">=3.12"
 classifiers = [
-    "Operating System :: POSIX",
+    "Development Status :: 5 - Production/Stable",
     "Environment :: Web Environment",
-    "Programming Language :: Python :: 3.12",
     "License :: OSI Approved :: MIT License",
-    "Development Status :: 5 - Production/Stable",
+    "Operating System :: POSIX",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.12",
+]
+dynamic = [
+    "version",
 ]
-description = "Interact with the Vuforia Web Services (VWS) API."
-dynamic = ["version"]
-keywords = ["vuforia", "vws", "client"]
-license = { file = "LICENSE" }
-name = "vws-python"
-readme = { file = "README.rst", content-type = "text/x-rst"}
-requires-python = ">=3.12"
 dependencies = [
-    "VWS-Auth-Tools",
     "requests",
     "urllib3",
+    "VWS-Auth-Tools",
 ]
-
 [project.optional-dependencies]
 dev = [
-    "PyYAML==6.0.1",
-    "Pygments==2.16.1",
-    "Sphinx-Substitution-Extensions==2022.2.16",
-    "Sphinx==7.2.6",
-    "VWS-Python-Mock==2023.5.21",
-    "VWS-Test-Fixtures==2023.3.5",
-    "black==23.10.0",
     "check-manifest==0.49",
     "doc8==1.1.1",
     "dodgy==0.2.1",
     "freezegun==1.2.2",
     "furo==2023.9.10",
-    "mypy==1.6.1",
-    "pdm==2.9.3",
+    "mypy==1.7.0",
+    "pdm==2.10.3",
     "pip_check_reqs==2.5.3",
-    "pydocstyle==6.3.0  ",
-    "pyenchant==3.2.2 ",
-    "pyright==1.1.332",
-    "pylint==3.0.1 ",
+    "pydocstyle==6.3",
+    "pyenchant==3.2.2",
+    "Pygments==2.17.1",
+    "pylint==3.0.2",
+    "pyproject-fmt==1.5.1",
+    "pyright==1.1.336",
     "pyroma==4.2",
-    "pytest-cov==4.1.0",
-    "pytest==7.4.2 ",
-    "ruff==0.1.1",
-    "sphinx-autodoc-typehints==1.24.0",
-    "sphinx-prompt==1.8.0",
-    "sphinxcontrib-spelling==8.0.0",
+    "pytest==7.4.3",
+    "pytest-cov==4.1",
+    "PyYAML==6.0.1",
+    "ruff==0.1.6",
+    "Sphinx==7.2.6",
+    "sphinx-autodoc-typehints==1.25.2",
+    "sphinx-prompt==1.8",
+    "Sphinx-Substitution-Extensions==2022.2.16",
+    "sphinxcontrib-spelling==8",
     "sybil==5.0.3",
     "types-requests==2.31.0.10",
     "vulture==2.10",
+    "VWS-Python-Mock==2023.5.21",
+    "VWS-Test-Fixtures==2023.3.5",
 ]
-
 [project.urls]
-Source = "https://github.com/VWS-Python/vws-python"
 Documentation = "https://vws-python.readthedocs.io/en/latest/"
+Source = "https://github.com/VWS-Python/vws-python"
 
 [tool.setuptools]
 zip-safe = false