Skip to content

Commit

Permalink
Unpin setuptools and fix test
Browse files Browse the repository at this point in the history
Signed-off-by: Merel Theisen <merel.theisen@quantumblack.com>
  • Loading branch information
merelcht committed Feb 3, 2023
1 parent 4b8b122 commit 0dd7133
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ clean:
pre-commit clean || true

install-pip-setuptools:
pip install -U "pip>=21.2" "setuptools>=65.5.1, <67.0.0" wheel
pip install -U "pip>=21.2" "setuptools>=65.5.1" wheel

lint:
pre-commit run -a --hook-stage manual $(hook)
Expand Down
2 changes: 1 addition & 1 deletion dependency/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ pluggy~=1.0.0
PyYAML>=4.2, <7.0
rich~=13.3
rope~=1.7.0 # subject to LGPLv3 license
setuptools>=65.5.1, <67.0.0
setuptools>=65.5.1
toml~=0.10
toposort~=1.9 # Needs to be at least 1.5 to be able to raise CircularDependencyError
2 changes: 1 addition & 1 deletion features/environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def _setup_minimal_env(context):
"install",
"-U",
"pip>=21.2",
"setuptools>=65.5.1, <67.0.0",
"setuptools>=65.5.1",
"wheel",
],
env=context.env,
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# PEP-518 https://peps.python.org/pep-0518/
[build-system]
# Minimum requirements for the build system to execute.
requires = ["setuptools>=65.5.1, <67.0.0", "wheel"] # PEP 518 specifications.
requires = ["setuptools>=65.5.1", "wheel"] # PEP 518 specifications.

[tool.black]
exclude = "/templates/|^features/steps/test_starter"
Expand Down
6 changes: 5 additions & 1 deletion tests/framework/cli/micropkg/test_micropkg_requirements.py
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ def test_empty_pipeline_requirements_txt(
def test_complex_requirements(
self, requirement, fake_project_cli, fake_metadata, fake_package_path
):
# pylint: disable=condition-evals-to-constant
"""Options that are valid in requirements.txt but cannot be packaged using
setup.py."""
self.call_pipeline_create(fake_project_cli, fake_metadata)
Expand All @@ -263,4 +264,7 @@ def test_complex_requirements(
obj=fake_metadata,
)
assert result.exit_code == 1
assert "InvalidRequirement: Parse error" in result.output
assert (
"InvalidRequirement: Expected package name at the start of dependency specifier"
or "InvalidRequirement: Expected end or semicolon" in result.output
)
2 changes: 1 addition & 1 deletion tools/circleci/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pip>=21.2
setuptools>=65.5.1, <67.0.0
setuptools>=65.5.1
twine~=3.0

0 comments on commit 0dd7133

Please sign in to comment.