Skip to content

Update workflow file #440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]
Expand All @@ -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.
Expand All @@ -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
Expand All @@ -64,4 +64,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
22 changes: 13 additions & 9 deletions .github/workflows/python-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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'
Expand All @@ -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
Expand All @@ -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'
Expand All @@ -120,4 +124,4 @@ jobs:
pip install tox tox-gh-actions
- name: Test with tox
run: |
tox
tox run
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ celerybeat.pid

# Environments
.env
.venv
.venv*
env/
venv/
ENV/
Expand Down
8 changes: 5 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
1 change: 1 addition & 0 deletions src/semver/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
$ python3 semver-3*-py3-none-any.whl/semver -h

"""

import os.path
import sys
from typing import List, Optional
Expand Down
1 change: 1 addition & 0 deletions src/semver/_deprecated.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

.. autofunction: deprecated
"""

import inspect
import warnings
from functools import partial, wraps
Expand Down
3 changes: 1 addition & 2 deletions tests/test_semver.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Loading