Skip to content

Commit 44baedf

Browse files
authored
Merge branch 'main' into dependabot/github_actions/ncipollo/release-action-1.19.2
2 parents 591c59d + 837b2bf commit 44baedf

File tree

16 files changed

+297
-132
lines changed

16 files changed

+297
-132
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
version: 2
33
updates:
44
- package-ecosystem: pip
5-
directory: /dependencies/default
6-
schedule:
7-
interval: weekly
8-
open-pull-requests-limit: 10
9-
target-branch: main
10-
- package-ecosystem: pip
11-
directory: /dependencies/docs
5+
directory: /
126
schedule:
137
interval: weekly
148
open-pull-requests-limit: 10

.github/workflows/main.yml

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ env:
1616
PYTHON_LATEST: 3.13
1717

1818
jobs:
19-
lint:
20-
name: Run linters
19+
build:
20+
name: Build package
2121
runs-on: ubuntu-latest
2222
outputs:
2323
version: ${{ steps.version.outputs.version }}
@@ -30,23 +30,12 @@ jobs:
3030
- uses: actions/setup-python@v5
3131
with:
3232
python-version: ${{ env.PYTHON_LATEST }}
33-
- name: Install GitHub matcher for ActionLint checker
34-
run: |
35-
echo "::add-matcher::.github/actionlint-matcher.json"
36-
- name: Install pre-commit
37-
run: python -m pip install pre-commit
38-
- name: Run pre-commit checks
39-
run: pre-commit run --all-files --show-diff-on-failure
40-
- name: Install check-wheel-content, and twine
41-
run: python -m pip install build check-wheel-contents twine
42-
- name: Build package
43-
run: python -m build
33+
- name: Install tox
34+
run: python -m pip install tox
35+
- name: Build package and check distributions
36+
run: tox run -e build
4437
- name: List result
4538
run: ls -l dist
46-
- name: Check wheel contents
47-
run: check-wheel-contents dist/*.whl
48-
- name: Check long_description
49-
run: python -m twine check dist/*
5039
- name: Install pytest-asyncio
5140
run: pip install .
5241
- name: Get version info
@@ -58,6 +47,25 @@ jobs:
5847
name: dist
5948
path: dist
6049

50+
lint:
51+
name: Run linters
52+
runs-on: ubuntu-latest
53+
steps:
54+
- uses: actions/checkout@v5
55+
with:
56+
fetch-depth: 0
57+
persist-credentials: false
58+
- uses: actions/setup-python@v5
59+
with:
60+
python-version: ${{ env.PYTHON_LATEST }}
61+
- name: Install GitHub matcher for ActionLint checker
62+
run: |
63+
echo "::add-matcher::.github/actionlint-matcher.json"
64+
- name: Install pre-commit
65+
run: python -m pip install pre-commit
66+
- name: Run pre-commit checks
67+
run: pre-commit run --all-files --show-diff-on-failure
68+
6169
test:
6270
name: ${{ matrix.os }} - Python ${{ matrix.python-version }}
6371
runs-on: ${{ matrix.os }}-latest
@@ -109,7 +117,7 @@ jobs:
109117
check:
110118
name: Check
111119
if: always()
112-
needs: [lint, test]
120+
needs: [build, lint, test]
113121
runs-on: ubuntu-latest
114122
steps:
115123
- name: Decide whether the needed jobs succeeded or failed
@@ -145,7 +153,7 @@ jobs:
145153

146154
create-github-release:
147155
name: Create GitHub release
148-
needs: [lint, check]
156+
needs: [build, lint, check]
149157
runs-on: ubuntu-latest
150158
permissions:
151159
contents: write
@@ -168,7 +176,7 @@ jobs:
168176
if: ${{ !contains(github.ref, 'refs/tags/') }}
169177
run: towncrier build --draft --version "${version}" > release-notes.rst
170178
env:
171-
version: ${{ needs.lint.outputs.version }}
179+
version: ${{ needs.build.outputs.version }}
172180
- name: Extract release notes from Git tag
173181
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
174182
run: |
@@ -194,16 +202,16 @@ jobs:
194202
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
195203
uses: ncipollo/release-action@98d25d4189e9b6cee19b8635b1ea5cc39c158a41 # v1.19.2
196204
with:
197-
name: pytest-asyncio ${{ needs.lint.outputs.version }}
205+
name: pytest-asyncio ${{ needs.build.outputs.version }}
198206
artifacts: dist/*
199207
bodyFile: release-notes.md
200-
prerelease: ${{ needs.lint.outputs.prerelease }}
208+
prerelease: ${{ needs.build.outputs.prerelease }}
201209
token: ${{ secrets.GITHUB_TOKEN }}
202210

203211
publish-test-pypi:
204212
name: Publish packages to test.pypi.org
205213
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
206-
needs: [lint, check]
214+
needs: [build, lint, check]
207215
runs-on: ubuntu-latest
208216
permissions:
209217
id-token: write
@@ -222,7 +230,7 @@ jobs:
222230
name: Publish packages to pypi.org
223231
environment: release
224232
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
225-
needs: [lint, check]
233+
needs: [build, lint, check]
226234
runs-on: ubuntu-latest
227235
permissions:
228236
id-token: write

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ repos:
7272
hooks:
7373
- id: pyproject-fmt
7474
# https://pyproject-fmt.readthedocs.io/en/latest/#calculating-max-supported-python-version
75-
additional_dependencies: [tox>=4.9]
75+
additional_dependencies: [tox>=4.28]
7676
- repo: https://github.com/zizmorcore/zizmor-pre-commit
7777
rev: v1.12.1
7878
hooks:
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Extend dependency on typing-extensions>=4.12 from Python<3.10 to Python<3.13.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Bump the minimum required version of tox to v4.28. This change is only relevant if you use the ``tox.ini`` file provided by pytest-asyncio to run tests.

changelog.d/1189.added.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
A ``pytest.UsageError`` for invalid configuration values of ``asyncio_default_fixture_loop_scope`` and ``asyncio_default_test_loop_scope``.

constraints.txt

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
alabaster==0.7.16
2+
annotated-types-0.7.0
3+
attrs==25.3.0
4+
babel==2.17.0
5+
backports.asyncio.runner==1.2.0
6+
backports.tarfile==1.2.0
7+
certifi==2025.8.3
8+
charset-normalizer==3.4.3
9+
check-wheel-contents==0.6.1
10+
cffi==1.17.1
11+
click==8.1.8
12+
coverage==7.10.6
13+
cryptography==45.0.6
14+
docutils==0.21.2
15+
exceptiongroup==1.3.0
16+
hypothesis==6.138.13
17+
iniconfig==2.1.0
18+
id==1.5.0
19+
idna==3.10
20+
imagesize==1.4.1
21+
importlib_metadata==8.7.0
22+
iniconfig==2.1.0
23+
jaraco.classes==3.4.0
24+
jaraco.context==6.0.1
25+
jaraco.functools==4.3.0
26+
jeepney==0.9.0
27+
Jinja2==3.1.6
28+
keyring==25.6.0
29+
markdown-it-py==3.0.0
30+
MarkupSafe==3.0.2
31+
mdurl==0.1.2
32+
more-itertools==10.7.0
33+
nh3==0.3.0
34+
packaging==25.0
35+
pluggy==1.6.0
36+
Pygments==2.19.2
37+
pycparser==2.22
38+
pydantic==2.11.7
39+
pydantic-core==2.33.2
40+
pytest==8.4.1
41+
readme-renderer==44.0
42+
requests==2.32.4
43+
requests-toolbelt==1.0.0
44+
rfc3986==2.0.0
45+
rich==14.1.0
46+
SecretStorage==3.3.3
47+
setuptools==80.9.0
48+
setuptools-scm==8.3.0
49+
snowballstemmer==3.0.1
50+
sortedcontainers==2.4.0
51+
Sphinx==8.0.2
52+
sphinx-rtd-theme==3.0.2
53+
sphinxcontrib-applehelp==2.0.0
54+
sphinxcontrib-devhelp==2.0.0
55+
sphinxcontrib-htmlhelp==2.1.0
56+
sphinxcontrib-jquery==4.1
57+
sphinxcontrib-jsmath==1.0.1
58+
sphinxcontrib-qthelp==2.0.0
59+
sphinxcontrib-serializinghtml==2.0.0
60+
tomli==2.2.1
61+
twine==6.1.0
62+
typing_extensions==4.15.0
63+
typing-inspection==0.4.1
64+
urllib3==2.5.0
65+
wheel-filename==1.4.2
66+
zipp==3.23.0

dependencies/default/constraints.txt

Lines changed: 0 additions & 11 deletions
This file was deleted.

dependencies/default/requirements.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.

dependencies/docs/requirements.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)