Skip to content

Commit 39d02e9

Browse files
committed
ci: Don't install pycparser and idna seperately
AFAICT no longer necessary. These install fine as part of requirements.txt.
1 parent 3ba1625 commit 39d02e9

File tree

5 files changed

+1
-13
lines changed

5 files changed

+1
-13
lines changed

.ci/ansible_install.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44

55
batches = [
66
[
7-
# Must be installed separately, as PyNACL indirect requirement causes
8-
# newer version to be installed if done in a single pip run.
9-
# Separately install ansible based on version passed in from azure-pipelines.yml or .travis.yml
10-
'pip install "pycparser<2.19" "idna<2.7"',
117
'pip install '
128
'-r tests/requirements.txt '
139
'-r tests/ansible/requirements.txt',

.ci/debops_common_install.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77

88
ci_lib.run_batches([
99
[
10-
# Must be installed separately, as PyNACL indirect requirement causes
11-
# newer version to be installed if done in a single pip run.
12-
'pip install "pycparser<2.19"',
1310
'pip install -qqq "debops[ansible]==2.1.2" "ansible-base<2.10.14" "ansible=={}"'.format(ci_lib.ANSIBLE_VERSION),
1411
],
1512
[

.ci/localhost_ansible_install.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44

55
batches = [
66
[
7-
# Must be installed separately, as PyNACL indirect requirement causes
8-
# newer version to be installed if done in a single pip run.
9-
# Separately install ansible based on version passed in from azure-pipelines.yml or .travis.yml
10-
# Don't set -U as that will upgrade Paramiko to a non-2.6 compatible version.
11-
'pip install "pycparser<2.19" "idna<2.7" virtualenv',
127
'pip install '
138
'-r tests/requirements.txt '
149
'-r tests/ansible/requirements.txt',

.ci/mitogen_install.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
batches = [
66
[
7-
'pip install "pycparser<2.19" "idna<2.7"',
87
'pip install -r tests/requirements.txt',
98
]
109
]

tests/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ urllib3[secure]==1.23; python_version < '2.7'
1616
urllib3[secure]==1.26; python_version > '2.6' and python_version < '2.7.9'
1717
# Last idna compatible with Python 2.6 was idna 2.7.
1818
idna==2.7; python_version < '2.7'
19+
virtualenv==20.10.0

0 commit comments

Comments
 (0)