Skip to content

Commit 0ff2d4b

Browse files
authored
Merge pull request #10 from adafruit/concurrency-event-name
CI improvements
2 parents 11f15d2 + 1f2ed7b commit 0ff2d4b

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

.github/workflows/pip.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
push:
77

88
concurrency:
9-
group: ${{ github.workflow }}-${{ github.ref }}
9+
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
1010
cancel-in-progress: true
1111

1212
jobs:
@@ -45,16 +45,17 @@ jobs:
4545
with:
4646
update: true
4747
install: >-
48+
git
4849
mingw-w64-x86_64-gcc
4950
mingw-w64-x86_64-python-pip
5051
mingw-w64-x86_64-python-wheel
5152
5253
- uses: actions/checkout@v4
5354

54-
- name: Install pybind11
55+
- name: Install requirements
5556
# This is required because --no-build-isolation disable dependences
5657
# installation
57-
run: pip install pybind11
58+
run: pip install pybind11 setuptools_scm
5859

5960
- name: Build and install
6061
# --no-build-isolation is required because the vanilla setuptool does not

.github/workflows/wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- published
1010

1111
concurrency:
12-
group: ${{ github.workflow }}-${{ github.ref }}
12+
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
1313
cancel-in-progress: true
1414

1515
jobs:

pyproject.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22
requires = [
33
"setuptools>=42",
44
"pybind11>=2.10.0",
5+
"setuptools_scm[toml]>=6.2",
56
]
67
build-backend = "setuptools.build_meta"
78

9+
[tool.setuptools_scm]
10+
811
[tool.cibuildwheel]
912
test-command = "python {project}/tests/test.py"
1013
test-skip = "*universal2:arm64"

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
# Available at setup time due to pyproject.toml
33
from pybind11.setup_helpers import Pybind11Extension, build_ext
44
from setuptools import setup
5+
from setuptools_scm import get_version
56

6-
__version__ = "0.0.7"
7+
__version__ = get_version()
78

89
# The main interface is through Pybind11Extension.
910
# * You can add cxx_std=11/14/17, and then build_ext can be removed.

0 commit comments

Comments
 (0)