Skip to content

Commit

Permalink
Merge branch 'master' into uncancel-cancelled-tasks
Browse files Browse the repository at this point in the history
  • Loading branch information
Dreamsorcerer authored Aug 9, 2023
2 parents f899871 + adf9e28 commit 480696f
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- name: Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@v1.1.1
uses: dependabot/fetch-metadata@v1.3.4
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
- name: Enable auto-merge for Dependabot PRs
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
needs: lint
strategy:
matrix:
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11-dev"]
pyver: ["3.7", "3.8", "3.9", "3.10", "3.11"]
os: [ubuntu, macos, windows]
include:
- pyver: pypy-3.9
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
python -m pytest tests
python -m coverage xml
- name: Upload coverage
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v3
with:
file: ./coverage.xml
flags: unit
Expand All @@ -110,7 +110,7 @@ jobs:
run:
python -m build
- name: Make Release
uses: aio-libs/create-release@v1.2.3
uses: aio-libs/create-release@v1.6.6
with:
changes_file: CHANGES.rst
name: async-timeout
Expand Down
16 changes: 8 additions & 8 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: 'v4.3.0'
rev: 'v4.4.0'
hooks:
- id: check-merge-conflict
exclude: "rst$"
- repo: https://github.com/asottile/yesqa
rev: v1.3.0
rev: v1.5.0
hooks:
- id: yesqa
- repo: https://github.com/PyCQA/isort
rev: '5.10.1'
rev: '5.12.0'
hooks:
- id: isort
- repo: https://github.com/psf/black
rev: '22.3.0'
rev: '23.7.0'
hooks:
- id: black
language_version: python3 # Should be a command that runs python3.6+
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: 'v4.3.0'
rev: 'v4.4.0'
hooks:
- id: check-case-conflict
- id: check-json
Expand All @@ -35,17 +35,17 @@ repos:
- id: debug-statements
# Another entry is required to apply file-contents-sorter to another file
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: 'v4.3.0'
rev: 'v4.4.0'
hooks:
- id: file-contents-sorter
files: |
.gitignore
- repo: https://github.com/asottile/pyupgrade
rev: 'v2.34.0'
rev: 'v3.10.1'
hooks:
- id: pyupgrade
args: ['--py36-plus']
- repo: https://github.com/PyCQA/flake8
rev: '4.0.1'
rev: '6.1.0'
hooks:
- id: flake8
1 change: 1 addition & 0 deletions CHANGES/333.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add support for Python 3.11.
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ classifiers =
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11

[options]
python_requires = >=3.7
Expand Down
1 change: 0 additions & 1 deletion tests/test_timeout.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ async def test_timeout_time() -> None:

@pytest.mark.asyncio
async def test_outer_coro_is_not_cancelled() -> None:

has_timeout = False

async def outer() -> None:
Expand Down

0 comments on commit 480696f

Please sign in to comment.