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

jaraco · May 11, 2023 · b5617cc · b5617cc
2 parents b536604 + d2ec047
commit b5617cc
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 27 deletions.
diff --git a/.flake8 b/.flake8
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -2,6 +2,9 @@ name: tests
 
 on: [push, pull_request]
 
+permissions:
+  contents: read
+
 env:
   # Environment variables to support color support (jaraco/skeleton#66):
   # Request colored output from CLI tools supporting it. Different tools
@@ -104,6 +107,8 @@ jobs:
         jobs: ${{ toJSON(needs) }}
 
   release:
+    permissions:
+      contents: write
     needs:
     - check
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')

diff --git 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
@@ -13,8 +13,8 @@ addopts = "--black"
 [tool.pytest-enabler.mypy]
 addopts = "--mypy"
 
-[tool.pytest-enabler.flake8]
-addopts = "--flake8"
-
 [tool.pytest-enabler.cov]
 addopts = "--cov"
+
+[tool.pytest-enabler.ruff]
+addopts = "--ruff"
diff --git a/pytest.ini b/pytest.ini
@@ -7,19 +7,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
@@ -39,11 +39,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"
@@ -52,6 +47,7 @@ testing =
 		# workaround for jaraco/skeleton#22
 		python_implementation != "PyPy"
 	pytest-enabler >= 1.3
+	pytest-ruff
 
 	# local
 	pygments