Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions examples/single/expected.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
long_description_content_type: (README.rst ) text/x-rst
name: (explicit ) single
py_modules: (auto-fill ) ["single"]
setup_requires: (explicit ) ["setupmeta", "setuptools_scm"]
setup_requires: (explicit ) ["setupmeta"]
url: (missing ) - Consider specifying 'url'
version: (single.py:8 ) 0.1.0

Expand All @@ -33,7 +33,6 @@ setup(
long_description_content_type="text/x-rst", # from README.rst
name="single",
py_modules=["single"],
setup_requires=["setuptools_scm"],
version=__version__, # from single.py:8
)

Expand Down
2 changes: 1 addition & 1 deletion examples/single/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@

setup(
name="single",
setup_requires=["setupmeta", "setuptools_scm"],
setup_requires=["setupmeta"],
)
2 changes: 1 addition & 1 deletion tests/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pep440
packaging
pytest-cov
setuptools # Needed by definition, as setupmeta is setuptools hook
4 changes: 2 additions & 2 deletions tests/test_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ def test_check_dependencies():
# check --deptree is only useful when ran from a venv, which is guaranteed when invoking tests via tox (but may not be otherwise)
run_setup_py(
["check", "--deptree"],
"""
pep440==.+
r"""
packaging \[required: Any, installed: [\d+.]+\]
pytest-cov==.+
""",
folder=conftest.PROJECT_DIR,
Expand Down
6 changes: 3 additions & 3 deletions tests/test_content.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ def test_run_program():
assert setupmeta.run_program("ls", capture=True, dryrun=True) is None
assert setupmeta.run_program("ls", capture=False, dryrun=True) == 0
assert setupmeta.run_program("ls", "foo/does/not/exist", capture=None) != 0
assert setupmeta.run_program("pip", "--version", capture=True)
assert setupmeta.run_program("pip", "foo bar", capture=True) == ""
assert "unknown command" in setupmeta.run_program("pip", "foo bar", capture="all")
assert setupmeta.run_program("python", "--version", capture=True)
assert setupmeta.run_program("python", "-c", "foo", capture=True) == ""
assert "NameError:" in setupmeta.run_program("python", "-c", "foo", capture="all")
assert setupmeta.run_program("/foo/does/not/exist", capture=True, dryrun=True) is None
assert setupmeta.run_program("/foo/does/not/exist", capture=False) != 0

Expand Down
4 changes: 2 additions & 2 deletions tests/test_versioning.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import sys
from unittest.mock import patch

import pep440
import pytest
from packaging.version import parse

import setupmeta
import setupmeta.versioning
Expand Down Expand Up @@ -161,7 +161,7 @@ def quick_check(versioning, expected, describe="v0.1.2-5-g123-dirty", compliant=
assert meta.version == expected
if compliant:
main_part, _, _ = meta.version.partition("+")
assert pep440.is_canonical(main_part)
assert str(parse(main_part)) == main_part

versioning = meta.versioning
assert versioning.enabled
Expand Down
Loading