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

Expand the range of supported setuptools. #541

Merged
merged 3 commits into from
Aug 21, 2018
Merged

Expand the range of supported setuptools. #541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7dafb0
Expand the range of supported setuptools.
jsirois Aug 18, 2018
3696b3a
Ensure we have a modern pip in tests that understands version exclusi…
jsirois Aug 18, 2018
b35a1c6
Inline exclusions in the setuptools requirement.
jsirois Aug 21, 2018
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
1 change: 1 addition & 0 deletions pex/testing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ def ensure_python_distribution(version):
if not os.path.exists(interpreter_location):
os.environ['PYENV_ROOT'] = pyenv_root
subprocess.check_call([pyenv, 'install', '--keep', version])
subprocess.check_call([pip, 'install', '-U', 'pip'])
subprocess.check_call([pip, 'install', SETUPTOOLS_REQUIREMENT])

python = os.path.join(interpreter_location, 'bin', 'python' + version[0:3])
Expand Down
9 changes: 4 additions & 5 deletions pex/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@

__version__ = '1.4.5'

# NB: If we upgrade to setuptools>=34 pex's bootstrap code in `PEXBuilder` will need an update to
# include the `packaging` package in the `.bootstrap/` code since we use
# `packaging.specifiers.SpecifierSet` - indirectly - through `pkg_resources.Requirement.specifier`.
SETUPTOOLS_REQUIREMENT = 'setuptools>=20.3,<34.0'
# Versions 34.0.0 through 35.0.2 (last pre-36.0.0) de-vendored dependencies which causes problems
# for pex code so we exclude that range.
SETUPTOOLS_REQUIREMENT = 'setuptools>=20.3,<41,!=34.*,!=35.*'

WHEEL_REQUIREMENT = 'wheel>=0.26.0,<0.32.0'
WHEEL_REQUIREMENT = 'wheel>=0.26.0,<0.32'