From b7c6094e512803615a4769b8adf97a65638766f1 Mon Sep 17 00:00:00 2001
From: Mike Bradeen <mbradeen@sangoma.com>
Date: Tue, 2 Aug 2022 12:23:37 -0600
Subject: [PATCH] CI: additional python venv requirements

ASTERISK-26826

Change-Id: I9b281591e90d661fa9480a3b2b10f6ead0602b0e
---
 tests/CI/extras.txt       |  2 --
 tests/CI/requirements.txt | 26 --------------------------
 tests/CI/runTestsuite.sh  |  5 +++--
 3 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 tests/CI/extras.txt
 delete mode 100644 tests/CI/requirements.txt

diff --git a/tests/CI/extras.txt b/tests/CI/extras.txt
deleted file mode 100644
index 36428beb4d..0000000000
--- a/tests/CI/extras.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-https://github.com/asterisk/starpy/archive/refs/heads/1.1.zip
-https://github.com/asterisk/yappcap/archive/refs/heads/master.zip
diff --git a/tests/CI/requirements.txt b/tests/CI/requirements.txt
deleted file mode 100644
index b233fa427e..0000000000
--- a/tests/CI/requirements.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-attrs==21.4.0
-autobahn==21.2.1
-Automat==20.2.0
-certifi==2021.10.8
-cffi==1.15.0
-charset-normalizer==2.0.12
-constantly==15.1.0
-construct==2.10.68
-cryptography==37.0.2
-Cython==0.29.28
-hyperlink==21.0.0
-idna==3.3
-incremental==21.3.0
-lxml==4.8.0
-netifaces>=0.10.4
-pycparser==2.21
-PyYAML==6.0
-PyXB==1.2.6
-rawsocket==0.2
-requests==2.27.1
-six==1.16.0
-Twisted==22.4.0
-txaio==22.2.1
-typing_extensions==4.1.1
-urllib3==1.26.9
-zope.interface==5.4.0
diff --git a/tests/CI/runTestsuite.sh b/tests/CI/runTestsuite.sh
index 423783ad7d..782beb589e 100755
--- a/tests/CI/runTestsuite.sh
+++ b/tests/CI/runTestsuite.sh
@@ -25,8 +25,9 @@ else
 		echo "Successfully activated virtual environment:"
 		echo $VIRTUAL_ENV
 		python -m pip install --upgrade pip
-		python -m pip install -r ${CIDIR}/requirements.txt
-		python -m pip install -r ${CIDIR}/extras.txt
+		python -m pip install wheel setuptools build
+		python -m pip install -r ./requirements.txt
+		python -m pip install -r ./extras.txt
 	else
 		echo "Virtual environment failed, attempting fall-back method"
 		export PYTHONPATH=./lib/python/
-- 
2.47.2