Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump packaging version in tests to 23.2 #4231

Merged
merged 3 commits into from
Feb 22, 2024
Merged

Bump packaging version in tests to 23.2 #4231

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73466de
Bump packaging in tests to 23.2
Avasam Feb 22, 2024
adc8999
PR number to newsfragment
Avasam Feb 22, 2024
86a2899
Use setup.cfg to specify test dependency on packaging
abravalheri Feb 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions newsfragments/4231.misc.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Bump ``packaging`` to version 23.2 in tests -- by :user:`Avasam`
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,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
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions setuptools/tests/config/test_apply_pyprojecttoml.py
View file
Open in desktop
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
View file
Open in desktop
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
3 changes: 1 addition & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
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
packaging >= 23.2
abravalheri marked this conversation as resolved.
Show resolved Hide resolved
setenv =
PYTHONWARNDEFAULTENCODING = 1
SETUPTOOLS_ENFORCE_DEPRECATION = {env:SETUPTOOLS_ENFORCE_DEPRECATION:0}
Expand Down