Merge branch 'main' into wheelfile

Author: brettcannon

.github/workflows/codeql.yml

@@ -35,7 +35,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
+      uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -47,9 +47,9 @@ jobs:
 
     # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
     - name: Autobuild
-      uses: github/codeql-action/autobuild@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
+      uses: github/codeql-action/autobuild@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
+      uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/docs.yml

@@ -25,7 +25,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         name: Install Python
         with:
           python-version: "3.9"

.github/workflows/lint.yml

@@ -27,7 +27,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         name: Install Python
         with:
           python-version: "3.9"

.github/workflows/test.yml

@@ -26,12 +26,12 @@ jobs:
       matrix:
         os: [Ubuntu, Windows, macOS]
         python_version:
-          ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.8", "pypy3.9", "pypy3.10"]
+          ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14", "pypy3.8", "pypy3.9", "pypy3.10", "pypy3.11"]
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         name: Install Python ${{ matrix.python_version }}
         with:
           python-version: ${{ matrix.python_version }}

.pre-commit-config.yaml

@@ -1,10 +1,11 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v5.0.0
     hooks:
       - id: check-toml
       - id: check-yaml
       - id: end-of-file-fixer
+      - id: mixed-line-ending
       - id: trailing-whitespace
 
   - repo: https://github.com/pre-commit/mirrors-mypy
@@ -13,11 +14,25 @@ repos:
       - id: mypy
         exclude: '^(docs|tasks|tests)|setup\.py'
         args: []
-        additional_dependencies: [pyparsing, nox]
+        additional_dependencies: [pyparsing, nox, orjson]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.1
+    rev: v0.11.8
     hooks:
       - id: ruff
-        args: [ --fix ]
+        args: [ --fix, --show-fixes ]
       - id: ruff-format
+
+  - repo: https://github.com/pre-commit/pygrep-hooks
+    rev: "v1.10.0"
+    hooks:
+    - id: rst-backticks
+    - id: rst-directive-colons
+    - id: rst-inline-touching-normal
+
+  - repo: https://github.com/codespell-project/codespell
+    rev: "v2.4.1"
+    hooks:
+      - id: codespell
+        additional_dependencies:
+          - tomli; python_version<'3.11'

CHANGELOG.rst

@@ -72,7 +72,7 @@ Changelog
 * Parse raw metadata (:issue:`671`)
 * Import underlying parser functions as an underscored variable (:issue:`663`)
 * Improve error for local version label with unsupported operators (:issue:`675`)
-* Add dedicated error for specifiers with incorrect `.*` suffix
+* Add dedicated error for specifiers with incorrect ``.*`` suffix
 * Replace spaces in platform names with underscores (:issue:`620`)
 * Relax typing of ``_key`` on ``_BaseVersion`` (:issue:`669`)
 * Handle prefix match with zeros at end of prefix correctly (:issue:`674`)
@@ -175,8 +175,8 @@ No unreleased changes.
 .. note:: This release was subsequently yanked, and these changes were included in 20.7.
 
 * Fix flit configuration, to include LICENSE files (:issue:`357`)
-* Make `intel` a recognized CPU architecture for the `universal` macOS platform tag (:issue:`361`)
-* Add some missing type hints to `packaging.requirements` (issue:`350`)
+* Make ``intel`` a recognized CPU architecture for the ``universal`` macOS platform tag (:issue:`361`)
+* Add some missing type hints to ``packaging.requirements`` (issue:`350`)
 
 20.5 - 2020-11-27
 ~~~~~~~~~~~~~~~~~
@@ -228,7 +228,7 @@ No unreleased changes.
 
 * Add ``major``, ``minor``, and ``micro`` aliases to ``packaging.version.Version`` (:issue:`225`)
 
-* Properly mark ``packaging`` has being fully typed by adding a `py.typed` file (:issue:`226`)
+* Properly mark ``packaging`` has being fully typed by adding a ``py.typed`` file (:issue:`226`)
 
 19.2 - 2019-09-18
 ~~~~~~~~~~~~~~~~~

docs/markers.rst

@@ -21,7 +21,7 @@ Usage
     >>> marker.evaluate()
     True
     >>> # We can also override the environment
-    >>> env = {'python_version': '1.5.4'}
+    >>> env = {'python_version': '1.5'}
     >>> marker.evaluate(environment=env)
     False
     >>> # Multiple markers can be ANDed

docs/metadata.rst

@@ -4,7 +4,7 @@ Metadata
 .. currentmodule:: packaging.markers
 
 
-Both `source distributions`_ and `binary distributions`
+Both `source distributions`_ and `binary distributions`_
 (_sdists_ and _wheels_, respectively) contain files recording the
 `core metadata`_ for the distribution. This information is used for
 everything from recording the name of the distribution to the

noxfile.py

@@ -29,37 +29,39 @@
         "3.11",
         "3.12",
         "3.13",
+        "3.14",
         "pypy3.8",
         "pypy3.9",
         "pypy3.10",
+        "pypy3.11",
     ]
 )
 def tests(session):
-    def coverage(*args):
-        session.run("python", "-m", "coverage", *args)
+    coverage = ["python", "-m", "coverage"]
 
     session.install("-r", "tests/requirements.txt")
     session.install(".")
+    env = {} if session.python != "3.14" else {"COVERAGE_CORE": "sysmon"}
 
     if "pypy" not in session.python:
-        coverage(
+        session.run(
+            *coverage,
             "run",
             "--source",
             "packaging",
             "-m",
             "pytest",
-            "--strict-markers",
             *session.posargs,
+            env=env,
         )
-        coverage("report", "-m", "--fail-under", "100")
+        session.run(*coverage, "report", "-m", "--fail-under", "100")
     else:
         # Don't do coverage tracking for PyPy, since it's SLOW.
         session.run(
             "python",
             "-m",
             "pytest",
             "--capture=no",
-            "--strict-markers",
             *session.posargs,
         )
 

pyproject.toml

@@ -24,6 +24,7 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
   "Programming Language :: Python :: Implementation :: CPython",
   "Programming Language :: Python :: Implementation :: PyPy",
   "Typing :: Typed",
@@ -39,27 +40,38 @@ Source = "https://github.com/pypa/packaging"
 include = ["tests/", "docs/", "CHANGELOG.rst"]
 exclude = ["docs/_build", "tests/manylinux/build-hello-world.sh", "tests/musllinux/build.sh", "tests/hello-world.c", "tests/__pycache__", "build/__pycache__"]
 
+[tool.codespell]
+ignore-words-list = [
+    "dynamc",
+    "notin"
+]
 
 [tool.coverage.run]
 branch = true
 
 [tool.coverage.report]
 exclude_lines = ["pragma: no cover", "@abc.abstractmethod", "@abc.abstractproperty"]
 
+[tool.pytest.ini_options]
+minversion = "6.2"
+addopts = ["-ra", "--showlocals", "--strict-markers", "--strict-config"]
+xfail_strict = true
+filterwarnings = ["error"]
+log_cli_level = "INFO"
+testpaths = ["tests"]
+
 
 [tool.mypy]
 strict = true
-show_error_codes = true
 enable_error_code = ["ignore-without-code", "redundant-expr", "truthy-bool"]
 warn_unused_ignores = true
-python_version = 3.8
+python_version = "3.8"
 
 [[tool.mypy.overrides]]
 module = ["_manylinux"]
 ignore_missing_imports = true
 
 [tool.ruff]
-src = ["src"]
 extend-exclude = [
     "src/packaging/licenses/_spdx.py"
 ]
@@ -72,28 +84,16 @@ extend-select = [
     "FA",
     "I",
     "N",
-    "UP",
+    "PYI",
     "RUF",
+    "UP",
     "W"
 ]
 ignore = [
-    "B027",
-    "F821",
-    "N818",
-    "RUF003",
-    "RUF012",
-    "UP032",
-    # https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
-    "W191",
-    "E111",
-    "E114",
-    "E117",
-    "D206",
-    "D300",
-    "Q000",
-    "Q001",
-    "Q002",
-    "Q003",
-    "COM812",
-    "COM819",
+    "N818",  # exceptions must end in "*Error"
 ]
+
+[tool.ruff.lint.per-file-ignores]
+"tests/test_*.py" = ["PYI024"]
+"tasks/check.py" = ["UP032"]
+"tests/test_requirements.py" = ["UP032"]