Skip to content

Commit

Permalink
Bump test dependency on packaging to 23.2 (#4231)
Browse files Browse the repository at this point in the history
  • Loading branch information
abravalheri committed Feb 22, 2024
2 parents 569fd7b + 86a2899 commit a9e7b72
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 17 deletions.
1 change: 1 addition & 0 deletions newsfragments/4231.misc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Bump ``packaging`` to version 23.2 in tests -- by :user:`Avasam`
3 changes: 2 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ testing =
virtualenv>=13.0.0
wheel
pip>=19.1 # For proper file:// URLs support.
packaging>=23.2
jaraco.envs>=2.2
pytest-xdist
jaraco.path>=3.2.0
Expand All @@ -85,7 +86,7 @@ testing-integration =
jaraco.envs>=2.2
build[virtualenv]>=1.0.3
filelock>=3.4.0
packaging>=23.1 # TODO: update once packaging 23.2 is available
packaging>=23.2

docs =
# upstream
Expand Down
9 changes: 0 additions & 9 deletions setuptools/tests/_packaging_compat.py

This file was deleted.

3 changes: 1 addition & 2 deletions setuptools/tests/config/test_apply_pyprojecttoml.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
import pytest
from ini2toml.api import Translator

# TODO: replace with `from packaging.metadata import Metadata` in future versions
from .._packaging_compat import Metadata
from packaging.metadata import Metadata

import setuptools # noqa ensure monkey patch to metadata
from setuptools.dist import Distribution
Expand Down
5 changes: 2 additions & 3 deletions setuptools/tests/test_core_metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@

import pytest

# TODO: replace with `from packaging.metadata import Metadata` in future versions:
from ._packaging_compat import Metadata
from packaging.metadata import Metadata

from setuptools import sic, _reqs
from setuptools.dist import Distribution
Expand Down Expand Up @@ -312,7 +311,7 @@ def test_parity_with_metadata_from_pypa_wheel(tmp_path):
# Example with complex requirement definition
python_requires=">=3.8",
install_requires="""
packaging==23.0
packaging==23.2
ordered-set==3.1.1
more-itertools==8.8.0; extra == "other"
jaraco.text==3.7.0
Expand Down
2 changes: 0 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
description = perform primary checks (tests, style, types, coverage)
deps =
# Ideally all the dependencies should be set as "extras"
packaging @ git+https://github.com/pypa/packaging@7e68d82
# ^-- use dev version while we wait for the new release
setenv =
PYTHONWARNDEFAULTENCODING = 1
SETUPTOOLS_ENFORCE_DEPRECATION = {env:SETUPTOOLS_ENFORCE_DEPRECATION:0}
Expand Down

0 comments on commit a9e7b72

Please sign in to comment.