diff --git a/.github/actions/setup-python-matrix/action.yml b/.github/actions/setup-python-matrix/action.yml index a2dc77e60..299dd2e7b 100644 --- a/.github/actions/setup-python-matrix/action.yml +++ b/.github/actions/setup-python-matrix/action.yml @@ -47,4 +47,4 @@ runs: shell: bash run: | python3.10 -m pip install -U pip - python3.10 -m pip install -U wheel setuptools 'tox<4' 'virtualenv<20.22.0' + python3.10 -m pip install -U wheel setuptools tox 'virtualenv<20.22.0' diff --git a/tox.ini b/tox.ini index 2477f959c..147851088 100644 --- a/tox.ini +++ b/tox.ini @@ -408,10 +408,10 @@ commands = libcurl: pip install --ignore-installed --config-settings="--build-option=--with-openssl" pycurl coverage run -m pytest -v +allowlist_externals={toxinidir}/.github/scripts/* + install_command= - # Older pip versions that support python 2 have issues with using the cache directory and cause crashes on GitHub Actions - {py27,pypy}: {toxinidir}/.github/scripts/retry.sh 3 pip install --no-cache-dir {opts} {packages} - !{py27,pypy}: {toxinidir}/.github/scripts/retry.sh 3 pip install {opts} {packages} + {toxinidir}/.github/scripts/retry.sh 3 pip install {opts} {packages} extras = agent_streaming: infinite-tracing