<p>Michael Bradeen <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/18889">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Friendly Automation: Verified
  Michael Bradeen: Looks good to me, approved; Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">CI: additional python venv requirements<br><br>ASTERISK-26826<br><br>Change-Id: I9b281591e90d661fa9480a3b2b10f6ead0602b0e<br>---<br>D tests/CI/extras.txt<br>D tests/CI/requirements.txt<br>M tests/CI/runTestsuite.sh<br>3 files changed, 3 insertions(+), 30 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/CI/extras.txt b/tests/CI/extras.txt</span><br><span>deleted file mode 100644</span><br><span>index 36428be..0000000</span><br><span>--- a/tests/CI/extras.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,2 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-https://github.com/asterisk/starpy/archive/refs/heads/1.1.zip</span><br><span style="color: hsl(0, 100%, 40%);">-https://github.com/asterisk/yappcap/archive/refs/heads/master.zip</span><br><span>diff --git a/tests/CI/requirements.txt b/tests/CI/requirements.txt</span><br><span>deleted file mode 100644</span><br><span>index b233fa4..0000000</span><br><span>--- a/tests/CI/requirements.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,26 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-attrs==21.4.0</span><br><span style="color: hsl(0, 100%, 40%);">-autobahn==21.2.1</span><br><span style="color: hsl(0, 100%, 40%);">-Automat==20.2.0</span><br><span style="color: hsl(0, 100%, 40%);">-certifi==2021.10.8</span><br><span style="color: hsl(0, 100%, 40%);">-cffi==1.15.0</span><br><span style="color: hsl(0, 100%, 40%);">-charset-normalizer==2.0.12</span><br><span style="color: hsl(0, 100%, 40%);">-constantly==15.1.0</span><br><span style="color: hsl(0, 100%, 40%);">-construct==2.10.68</span><br><span style="color: hsl(0, 100%, 40%);">-cryptography==37.0.2</span><br><span style="color: hsl(0, 100%, 40%);">-Cython==0.29.28</span><br><span style="color: hsl(0, 100%, 40%);">-hyperlink==21.0.0</span><br><span style="color: hsl(0, 100%, 40%);">-idna==3.3</span><br><span style="color: hsl(0, 100%, 40%);">-incremental==21.3.0</span><br><span style="color: hsl(0, 100%, 40%);">-lxml==4.8.0</span><br><span style="color: hsl(0, 100%, 40%);">-netifaces>=0.10.4</span><br><span style="color: hsl(0, 100%, 40%);">-pycparser==2.21</span><br><span style="color: hsl(0, 100%, 40%);">-PyYAML==6.0</span><br><span style="color: hsl(0, 100%, 40%);">-PyXB==1.2.6</span><br><span style="color: hsl(0, 100%, 40%);">-rawsocket==0.2</span><br><span style="color: hsl(0, 100%, 40%);">-requests==2.27.1</span><br><span style="color: hsl(0, 100%, 40%);">-six==1.16.0</span><br><span style="color: hsl(0, 100%, 40%);">-Twisted==22.4.0</span><br><span style="color: hsl(0, 100%, 40%);">-txaio==22.2.1</span><br><span style="color: hsl(0, 100%, 40%);">-typing_extensions==4.1.1</span><br><span style="color: hsl(0, 100%, 40%);">-urllib3==1.26.9</span><br><span style="color: hsl(0, 100%, 40%);">-zope.interface==5.4.0</span><br><span>diff --git a/tests/CI/runTestsuite.sh b/tests/CI/runTestsuite.sh</span><br><span>index 423783a..782beb5 100755</span><br><span>--- a/tests/CI/runTestsuite.sh</span><br><span>+++ b/tests/CI/runTestsuite.sh</span><br><span>@@ -25,8 +25,9 @@</span><br><span>              echo "Successfully activated virtual environment:"</span><br><span>                 echo $VIRTUAL_ENV</span><br><span>            python -m pip install --upgrade pip</span><br><span style="color: hsl(0, 100%, 40%);">-             python -m pip install -r ${CIDIR}/requirements.txt</span><br><span style="color: hsl(0, 100%, 40%);">-              python -m pip install -r ${CIDIR}/extras.txt</span><br><span style="color: hsl(120, 100%, 40%);">+          python -m pip install wheel setuptools build</span><br><span style="color: hsl(120, 100%, 40%);">+          python -m pip install -r ./requirements.txt</span><br><span style="color: hsl(120, 100%, 40%);">+           python -m pip install -r ./extras.txt</span><br><span>        else</span><br><span>                 echo "Virtual environment failed, attempting fall-back method"</span><br><span>             export PYTHONPATH=./lib/python/</span><br><span></span><br></pre><div style="white-space:pre-wrap"></div><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/18889">change 18889</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/18889"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: development/16/python3 </div>
<div style="display:none"> Gerrit-Change-Id: I9b281591e90d661fa9480a3b2b10f6ead0602b0e </div>
<div style="display:none"> Gerrit-Change-Number: 18889 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Michael Bradeen <mbradeen@sangoma.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: Michael Bradeen <mbradeen@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>