Skip to content

Commit 7a950aa

Browse files
tomschrtomschr
authored
Merge pull request #440 from python-semver/fix-workflow
Fix workflow
2 parents c47774d + 97676c8 commit 7a950aa

File tree

7 files changed

+27
-20
lines changed

7 files changed

+27
-20
lines changed

‎.github/workflows/codeql-analysis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [ master, maint/v2 ]
16+
branches: [ maint/v2, release/* ]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
1919
branches: [ master ]
@@ -35,11 +35,11 @@ jobs:
3535

3636
steps:
3737
- name: Checkout repository
38-
uses: actions/checkout@v3
38+
uses: actions/checkout@v4
3939

4040
# Initializes the CodeQL tools for scanning.
4141
- name: Initialize CodeQL
42-
uses: github/codeql-action/init@v2
42+
uses: github/codeql-action/init@v3
4343
with:
4444
languages: ${{ matrix.language }}
4545
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -50,7 +50,7 @@ jobs:
5050
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5151
# If this step fails, then you should remove it and run the build manually (see below)
5252
- name: Autobuild
53-
uses: github/codeql-action/autobuild@v2
53+
uses: github/codeql-action/autobuild@v3
5454

5555
# ℹ️ Command-line programs to run using the OS shell.
5656
# 📚 https://git.io/JvXDl
@@ -64,4 +64,4 @@ jobs:
6464
# make release
6565

6666
- name: Perform CodeQL Analysis
67-
uses: github/codeql-action/analyze@v2
67+
uses: github/codeql-action/analyze@v3

‎.github/workflows/python-testing.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
can_run: ${{ steps.check_files.outputs.can_run }}
3636

3737
steps:
38-
- uses: actions/checkout@v3
38+
- uses: actions/checkout@v4
3939
with:
4040
fetch-depth: 0
4141

@@ -77,9 +77,9 @@ jobs:
7777
if: ${{ needs.check-files.outputs.can_run == '1' }}
7878

7979
steps:
80-
- uses: actions/checkout@v3
80+
- uses: actions/checkout@v4
8181
- name: Set up Python ${{ matrix.python-version }}
82-
uses: actions/setup-python@v4
82+
uses: actions/setup-python@v5
8383
with:
8484
python-version: 3.8
8585
cache: 'pip'
@@ -89,11 +89,12 @@ jobs:
8989
pip install tox tox-gh-actions
9090
- name: Check
9191
run: |
92-
tox -e checks
92+
tox run -e checks
9393
9494
tests:
9595
needs: check
9696
runs-on: ${{ matrix.os }}
97+
continue-on-error: true
9798
strategy:
9899
max-parallel: 5
99100
fail-fast: true
@@ -103,14 +104,17 @@ jobs:
103104
"3.9",
104105
"3.10",
105106
"3.11",
106-
# "3.12-dev"
107+
"3.12",
107108
]
108-
os: [ubuntu-latest, "macos-latest"]
109+
os: ["ubuntu-latest", "macos-latest"]
110+
exclude:
111+
- os: "macos-latest"
112+
python-version: "3.7"
109113

110114
steps:
111-
- uses: actions/checkout@v3
115+
- uses: actions/checkout@v4
112116
- name: Set up Python ${{ matrix.python-version }} for ${{ matrix.os }}
113-
uses: actions/setup-python@v4
117+
uses: actions/setup-python@v5
114118
with:
115119
python-version: ${{ matrix.python-version }}
116120
cache: 'pip'
@@ -120,4 +124,4 @@ jobs:
120124
pip install tox tox-gh-actions
121125
- name: Test with tox
122126
run: |
123-
tox
127+
tox run

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ celerybeat.pid
108108

109109
# Environments
110110
.env
111-
.venv
111+
.venv*
112112
env/
113113
venv/
114114
ENV/

‎setup.cfg

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,22 @@ addopts =
7070

7171
[flake8]
7272
max-line-length = 88
73-
ignore = F821,W503
73+
extend-ignore = E203,E701
7474
extend-exclude =
7575
.eggs
7676
.env
7777
build
7878
docs
79-
venv
79+
venv*
80+
.venv*
8081
conftest.py
8182
src/semver/__init__.py
8283
tasks.py
8384

8485
[pycodestyle]
8586
count = False
86-
# ignore = E226,E302,E41
87+
ignore = E203,E701
88+
# E226,E302,E41
8789
max-line-length = 88
8890
statistics = True
8991
exclude =

‎src/semver/__main__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
$ python3 semver-3*-py3-none-any.whl/semver -h
1010
1111
"""
12+
1213
import os.path
1314
import sys
1415
from typing import List, Optional

‎src/semver/_deprecated.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
44
.. autofunction: deprecated
55
"""
6+
67
import inspect
78
import warnings
89
from functools import partial, wraps

‎tests/test_semver.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ def test_should_fail_with_incompatible_type_for_compatible_match(wrongtype):
131131

132132

133133
def test_should_succeed_with_compatible_subclass_for_is_compatible():
134-
class CustomVersion(Version):
135-
...
134+
class CustomVersion(Version): ...
136135

137136
assert CustomVersion(1, 0, 0).is_compatible(Version(1, 0, 0))

0 commit comments

Comments
 (0)