Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/pip/pre-commit-4.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
asvetlov authored Oct 11, 2024
2 parents 3df79d6 + bb44f4f commit 86eebd2
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 23 deletions.
35 changes: 22 additions & 13 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,32 +14,32 @@ jobs:
name: Run client tests
strategy:
matrix:
py_version: ['3.8', '3.9', '3.10', '3.11']
py_version: ['3.9', '3.10', '3.11', '3.12']
os: [ubuntu, macos, windows]
exclude:
- py_version: '3.9'
os: macos
- py_version: '3.9'
os: windows
- py_version: '3.10'
os: macos
- py_version: '3.10'
os: windows
- py_version: '3.11'
os: macos
- py_version: '3.11'
os: ubuntu
runs-on: ${{ matrix.os }}-latest
steps:
- name: Checkout commit
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Install python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.py_version }}
- name: Cache packages
uses: actions/cache@v2.1.6
uses: actions/cache@v4.1.1
with:
path: ~/.cache/pip
key: ${{ runner.os }}-py-${{ matrix.py_version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('setup.py') }}
- name: Install dependencies
uses: py-actions/py-dependency-install@v2
uses: py-actions/py-dependency-install@v4
with:
path: requirements.txt
- name: Lint
Expand All @@ -51,25 +51,34 @@ jobs:
- name: Run tests
run: make test
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v2.0.2
uses: codecov/codecov-action@v4.6.0
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: .coverage.xml
name: client-codecov
flags: py${{ matrix.py_version }}
all-tests-passed:
name: All tests passed
needs:
- test
runs-on: ubuntu-latest
steps:
- name: Dummy
run: |
echo "OK"
release:
name: Release client
runs-on: ubuntu-latest
needs:
- test
- all-tests-passed
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
steps:
- name: Checkout commit
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: 3.9
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/remove-automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
contains(github.event.pull_requests[0].labels.*.name, 'dependencies') }}
steps:
- id: generate_token
uses: tibdex/github-app-token@v1
uses: tibdex/github-app-token@v2
with:
app_id: ${{ secrets.BOT_APP_ID }}
private_key: ${{ secrets.BOT_PRIVATE_KEY }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/setup-automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ jobs:
if: ${{ github.actor == 'dependabot[bot]'}}
steps:
- name: Checkout
uses: actions/checkout@v2.3.4
uses: actions/checkout@v4
- id: generate_token
uses: tibdex/github-app-token@v1
uses: tibdex/github-app-token@v2
with:
app_id: ${{ secrets.BOT_APP_ID }}
private_key: ${{ secrets.BOT_PRIVATE_KEY }}
- name: metadata
id: metadata
uses: dependabot/fetch-metadata@v1.1.1
uses: dependabot/fetch-metadata@v2.2.0
with:
github-token: ${{ steps.generate_token.outputs.token }}
- name: Enable auto-merge for bot PRs
Expand All @@ -34,9 +34,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2.3.4
uses: actions/checkout@v4
- id: generate_token
uses: tibdex/github-app-token@v1
uses: tibdex/github-app-token@v2
with:
app_id: ${{ secrets.BOT_APP_ID }}
private_key: ${{ secrets.BOT_PRIVATE_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v4
- uses: actions/stale@v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: This issue is stale because it has been open 90 days
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-e .
mypy==1.0.0
pre-commit==4.0.1
pytest==6.2.4
pytest==8.3.3
pytest-cov==2.12.0
types-backports
types-setuptools
3 changes: 1 addition & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@ classifiers =
[options]
zip_safe = False
# Required for Neu.ro SDK
python_requires = >=3.8
python_requires = >=3.9
include_package_data = True
packages = find:
install_requires =
aiohttp>=3.7
backports.zoneinfo; python_version<"3.9"
tzdata

[flake8]
Expand Down

0 comments on commit 86eebd2

Please sign in to comment.