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

jaraco · jaraco · commit d85f32b84151 · 2025-05-03T11:40:11.000-04:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -21,7 +21,6 @@ env:
 
   # Suppress noisy pip warnings
   PIP_DISABLE_PIP_VERSION_CHECK: 'true'
-  PIP_NO_PYTHON_VERSION_WARNING: 'true'
   PIP_NO_WARN_SCRIPT_LOCATION: 'true'
 
   # Ensure tests can sense settings about the environment
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.7.1
+  rev: v0.9.9
   hooks:
   - id: ruff
     args: [--fix, --unsafe-fixes]
diff --git a/LICENSE b/LICENSE
diff --git a/README.rst b/README.rst
@@ -7,7 +7,7 @@
    :target: https://github.com/python/importlib_resources/actions?query=workflow%3A%22tests%22
    :alt: tests
 
-.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json
+.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json
     :target: https://github.com/astral-sh/ruff
     :alt: Ruff
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -15,11 +15,11 @@ readme = "README.rst"
 classifiers = [
 	"Development Status :: 5 - Production/Stable",
 	"Intended Audience :: Developers",
-	"License :: OSI Approved :: Apache Software License",
 	"Programming Language :: Python :: 3",
 	"Programming Language :: Python :: 3 :: Only",
 ]
 requires-python = ">=3.9"
+license = "Apache-2.0"
 dependencies = [
 	"zipp >= 3.1.0; python_version < '3.10'",
 ]
diff --git a/ruff.toml b/ruff.toml
@@ -1,16 +1,12 @@
-# extend pyproject.toml for requires-python (workaround astral-sh/ruff#10299)
-extend = "pyproject.toml"
-
 [lint]
 extend-select = [
 	# upstream
- 
+
 	"C901", # complex-structure
 	"I", # isort
 	"PERF401", # manual-list-comprehension
-	"W", # pycodestyle Warning
- 
- 	# Ensure modern type annotation syntax and best practices
+
+	# Ensure modern type annotation syntax and best practices
 	# Not including those covered by type-checkers or exclusive to Python 3.11+
 	"FA", # flake8-future-annotations
 	"F404", # late-future-import
@@ -26,7 +22,7 @@ extend-select = [
 ]
 ignore = [
 	# upstream
- 
+
 	# Typeshed rejects complex or non-literal defaults for maintenance and testing reasons,
 	# irrelevant to this project.
 	"PYI011", # typed-argument-default-in-stub
@@ -43,10 +39,8 @@ ignore = [
 	"Q003",
 	"COM812",
 	"COM819",
-	"ISC001",
-	"ISC002",
 
- 	# local
+	# local
 ]
 
 [format]

Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,11 @@ readme = "README.rst"`
`15`	`15`	`classifiers = [`
`16`	`16`	`"Development Status :: 5 - Production/Stable",`
`17`	`17`	`"Intended Audience :: Developers",`
`18`		`- "License :: OSI Approved :: Apache Software License",`
`19`	`18`	`"Programming Language :: Python :: 3",`
`20`	`19`	`"Programming Language :: Python :: 3 :: Only",`
`21`	`20`	`]`
`22`	`21`	`requires-python = ">=3.9"`
	`22`	`+license = "Apache-2.0"`
`23`	`23`	`dependencies = [`
`24`	`24`	`"zipp >= 3.1.0; python_version < '3.10'",`
`25`	`25`	`]`