ci: Don't install pycparser and idna seperately
AFAICT no longer necessary. These install fine as part of requirements.txt.
This commit is contained in:
parent
3ba1625a99
commit
39d02e9d59
|
@ -4,10 +4,6 @@ import ci_lib
|
|||
|
||||
batches = [
|
||||
[
|
||||
# Must be installed separately, as PyNACL indirect requirement causes
|
||||
# newer version to be installed if done in a single pip run.
|
||||
# Separately install ansible based on version passed in from azure-pipelines.yml or .travis.yml
|
||||
'pip install "pycparser<2.19" "idna<2.7"',
|
||||
'pip install '
|
||||
'-r tests/requirements.txt '
|
||||
'-r tests/ansible/requirements.txt',
|
||||
|
|
|
@ -7,9 +7,6 @@ ci_lib.DISTROS = ['debian']
|
|||
|
||||
ci_lib.run_batches([
|
||||
[
|
||||
# Must be installed separately, as PyNACL indirect requirement causes
|
||||
# newer version to be installed if done in a single pip run.
|
||||
'pip install "pycparser<2.19"',
|
||||
'pip install -qqq "debops[ansible]==2.1.2" "ansible-base<2.10.14" "ansible=={}"'.format(ci_lib.ANSIBLE_VERSION),
|
||||
],
|
||||
[
|
||||
|
|
|
@ -4,11 +4,6 @@ import ci_lib
|
|||
|
||||
batches = [
|
||||
[
|
||||
# Must be installed separately, as PyNACL indirect requirement causes
|
||||
# newer version to be installed if done in a single pip run.
|
||||
# Separately install ansible based on version passed in from azure-pipelines.yml or .travis.yml
|
||||
# Don't set -U as that will upgrade Paramiko to a non-2.6 compatible version.
|
||||
'pip install "pycparser<2.19" "idna<2.7" virtualenv',
|
||||
'pip install '
|
||||
'-r tests/requirements.txt '
|
||||
'-r tests/ansible/requirements.txt',
|
||||
|
|
|
@ -4,7 +4,6 @@ import ci_lib
|
|||
|
||||
batches = [
|
||||
[
|
||||
'pip install "pycparser<2.19" "idna<2.7"',
|
||||
'pip install -r tests/requirements.txt',
|
||||
]
|
||||
]
|
||||
|
|
|
@ -16,3 +16,4 @@ urllib3[secure]==1.23; python_version < '2.7'
|
|||
urllib3[secure]==1.26; python_version > '2.6' and python_version < '2.7.9'
|
||||
# Last idna compatible with Python 2.6 was idna 2.7.
|
||||
idna==2.7; python_version < '2.7'
|
||||
virtualenv==20.10.0
|
||||
|
|
Loading…
Reference in New Issue