Merge https://github.com/jaraco/skeleton

# Conflicts:
#	.flake8
#	pyproject.toml
#	setup.cfg

6 files changed, 10 insertions, 35 deletions

diff --git a/.flake8 b/.flake8
deleted file mode 100644
index 9a5f2615..00000000
--- a/.flake8
+++ /dev/null
@@ -1,16 +0,0 @@
-[flake8]
-max-line-length = 88
-
-# jaraco/skeleton#34
-max-complexity = 10
-
-extend-exclude =
-	build
-	setuptools/_vendor
-	setuptools/_distutils
-	setuptools/config/_validate_pyproject/fastjsonschema_*
-	pkg_resources/_vendor
-
-extend-ignore =
-	# Black creates whitespace before colon
-	E203
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c1bebc48..d962bdba 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -9,6 +9,9 @@ concurrency:
     ${{ github.event.pull_request.number || github.sha }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+
 env:
   # Environment variables to support color support (jaraco/skeleton#66):
   # Request colored output from CLI tools supporting it. Different tools
@@ -228,6 +231,8 @@ jobs:
         run: tox -e integration
 
   release:
+    permissions:
+      contents: write
     needs:
     - check
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
diff --git a/LICENSE b/LICENSE
index 353924be..1bb5a443 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,3 @@
-Copyright Jason R. Coombs
-
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
 deal in the Software without restriction, including without limitation the
diff --git a/pyproject.toml b/pyproject.toml
index 480b1368..6b5fbf71 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -14,12 +14,12 @@ skip-string-normalization = true
 [tool.pytest-enabler.mypy]
 #addopts = "--mypy"
 
-[tool.pytest-enabler.flake8]
-addopts = "--flake8"
-
 [tool.pytest-enabler.cov]
 addopts = "--cov"
 
+[tool.pytest-enabler.ruff]
+addopts = "--ruff"
+
 [tool.pytest-enabler.xdist]
 addopts = "-n auto"
 
diff --git a/pytest.ini b/pytest.ini
index 9131822b..19043d3f 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -14,19 +14,11 @@ filterwarnings=
 	# Ensure ResourceWarnings are emitted
 	default::ResourceWarning
 
-	# Suppress deprecation warning in flake8
-	ignore:SelectableGroups dict interface is deprecated::flake8
-
 	# shopkeep/pytest-black#55
 	ignore:<class 'pytest_black.BlackItem'> is not using a cooperative constructor:pytest.PytestDeprecationWarning
 	ignore:The \(fspath. py.path.local\) argument to BlackItem is deprecated.:pytest.PytestDeprecationWarning
 	ignore:BlackItem is an Item subclass and should not be a collector:pytest.PytestWarning
 
-	# tholo/pytest-flake8#83
-	ignore:<class 'pytest_flake8.Flake8Item'> is not using a cooperative constructor:pytest.PytestDeprecationWarning
-	ignore:The \(fspath. py.path.local\) argument to Flake8Item is deprecated.:pytest.PytestDeprecationWarning
-	ignore:Flake8Item is an Item subclass and should not be a collector:pytest.PytestWarning
-
 	# shopkeep/pytest-black#67
 	ignore:'encoding' argument not specified::pytest_black
 
diff --git a/setup.cfg b/setup.cfg
index dde75c71..48ae7a69 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -43,11 +43,6 @@ testing =
 	# upstream
 	pytest >= 6
 	pytest-checkdocs >= 2.4
-	pytest-flake8; \
-		# workaround for tholo/pytest-flake8#87
-		python_version < "3.12"
-	# workaround for tholo/pytest-flake8#87
-	flake8 < 5
 	pytest-black >= 0.3.7; \
 		# workaround for jaraco/skeleton#22
 		python_implementation != "PyPy"
@@ -58,7 +53,7 @@ testing =
 		# workaround for jaraco/skeleton#22
 		python_implementation != "PyPy"
 	pytest-enabler >= 1.3
-	pytest-perf
+	pytest-ruff
 
 	# local
 	flake8-2020
@@ -74,6 +69,7 @@ testing =
 	ini2toml[lite]>=0.9
 	tomli-w>=1.0.0
 	pytest-timeout
+	pytest-perf
 
 testing-integration =
 	pytest