From 355a9fea99bb882df89e3482504052a36a042511 Mon Sep 17 00:00:00 2001 From: Tim Pansino Date: Thu, 6 Apr 2023 21:55:48 +0000 Subject: [PATCH 1/3] Add required option for tox v4 --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tox.ini b/tox.ini index 2477f959c0..ebfa933569 100644 --- a/tox.ini +++ b/tox.ini @@ -408,6 +408,8 @@ 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} From 38746834e52eaa5340d1a206675c6078fa03ccef Mon Sep 17 00:00:00 2001 From: Tim Pansino Date: Thu, 6 Apr 2023 21:58:13 +0000 Subject: [PATCH 2/3] Update tox in GHA --- .github/actions/setup-python-matrix/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-python-matrix/action.yml b/.github/actions/setup-python-matrix/action.yml index a2dc77e60b..299dd2e7bd 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' From 054a8dcbc2e4cfcb54f1752af244c6b8224499fe Mon Sep 17 00:00:00 2001 From: Tim Pansino Date: Mon, 10 Apr 2023 11:31:50 -0700 Subject: [PATCH 3/3] Remove py27 no-cache-dir --- tox.ini | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index ebfa933569..147851088c 100644 --- a/tox.ini +++ b/tox.ini @@ -411,9 +411,7 @@ commands = 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