Merge remote-tracking branch 'origin/master' into 3937-integration-http-storage

This commit is contained in:
Itamar Turner-Trauring 2022-12-13 10:57:27 -05:00
commit 14d65d25da
5 changed files with 8 additions and 10 deletions

View File

@ -133,10 +133,10 @@ jobs:
steps: steps:
- "checkout" - "checkout"
- run: - run: &INSTALL_TOX
name: "Install tox" name: "Install tox"
command: | command: |
pip install --user tox pip install --user 'tox~=3.0'
- run: - run:
name: "Static-ish code checks" name: "Static-ish code checks"
@ -152,9 +152,7 @@ jobs:
- "checkout" - "checkout"
- run: - run:
name: "Install tox" <<: *INSTALL_TOX
command: |
pip install --user tox
- run: - run:
name: "Make PyInstaller executable" name: "Make PyInstaller executable"

View File

@ -9,7 +9,7 @@ BASIC_DEPS="pip wheel"
# Python packages we need to support the test infrastructure. *Not* packages # Python packages we need to support the test infrastructure. *Not* packages
# Tahoe-LAFS itself (implementation or test suite) need. # Tahoe-LAFS itself (implementation or test suite) need.
TEST_DEPS="tox codecov" TEST_DEPS="tox~=3.0 codecov"
# Python packages we need to generate test reports for CI infrastructure. # Python packages we need to generate test reports for CI infrastructure.
# *Not* packages Tahoe-LAFS itself (implement or test suite) need. # *Not* packages Tahoe-LAFS itself (implement or test suite) need.

View File

@ -80,7 +80,7 @@ jobs:
- name: Install Python packages - name: Install Python packages
run: | run: |
pip install --upgrade codecov tox tox-gh-actions setuptools pip install --upgrade codecov "tox<4" tox-gh-actions setuptools
pip list pip list
- name: Display tool versions - name: Display tool versions
@ -201,7 +201,7 @@ jobs:
- name: Install Python packages - name: Install Python packages
run: | run: |
pip install --upgrade tox pip install --upgrade "tox<4"
pip list pip list
- name: Display tool versions - name: Display tool versions
@ -261,7 +261,7 @@ jobs:
- name: Install Python packages - name: Install Python packages
run: | run: |
pip install --upgrade tox pip install --upgrade "tox<4"
pip list pip list
- name: Display tool versions - name: Display tool versions

0
newsfragments/3950.minor Normal file
View File

View File

@ -396,7 +396,7 @@ setup(name="tahoe-lafs", # also set in __init__.py
"pyflakes == 2.2.0", "pyflakes == 2.2.0",
"coverage ~= 5.0", "coverage ~= 5.0",
"mock", "mock",
"tox", "tox ~= 3.0",
"pytest", "pytest",
"pytest-twisted", "pytest-twisted",
"hypothesis >= 3.6.1", "hypothesis >= 3.6.1",