Merge branch 'main' into update-flake8-compat-4.x-to-latest

pypros · web-flow · commit aa4dfd9d5973 · 2024-11-08T22:50:40.000+01:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -35,15 +35,13 @@ jobs:
       # https://blog.jaraco.com/efficient-use-of-ci-resources/
       matrix:
         python:
-        - "3.8"
+        - "3.9"
         - "3.13"
         platform:
         - ubuntu-latest
         - macos-latest
         - windows-latest
         include:
-        - python: "3.9"
-          platform: ubuntu-latest
         - python: "3.10"
           platform: ubuntu-latest
         - python: "3.11"
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.5.6
+  rev: v0.7.1
   hooks:
   - id: ruff
     args: [--fix, --unsafe-fixes]
diff --git a/pyproject.toml b/pyproject.toml
@@ -22,7 +22,7 @@ classifiers = [
 	"Topic :: Software Development :: Quality Assurance",
 	"Topic :: Software Development :: Testing",
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 dependencies = [
 	"flake8 >= 4.0",
 	"pytest >= 7.0",
diff --git a/ruff.toml b/ruff.toml
@@ -1,3 +1,6 @@
+# extend pyproject.toml for requires-python (workaround astral-sh/ruff#10299)
+extend = "pyproject.toml"
+
 [lint]
 extend-select = [
 	"C901",

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ classifiers = [`
`22`	`22`	`"Topic :: Software Development :: Quality Assurance",`
`23`	`23`	`"Topic :: Software Development :: Testing",`
`24`	`24`	`]`
`25`		`-requires-python = ">=3.8"`
	`25`	`+requires-python = ">=3.9"`
`26`	`26`	`dependencies = [`
`27`	`27`	`"flake8 >= 4.0",`
`28`	`28`	`"pytest >= 7.0",`