Skip to content

Commit 8181308

Browse files
authored
Merge branch 'pytest-dev:main' into add-test-case-in-test-base
2 parents e3b6a14 + 3ab1fea commit 8181308

File tree

6 files changed

+15
-33
lines changed

6 files changed

+15
-33
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
version: ${{ steps.version.outputs.version }}
2424
prerelease: ${{ steps.version.outputs.prerelease }}
2525
steps:
26-
- uses: actions/checkout@v4
26+
- uses: actions/checkout@v5
2727
with:
2828
fetch-depth: 0
2929
persist-credentials: false
@@ -77,7 +77,7 @@ jobs:
7777

7878

7979
steps:
80-
- uses: actions/checkout@v4
80+
- uses: actions/checkout@v5
8181
with:
8282
persist-credentials: false
8383
- uses: actions/setup-python@v5
@@ -116,7 +116,7 @@ jobs:
116116
uses: re-actors/alls-green@05ac9388f0aebcb5727afa17fcccfecd6f8ec5fe # v1.2.2
117117
with:
118118
jobs: ${{ toJSON(needs) }}
119-
- uses: actions/checkout@v4
119+
- uses: actions/checkout@v5
120120
with:
121121
persist-credentials: false
122122
- uses: actions/setup-python@v5
@@ -151,7 +151,7 @@ jobs:
151151
contents: write
152152
steps:
153153
- name: Checkout
154-
uses: actions/checkout@v4
154+
uses: actions/checkout@v5
155155
with:
156156
fetch-depth: 0
157157
persist-credentials: false

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,3 @@ target/
6262

6363
# pyenv
6464
.python-version
65-
66-
67-
# generated by setuptools_scm
68-
pytest_asyncio/_version.py

pyproject.toml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[build-system]
22
build-backend = "setuptools.build_meta"
33
requires = [
4-
"setuptools>=77",
5-
"setuptools-scm[toml]>=6.2",
4+
"setuptools==80.9",
5+
"setuptools-scm==9.2",
66
]
77

88
[project]
@@ -67,7 +67,6 @@ packages = [
6767
include-package-data = true
6868

6969
[tool.setuptools_scm]
70-
write_to = "pytest_asyncio/_version.py"
7170
local_scheme = "no-local-version"
7271

7372
[tool.ruff]
@@ -138,9 +137,6 @@ source = [
138137
]
139138
branch = true
140139
data_file = "coverage/coverage"
141-
omit = [
142-
"*/_version.py",
143-
]
144140
parallel = true
145141

146142
[tool.coverage.report]

pytest_asyncio/__init__.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
from __future__ import annotations
44

5-
from ._version import version as __version__ # noqa: F401
5+
from importlib.metadata import version
6+
67
from .plugin import fixture, is_async_test
78

9+
__version__ = version(__name__)
10+
811
__all__ = ("fixture", "is_async_test")

setup.cfg

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

tests/test_package.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import pytest_asyncio
2+
3+
4+
def test_package_exposes_version():
5+
assert pytest_asyncio.__version__

0 commit comments

Comments
 (0)