Fix dev requirements (#8140)

pylint-dev · Jan 30, 2023 · a0e7777 · a0e7777
1 parent fb8ed27
commit a0e7777
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 12 deletions.
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -37,7 +37,8 @@ jobs:
         run: >-
           echo "key=${{ env.KEY_PREFIX }}-${{ env.CACHE_VERSION }}-${{
             hashFiles('pyproject.toml', 'requirements_test.txt',
-          'requirements_test_min.txt') }}" >> $GITHUB_OUTPUT
+          'requirements_test_min.txt', 'requirements_test_pre_commit.txt') }}" >>
+          $GITHUB_OUTPUT
       - name: Restore Python virtual environment
         id: cache-venv
         uses: actions/cache@v3.2.4

diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
@@ -45,7 +45,8 @@ jobs:
         run: >-
           echo "key=${{ env.KEY_PREFIX }}-${{ env.CACHE_VERSION }}-${{
             hashFiles('pyproject.toml', 'requirements_test.txt',
-          'requirements_test_min.txt') }}" >> $GITHUB_OUTPUT
+          'requirements_test_min.txt', 'requirements_test_pre_commit.txt') }}" >>
+          $GITHUB_OUTPUT
       - name: Restore Python virtual environment
         id: cache-venv
         uses: actions/cache@v3.2.4

diff --git a/.github/workflows/primer-test.yaml b/.github/workflows/primer-test.yaml
@@ -47,7 +47,8 @@ jobs:
         run: >-
           echo "key=${{ env.KEY_PREFIX }}-${{ env.CACHE_VERSION }}-${{
             hashFiles('pyproject.toml', 'requirements_test.txt',
-          'requirements_test_min.txt') }}" >> $GITHUB_OUTPUT
+          'requirements_test_min.txt', 'requirements_test_pre_commit.txt') }}" >>
+          $GITHUB_OUTPUT
       - name: Restore Python virtual environment
         id: cache-venv
         uses: actions/cache@v3.2.4

diff --git a/.github/workflows/primer_run_main.yaml b/.github/workflows/primer_run_main.yaml
@@ -49,7 +49,8 @@ jobs:
           key:
             ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
             env.KEY_PREFIX }}-${{ env.CACHE_VERSION }}-${{ hashFiles('pyproject.toml',
-            'requirements_test.txt', 'requirements_test_min.txt') }}
+            'requirements_test.txt', 'requirements_test_min.txt',
+            'requirements_test_pre_commit.txt') }}
       - name: Create Python virtual environment
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |

diff --git a/.github/workflows/primer_run_pr.yaml b/.github/workflows/primer_run_pr.yaml
@@ -60,7 +60,8 @@ jobs:
           key:
             ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
             env.KEY_PREFIX }}-${{ env.CACHE_VERSION }}-${{ hashFiles('pyproject.toml',
-            'requirements_test.txt', 'requirements_test_min.txt') }}
+            'requirements_test.txt', 'requirements_test_min.txt',
+            'requirements_test_pre_commit.txt') }}
       # Create environment must match step in 'Primer / Main'
       - name: Create Python virtual environment
         if: steps.cache-venv.outputs.cache-hit != 'true'

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -13,7 +13,7 @@ on:
       - "maintenance/**"
 
 env:
-  CACHE_VERSION: 1
+  CACHE_VERSION: 2
   KEY_PREFIX: venv
 
 permissions:
@@ -44,7 +44,8 @@ jobs:
         run: >-
           echo "key=${{ env.KEY_PREFIX }}-${{ env.CACHE_VERSION }}-${{
             hashFiles('pyproject.toml', 'requirements_test.txt',
-          'requirements_test_min.txt') }}" >> $GITHUB_OUTPUT
+          'requirements_test_min.txt', 'requirements_test_pre_commit.txt') }}" >>
+          $GITHUB_OUTPUT
       - name: Restore Python virtual environment
         id: cache-venv
         uses: actions/cache@v3.2.4
@@ -250,7 +251,7 @@ jobs:
           python -m venv venv
           . venv/bin/activate
           python -m pip install -U pip setuptools wheel
-          pip install -U -r requirements_test.txt
+          pip install -U -r requirements_test_min.txt
       - name: Run pytest
         run: |
           . venv/bin/activate

diff --git a/requirements_test_pre_commit.txt b/requirements_test_pre_commit.txt
@@ -2,8 +2,8 @@
 # in .pre-commit-config.yaml
 bandit==1.7.4
 black==23.1a1
-flake8>=5.0.0
-flake8-bugbear==23.1.20
-flake8-typing-imports==1.14.0
-isort==5.12.0
+flake8==6.0.0;python_version>='3.8'
+flake8-bugbear==23.1.20;python_version>='3.8'
+flake8-typing-imports==1.14.0;python_version>='3.8'
+isort==5.12.0;python_version>='3.8'
 mypy==0.991