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

Jump to bottom

Fixed pip install issues #939

Merged
merged 6 commits into from
Apr 17, 2021
Merged

Fixed pip install issues #939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ae59631
Fixed pip install issues
andy-maier Apr 17, 2021
eba7e4a
Made dependencies to pywbem in minimum-comstraints consistent
andy-maier Apr 17, 2021
2abe6f6
Fixed inconsistencies between minimum-constraints and dev-requirements
andy-maier Apr 17, 2021
a3be808
Fixed safety/dparse conflict
andy-maier Apr 17, 2021
d9d038d
Fixed pkginfo conflict
andy-maier Apr 17, 2021
ada62f5
Fixed requests-toolbelt conflict
andy-maier Apr 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion dev-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ safety>=1.9.0; python_version >= '3.5'
# dparse 0.5.0 has an infinite recursion issue on Python 2.7,
# see https://github.com/pyupio/dparse/issues/46
dparse>=0.4.1,<0.5.0; python_version == '2.7'
dparse>=0.4.1; python_version >= '3.4'
dparse>=0.4.1; python_version == '3.4'
dparse>=0.5.1; python_version >= '3.5'

# PyYAML is also pulled in by dparse and python-coveralls
# PyYAML 5.3 has removed support for Python 3.4
Expand Down
41 changes: 24 additions & 17 deletions minimum-constraints-base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,16 @@
# pip 9.0.1 2016-11-06
# setuptools 33.1.1 2017-01-16
# wheel 0.29.0 2016-02-06
# * Ubuntu 18.04:
# Python 2.7.15
# Python3 3.6.5
# pip 9.0.1 (py2+py3)
# setuptools 39.0.1 (py2+py3)
# wheel 0.30.0 (py2+py3)

# Info: Python version supported by base packages (added / removed)
# * Python 2.7 support:
# pip ?
# pip ? / 21.0
# setuptools ? / 45.0.0
# wheel ?
# * Python 3.4 support:
Expand All @@ -50,31 +56,32 @@
# wheel 0.33.5


# For the base packages, we use the versions from Ubuntu 17.04 as a general
# For the base packages, we use the versions from Ubuntu 18.04 as a general
# minimum, and then increase it to the first version that introduced support
# for a particular Python version.

# Additional requirements:
# * pip>=9.0.0 to support the --upgrade-strategy option
# * setuptools>=20.5 to support environment markers
# * Python 3.4 on Windows on GitHub Actions has Pip 7.1.2 pre-installed,
# which does not yet support python_requires, so it will upgrade Pip beyond the
# latest supported version on Python 3.4. Therefore, we initially upgrade the
# basic packages only to their minimum defined in this file.
# * pip 10.0.0 introduced the --exclude-editable option.
# * pip before 21.0 cannot install cryptography on py39

# Note that Python 3.4 on Windows on GitHub Actions has Pip 7.1.2 pre-installed,
# which does not yet support python_requires, so it will upgrade Pip beyond the
# latest supported version on Python 3.4. Therefore, we initially upgrade the
# basic packages only to their minimum defined in this file.

pip==9.0.1; python_version <= '3.5'
pip==10.0.0; python_version == '3.6'
pip==10.0.1; python_version <= '3.5'
pip==18.0; python_version == '3.6'
pip==18.1; python_version == '3.7'
pip==19.3.1; python_version >= '3.8'
pip==19.3.1; python_version == '3.8'
pip==21.0; python_version >= '3.9'

setuptools==33.1.1; python_version <= '3.5'
setuptools==34.0.0; python_version == '3.6'
setuptools==39.0.1; python_version <= '3.6'
setuptools==40.6.0; python_version == '3.7'
setuptools==41.5.0; python_version >= '3.8'
setuptools==41.5.0; python_version == '3.8'
setuptools==51.0.0; python_version >= '3.9'

wheel==0.29.0; python_version <= '3.4'
wheel==0.30.0; python_version == '3.5'
wheel==0.30.0; python_version == '3.6'
wheel==0.30.0; python_version <= '3.6'
wheel==0.32.0; python_version == '3.7'
wheel==0.33.5; python_version >= '3.8'
wheel==0.33.5; python_version == '3.8'
wheel==0.36.0; python_version >= '3.9'
41 changes: 22 additions & 19 deletions minimum-constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,26 @@ virtualenv==20.0.0; python_version >= '3.8' # requires six<2,>=1.12.0

# Indirect dependencies for install (not in requirements.txt)

# Indirect dependencies from pywbem
M2Crypto==0.31.0
ordereddict==1.1
# Additional indirect dependencies from pywbem
# ordereddict==1.1
ply==3.10
typing==3.6.1; python_version < '3.5' # from M2Crypto
# typing==3.6.1; python_version < '3.5' # from M2Crypto
requests==2.22.0; python_version == '2.7'
requests==2.20.1; python_version == '3.4'
requests==2.22.0; python_version >= '3.5'
# httpretty==0.9.5
# lxml==4.2.4
# decorator==4.0.11
# yamlordereddictloader==0.4.0
urllib3==1.25.9; python_version == '2.7'
urllib3==1.24.2; python_version == '3.4'
urllib3==1.25.9; python_version >= '3.5'

# Direct dependencies for develop (must be consistent with dev-requirements.txt)

# Unit test (imports into testcases):
pytest==4.3.1
httpretty==0.9.5
lxml==4.2.4
requests==2.20.1
decorator==4.0.11
yamlordereddictloader==0.4.0
pluggy==0.13.0
funcsigs==1.0.2; python_version == '2.7'
colorama==0.3.9; python_version <= '3.4'
colorama==0.4.0; python_version >= '3.5'
Expand All @@ -83,7 +88,8 @@ coveralls==2.1.2; python_version >= '3.5'
# Safety CI by pyup.io
safety==1.8.7; python_version <= '3.4'
safety==1.9.0; python_version >= '3.5'
dparse==0.4.1
dparse>=0.4.1; python_version <= '3.4'
dparse>=0.5.1; python_version >= '3.5'

# Tox
tox==2.0.0
Expand All @@ -110,17 +116,19 @@ typed-ast==1.4.0; python_version >= '3.5' and python_version < '3.8' and impleme
lazy-object-proxy==1.4.3

# Flake8 and dependents (no imports, invoked via flake8 script):
flake8==3.7.9
flake8==3.8.0
mccabe==0.6.0
pycodestyle==2.5.0
pyflakes==2.1.0
pycodestyle==2.6.0a1; python_version == '3.4'
pycodestyle==2.6.0; python_version != '3.4'
pyflakes==2.2.0
entrypoints==0.3.0
functools32==3.2.3.post2; python_version == '2.7' # technically: python_version < '3.2'

# Twine (no imports, invoked via twine script):
twine==1.15.0; python_version <= '3.5'
twine==2.0.0; python_version >= '3.6'
readme-renderer==23.0
pkginfo==1.4.2

# Jupyter Notebook (no imports, invoked via jupyter script):
#jupyter==1.0.0
Expand Down Expand Up @@ -165,7 +173,6 @@ jsonschema==2.5.1
jupyter_client==4.4.0
jupyter_console==5.0.0
jupyter_core==4.2.1
lazy-object-proxy==1.4.2
linecache2==1.0.0
MarkupSafe==0.23
mistune==0.8.1
Expand All @@ -179,14 +186,12 @@ pathlib2==2.2.1
pbr==1.8.0
pexpect==4.2.1
pickleshare==0.7.4
pkginfo==1.4.1
pluggy==0.13.0
ptyprocess==0.5.1
py==1.5.1
pytz==2016.10
pyzmq==16.0.4
qtconsole==4.2.1
requests-toolbelt==0.7.0
requests-toolbelt==0.8.0
scandir==1.9.0
sh==1.12.14
simplegeneric==0.8.1
Expand All @@ -200,8 +205,6 @@ tornado==4.4.2
tqdm==4.28.1
traceback2==1.4.0
traitlets==4.3.1
urllib3==1.24.2
virtualenv==14.0.0
wcwidth==0.1.7
webencodings==0.5.1
widgetsnbextension==1.2.6
Expand Down