Skip to content

Commit

Permalink
Change default versions for setuptools options (#11515)
Browse files Browse the repository at this point in the history
[ci skip-rust]
  • Loading branch information
asherf committed Feb 3, 2021
1 parent 2a75f94 commit e6cf57b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions 3rdparty/python/constraints.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by build-support/bin/generate_lockfile.sh on Mon Feb 1 09:18:01 PST 2021
# Generated by build-support/bin/generate_lockfile.sh on Tue Feb 2 17:24:12 PST 2021
ansicolors==1.1.8
attrs==20.3.0
beautifulsoup4==4.6.3
Expand Down Expand Up @@ -28,7 +28,7 @@ python-dateutil==2.8.1
PyYAML==5.4.1
requests==2.25.1
setproctitle==1.2
setuptools==50.3.2
setuptools==53.0.0
six==1.15.0
toml==0.10.2
typed-ast==1.4.2
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/python/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ pytest>=6.0.1,<6.3
PyYAML>=5.4,<5.5
requests[security]>=2.20.1
setproctitle==1.2
setuptools>=50.3.0,<50.4
setuptools>=50.3.0,<54.0
toml==0.10.2
typing-extensions==3.7.4.2
4 changes: 2 additions & 2 deletions src/python/pants/backend/python/subsystems/setuptools.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class Setuptools(PythonToolBase):

# NB: setuptools doesn't have an entrypoint, unlike most python tools.
# We call it via a generated setup.py script.
default_version = "setuptools>=50.3.0,<50.4"
default_extra_requirements = ["wheel==0.35.1"]
default_version = "setuptools>=50.3.0,<54.0"
default_extra_requirements = ["wheel>=0.35.1,<0.37"]
register_interpreter_constraints = True
default_interpreter_constraints = ["CPython>=3.5"]

0 comments on commit e6cf57b

Please sign in to comment.