Merge pull request #440 from python-semver/fix-workflow

tomschr · web-flow · commit 7a950aaaf47c · 2024-07-16T14:55:46.000+02:00
Fix workflow
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -13,7 +13,7 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master, maint/v2 ]
+    branches: [ maint/v2, release/* ]
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ master ]
@@ -35,11 +35,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -50,7 +50,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -64,4 +64,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/python-testing.yml b/.github/workflows/python-testing.yml
@@ -35,7 +35,7 @@ jobs:
       can_run: ${{ steps.check_files.outputs.can_run }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -77,9 +77,9 @@ jobs:
     if: ${{ needs.check-files.outputs.can_run == '1' }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.8
           cache: 'pip'
@@ -89,11 +89,12 @@ jobs:
           pip install tox tox-gh-actions
       - name: Check
         run: |
-          tox -e checks
+          tox run -e checks
 
   tests:
     needs: check
     runs-on: ${{ matrix.os }}
+    continue-on-error: true
     strategy:
       max-parallel: 5
       fail-fast: true
@@ -103,14 +104,17 @@ jobs:
                          "3.9",
                          "3.10",
                          "3.11",
-                         # "3.12-dev"
+                         "3.12",
                          ]
-        os: [ubuntu-latest, "macos-latest"]
+        os: ["ubuntu-latest", "macos-latest"]
+        exclude:
+           - os: "macos-latest"
+             python-version: "3.7"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }} for ${{ matrix.os }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
@@ -120,4 +124,4 @@ jobs:
           pip install tox tox-gh-actions
       - name: Test with tox
         run: |
-          tox
+          tox run
diff --git a/.gitignore b/.gitignore
@@ -108,7 +108,7 @@ celerybeat.pid
 
 # Environments
 .env
-.venv
+.venv*
 env/
 venv/
 ENV/
diff --git a/setup.cfg b/setup.cfg
@@ -70,20 +70,22 @@ addopts =
 
 [flake8]
 max-line-length = 88
-ignore = F821,W503
+extend-ignore = E203,E701
 extend-exclude =
     .eggs
     .env
     build
     docs
-    venv
+    venv*
+    .venv*
     conftest.py
     src/semver/__init__.py
     tasks.py
 
 [pycodestyle]
 count = False
-# ignore = E226,E302,E41
+ignore = E203,E701
+# E226,E302,E41
 max-line-length = 88
 statistics = True
 exclude =
diff --git a/src/semver/__main__.py b/src/semver/__main__.py
@@ -9,6 +9,7 @@
     $ python3 semver-3*-py3-none-any.whl/semver -h
 
 """
+
 import os.path
 import sys
 from typing import List, Optional
diff --git a/src/semver/_deprecated.py b/src/semver/_deprecated.py
@@ -3,6 +3,7 @@
 
 .. autofunction: deprecated
 """
+
 import inspect
 import warnings
 from functools import partial, wraps
diff --git a/tests/test_semver.py b/tests/test_semver.py
@@ -131,7 +131,6 @@ def test_should_fail_with_incompatible_type_for_compatible_match(wrongtype):
 
 
 def test_should_succeed_with_compatible_subclass_for_is_compatible():
-    class CustomVersion(Version):
-        ...
+    class CustomVersion(Version): ...
 
     assert CustomVersion(1, 0, 0).is_compatible(Version(1, 0, 0))

-Original file line number
+Diff line change
 # Environments
 .env
 -.venv
 +.venv*
 env/
 venv/
 ENV/