Skip to content

Commit

Permalink
Merge pull request #14145 from pllim/backport-of-pr14142-to-v5.2.x
Browse files Browse the repository at this point in the history
Manual backport of PR 14142 to v5.2.x (TST: Pin tox<4)
  • Loading branch information
pllim committed Dec 8, 2022
2 parents 818ebf7 + aff776f commit 6614de8
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Expand Up @@ -22,7 +22,7 @@ jobs:
command: |
sudo apt update
sudo apt install texlive texlive-latex-extra texlive-fonts-recommended dvipng cm-super
pip install pip tox --upgrade
pip install pip "tox<4"
- run:
name: Run tests
command: tox -v
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
command: |
sudo apt update
sudo apt install texlive texlive-latex-extra texlive-fonts-recommended dvipng cm-super
pip install pip tox --upgrade
pip install pip "tox<4"
- run: ssh-add -D
- add_ssh_keys:
fingerprints: "bf:aa:ef:e3:8d:95:11:0b:75:c7:92:52:ba:fb:e0:fc"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_cron_daily.yml
Expand Up @@ -67,6 +67,6 @@ jobs:
sudo apt-get update
sudo apt-get install language-pack-de tzdata
- name: Install Python dependencies
run: python -m pip install --upgrade tox
run: python -m pip install "tox<4"
- name: Run tests
run: tox ${{ matrix.toxargs}} -e ${{ matrix.toxenv}} -- ${{ matrix.toxposargs}}
2 changes: 1 addition & 1 deletion .github/workflows/ci_cron_weekly.yml
Expand Up @@ -83,7 +83,7 @@ jobs:
if: ${{ matrix.toxenv == 'linkcheck' }}
run: sudo apt-get install graphviz
- name: Install Python dependencies
run: python -m pip install --upgrade tox
run: python -m pip install "tox<4"
- name: Run tests
run: tox ${{ matrix.toxargs}} -e ${{ matrix.toxenv}} -- ${{ matrix.toxposargs}}

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci_workflows.yml
Expand Up @@ -102,7 +102,7 @@ jobs:
sudo apt-get update
sudo apt-get install language-pack-fr tzdata libopenblas-dev
- name: Install tox
run: python -m pip install --upgrade tox
run: python -m pip install "tox<4"
- name: Run tests
run: tox ${{ matrix.toxargs }} -e ${{ matrix.toxenv }} -- ${{ matrix.toxposargs }}
# TODO: Do we need --gcov-glob "*cextern*" ?
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
sudo apt-get update
sudo apt-get install language-pack-de tzdata
- name: Install Python dependencies
run: python -m pip install --upgrade tox
run: python -m pip install "tox<4"
- name: Run tests
run: tox ${{ matrix.toxargs }} -e ${{ matrix.toxenv }} -- ${{ matrix.toxposargs }}

Expand All @@ -166,7 +166,7 @@ jobs:
# test the ability to run the test suite in parallel.
# Numpy is pinned to avoid building it from source for numpy 1.21.5
- name: Install dependencies for Python 3.8
run: /opt/python/cp38-cp38/bin/pip install tox
run: /opt/python/cp38-cp38/bin/pip install "tox<4"
- name: Run tests for Python 3.8
run: /opt/python/cp38-cp38/bin/python -m tox -e py38-numpy120-test -- -n=4 --durations=50
# We use the 3.8 build to check that running tests twice in a row in the
Expand Down
1 change: 1 addition & 0 deletions tox.ini
Expand Up @@ -8,6 +8,7 @@ requires =
setuptools >= 30.3.0
pip >= 19.3.1
tox-pypi-filter >= 0.12
tox < 4
isolated_build = true

[testenv]
Expand Down

0 comments on commit 6614de8

Please sign in to comment.