Skip to content

Commit 8d3d2f8

Browse files
zsimicLecrisUTZoran Simic
authored
Drop PEP440 dependency (#87)
* Drop PEP440 dependency * Updated tests, do not assume pip is present (when using `uv`, it is not present by default) * Satisfied linter --------- Co-authored-by: Cristian Le <[email protected]> Co-authored-by: Zoran Simic <[email protected]>
1 parent f64bd22 commit 8d3d2f8

File tree

6 files changed

+10
-11
lines changed

6 files changed

+10
-11
lines changed

examples/single/expected.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
long_description_content_type: (README.rst ) text/x-rst
1111
name: (explicit ) single
1212
py_modules: (auto-fill ) ["single"]
13-
setup_requires: (explicit ) ["setupmeta", "setuptools_scm"]
13+
setup_requires: (explicit ) ["setupmeta"]
1414
url: (missing ) - Consider specifying 'url'
1515
version: (single.py:8 ) 0.1.0
1616

@@ -33,7 +33,6 @@ setup(
3333
long_description_content_type="text/x-rst", # from README.rst
3434
name="single",
3535
py_modules=["single"],
36-
setup_requires=["setuptools_scm"],
3736
version=__version__, # from single.py:8
3837
)
3938

examples/single/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88

99
setup(
1010
name="single",
11-
setup_requires=["setupmeta", "setuptools_scm"],
11+
setup_requires=["setupmeta"],
1212
)

tests/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
pep440
1+
packaging
22
pytest-cov
33
setuptools # Needed by definition, as setupmeta is setuptools hook

tests/test_commands.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ def test_check_dependencies():
4040
# check --deptree is only useful when ran from a venv, which is guaranteed when invoking tests via tox (but may not be otherwise)
4141
run_setup_py(
4242
["check", "--deptree"],
43-
"""
44-
pep440==.+
43+
r"""
44+
packaging \[required: Any, installed: [\d+.]+\]
4545
pytest-cov==.+
4646
""",
4747
folder=conftest.PROJECT_DIR,

tests/test_content.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ def test_run_program():
7878
assert setupmeta.run_program("ls", capture=True, dryrun=True) is None
7979
assert setupmeta.run_program("ls", capture=False, dryrun=True) == 0
8080
assert setupmeta.run_program("ls", "foo/does/not/exist", capture=None) != 0
81-
assert setupmeta.run_program("pip", "--version", capture=True)
82-
assert setupmeta.run_program("pip", "foo bar", capture=True) == ""
83-
assert "unknown command" in setupmeta.run_program("pip", "foo bar", capture="all")
81+
assert setupmeta.run_program("python", "--version", capture=True)
82+
assert setupmeta.run_program("python", "-c", "foo", capture=True) == ""
83+
assert "NameError:" in setupmeta.run_program("python", "-c", "foo", capture="all")
8484
assert setupmeta.run_program("/foo/does/not/exist", capture=True, dryrun=True) is None
8585
assert setupmeta.run_program("/foo/does/not/exist", capture=False) != 0
8686

tests/test_versioning.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
import sys
33
from unittest.mock import patch
44

5-
import pep440
65
import pytest
6+
from packaging.version import parse
77

88
import setupmeta
99
import setupmeta.versioning
@@ -161,7 +161,7 @@ def quick_check(versioning, expected, describe="v0.1.2-5-g123-dirty", compliant=
161161
assert meta.version == expected
162162
if compliant:
163163
main_part, _, _ = meta.version.partition("+")
164-
assert pep440.is_canonical(main_part)
164+
assert str(parse(main_part)) == main_part
165165

166166
versioning = meta.versioning
167167
assert versioning.enabled

0 commit comments

Comments
 (0)