Skip to content

Commit a0e7777

Browse files
authored
Fix dev requirements (#8140)
1 parent fb8ed27 commit a0e7777

File tree

7 files changed

+18
-12
lines changed

7 files changed

+18
-12
lines changed

.github/workflows/changelog.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ jobs:
3737
run: >-
3838
echo "key=${{ env.KEY_PREFIX }}-${{ env.CACHE_VERSION }}-${{
3939
hashFiles('pyproject.toml', 'requirements_test.txt',
40-
'requirements_test_min.txt') }}" >> $GITHUB_OUTPUT
40+
'requirements_test_min.txt', 'requirements_test_pre_commit.txt') }}" >>
41+
$GITHUB_OUTPUT
4142
- name: Restore Python virtual environment
4243
id: cache-venv
4344
uses: actions/cache@v3.2.4

.github/workflows/checks.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ jobs:
4545
run: >-
4646
echo "key=${{ env.KEY_PREFIX }}-${{ env.CACHE_VERSION }}-${{
4747
hashFiles('pyproject.toml', 'requirements_test.txt',
48-
'requirements_test_min.txt') }}" >> $GITHUB_OUTPUT
48+
'requirements_test_min.txt', 'requirements_test_pre_commit.txt') }}" >>
49+
$GITHUB_OUTPUT
4950
- name: Restore Python virtual environment
5051
id: cache-venv
5152
uses: actions/cache@v3.2.4

.github/workflows/primer-test.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ jobs:
4747
run: >-
4848
echo "key=${{ env.KEY_PREFIX }}-${{ env.CACHE_VERSION }}-${{
4949
hashFiles('pyproject.toml', 'requirements_test.txt',
50-
'requirements_test_min.txt') }}" >> $GITHUB_OUTPUT
50+
'requirements_test_min.txt', 'requirements_test_pre_commit.txt') }}" >>
51+
$GITHUB_OUTPUT
5152
- name: Restore Python virtual environment
5253
id: cache-venv
5354
uses: actions/cache@v3.2.4

.github/workflows/primer_run_main.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ jobs:
4949
key:
5050
${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
5151
env.KEY_PREFIX }}-${{ env.CACHE_VERSION }}-${{ hashFiles('pyproject.toml',
52-
'requirements_test.txt', 'requirements_test_min.txt') }}
52+
'requirements_test.txt', 'requirements_test_min.txt',
53+
'requirements_test_pre_commit.txt') }}
5354
- name: Create Python virtual environment
5455
if: steps.cache-venv.outputs.cache-hit != 'true'
5556
run: |

.github/workflows/primer_run_pr.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ jobs:
6060
key:
6161
${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
6262
env.KEY_PREFIX }}-${{ env.CACHE_VERSION }}-${{ hashFiles('pyproject.toml',
63-
'requirements_test.txt', 'requirements_test_min.txt') }}
63+
'requirements_test.txt', 'requirements_test_min.txt',
64+
'requirements_test_pre_commit.txt') }}
6465
# Create environment must match step in 'Primer / Main'
6566
- name: Create Python virtual environment
6667
if: steps.cache-venv.outputs.cache-hit != 'true'

.github/workflows/tests.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
- "maintenance/**"
1414

1515
env:
16-
CACHE_VERSION: 1
16+
CACHE_VERSION: 2
1717
KEY_PREFIX: venv
1818

1919
permissions:
@@ -44,7 +44,8 @@ jobs:
4444
run: >-
4545
echo "key=${{ env.KEY_PREFIX }}-${{ env.CACHE_VERSION }}-${{
4646
hashFiles('pyproject.toml', 'requirements_test.txt',
47-
'requirements_test_min.txt') }}" >> $GITHUB_OUTPUT
47+
'requirements_test_min.txt', 'requirements_test_pre_commit.txt') }}" >>
48+
$GITHUB_OUTPUT
4849
- name: Restore Python virtual environment
4950
id: cache-venv
5051
uses: actions/cache@v3.2.4
@@ -250,7 +251,7 @@ jobs:
250251
python -m venv venv
251252
. venv/bin/activate
252253
python -m pip install -U pip setuptools wheel
253-
pip install -U -r requirements_test.txt
254+
pip install -U -r requirements_test_min.txt
254255
- name: Run pytest
255256
run: |
256257
. venv/bin/activate

requirements_test_pre_commit.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# in .pre-commit-config.yaml
33
bandit==1.7.4
44
black==23.1a1
5-
flake8>=5.0.0
6-
flake8-bugbear==23.1.20
7-
flake8-typing-imports==1.14.0
8-
isort==5.12.0
5+
flake8==6.0.0;python_version>='3.8'
6+
flake8-bugbear==23.1.20;python_version>='3.8'
7+
flake8-typing-imports==1.14.0;python_version>='3.8'
8+
isort==5.12.0;python_version>='3.8'
99
mypy==0.991

0 commit comments

Comments
 (0)