Update CodeQL workflow

Author: dolfinus

.github/workflows/codeql-analysis.yml

@@ -1,13 +1,13 @@
-name: "CodeQL"
+name: CodeQL
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [master]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ "master" ]
+    branches: [master]
   schedule:
-    - cron: '45 13 * * 6'
+  - cron: 45 13 * * 6
 
 jobs:
   analyze:
@@ -25,16 +25,18 @@ jobs:
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:
-        python-version: "3.10"
+        python-version: '3.10'
 
     - name: Cache pip
       uses: actions/cache@v3
       with:
         path: ~/.cache/pip
-        key: ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ hashFiles('requirements*.txt') }}
+        key: ${{ runner.os }}-python-${{ matrix.python-version }}-codeql-${{ hashFiles('requirements*.txt') }}
         restore-keys: |
-          ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ hashFiles('requirements*.txt') }}
-          ${{ runner.os }}-python-${{ matrix.python-version }}-pip-
+          ${{ runner.os }}-python-${{ matrix.python-version }}-codeql-${{ hashFiles('requirements*.txt') }}
+          ${{ runner.os }}-python-${{ matrix.python-version }}-tests-${{ hashFiles('requirements*.txt') }}
+          ${{ runner.os }}-python-${{ matrix.python-version }}-codeql-
+          ${{ runner.os }}-python-${{ matrix.python-version }}-tests-
           ${{ runner.os }}-python
           ${{ runner.os }}-
 
@@ -43,10 +45,13 @@ jobs:
 
     - name: Install dependencies
       run: |
-          pip install -I -r requirements.txt
-          # Set the `CODEQL-PYTHON` environment variable to the Python executable
-          # that includes the dependencies
-          echo "CODEQL_PYTHON=$(which python)" >> $GITHUB_ENV
+        pip install -I -r requirements.txt -r requirements-dev.txt
+        # Set the `CODEQL-PYTHON` environment variable to the Python executable
+        # that includes the dependencies
+        echo "CODEQL_PYTHON=$(which python)" >> $GITHUB_ENV
+
+    - name: Run flake8
+      run: flake8 --count --max-line-length=120 .
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
@@ -56,11 +61,11 @@ jobs:
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
-        
+
         # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
         # queries: security-extended,security-and-quality
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
       with:
-        category: "/language:python"
+        category: /language:python

.github/workflows/test.yml

@@ -65,10 +65,12 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ~/.cache/pip
-        key: ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ hashFiles('requirements*.txt') }}
+        key: ${{ runner.os }}-python-${{ matrix.python-version }}-tests-${{ hashFiles('requirements*.txt') }}
         restore-keys: |
-          ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ hashFiles('requirements*.txt') }}
-          ${{ runner.os }}-python-${{ matrix.python-version }}-pip-
+          ${{ runner.os }}-python-${{ matrix.python-version }}-tests-${{ hashFiles('requirements*.txt') }}
+          ${{ runner.os }}-python-${{ matrix.python-version }}-codeql-${{ hashFiles('requirements*.txt') }}
+          ${{ runner.os }}-python-${{ matrix.python-version }}-tests-
+          ${{ runner.os }}-python-${{ matrix.python-version }}-codeql-
           ${{ runner.os }}-python
           ${{ runner.os }}-
 
@@ -78,9 +80,6 @@ jobs:
     - name: Install dependencies
       run: pip install -I -r requirements.txt -r requirements-test.txt
 
-    - name: Run flake8
-      run: flake8 --count --max-line-length=120 .
-
     - name: Build package
       run: |
         git version

requirements-dev.txt

@@ -1 +1,2 @@
+flake8>=3.8
 pre-commit

requirements-test.txt

@@ -1,6 +1,5 @@
 build
 coverage
-flake8>=3.8
 pytest
 pytest-rerunfailures
 wheel