From 39d02e9d5932cc0cdbb718ea19e89eec75d1947d Mon Sep 17 00:00:00 2001
From: Alex Willmer <alex@moreati.org.uk>
Date: Tue, 9 Nov 2021 19:28:00 +0000
Subject: [PATCH] ci: Don't install pycparser and idna seperately

AFAICT no longer necessary. These install fine as part of requirements.txt.
---
 .ci/ansible_install.py           | 4 ----
 .ci/debops_common_install.py     | 3 ---
 .ci/localhost_ansible_install.py | 5 -----
 .ci/mitogen_install.py           | 1 -
 tests/requirements.txt           | 1 +
 5 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/.ci/ansible_install.py b/.ci/ansible_install.py
index 7b5d5657..63dbe563 100755
--- a/.ci/ansible_install.py
+++ b/.ci/ansible_install.py
@@ -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',
diff --git a/.ci/debops_common_install.py b/.ci/debops_common_install.py
index 62519994..50d556cc 100755
--- a/.ci/debops_common_install.py
+++ b/.ci/debops_common_install.py
@@ -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),
     ],
     [
diff --git a/.ci/localhost_ansible_install.py b/.ci/localhost_ansible_install.py
index dba07053..e70bcf18 100755
--- a/.ci/localhost_ansible_install.py
+++ b/.ci/localhost_ansible_install.py
@@ -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',
diff --git a/.ci/mitogen_install.py b/.ci/mitogen_install.py
index d51c2f17..ab9bb2f2 100755
--- a/.ci/mitogen_install.py
+++ b/.ci/mitogen_install.py
@@ -4,7 +4,6 @@ import ci_lib
 
 batches = [
     [
-        'pip install "pycparser<2.19" "idna<2.7"',
         'pip install -r tests/requirements.txt',
     ]
 ]
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 21ef8166..a82ff815 100644
--- a/tests/requirements.txt
+++ b/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