Skip to content

Commit c6a2295

Browse files
brunoentenbrunoenten
authored
Merge pull request #143 from SpotlightKid/develop
Merge 1.5.0 release to master
2 parents fdc399b + 01c99d1 commit c6a2295

File tree

6 files changed

+198
-18
lines changed

6 files changed

+198
-18
lines changed

‎.github/workflows/main.yml renamed to ‎.github/workflows/development.yml

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
name: Build sdist and wheel and publish to PyPI and TestPyPI
1+
name: Build sdist and wheel and publish to TestPyPI
22

3-
#on: [push, pull_request]
43
on:
54
push:
65
branches:
7-
- master
6+
- develop
87
pull_request:
98
branches:
10-
- master
9+
- develop
1110

1211
jobs:
1312
build_sdist:
@@ -36,6 +35,7 @@ jobs:
3635
name: Build wheels on ${{ matrix.os }}
3736
runs-on: ${{ matrix.os }}
3837
strategy:
38+
fail-fast: true
3939
matrix:
4040
os: [ubuntu-latest, windows-latest, macos-latest]
4141
steps:
@@ -45,7 +45,7 @@ jobs:
4545
submodules: true
4646

4747
- name: Build wheels
48-
uses: pypa/cibuildwheel@v2.11.4
48+
uses: pypa/cibuildwheel@v2.12.3
4949

5050
- uses: actions/upload-artifact@v3
5151
with:
@@ -67,7 +67,7 @@ jobs:
6767
with:
6868
platforms: all
6969

70-
- uses: pypa/cibuildwheel@v2.11.3
70+
- uses: pypa/cibuildwheel@v2.12.3
7171
env:
7272
CIBW_ARCHS: ${{ matrix.arch }}
7373

@@ -84,9 +84,8 @@ jobs:
8484
needs: [build_arch_wheels, build_wheels, build_sdist]
8585
runs-on: ubuntu-latest
8686
environment: PyPI release
87-
if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v')
87+
if: github.ref == 'refs/heads/develop'
8888
steps:
89-
9089
- uses: actions/download-artifact@v3
9190
with:
9291
# unpacks default artifact into dist/
@@ -95,16 +94,11 @@ jobs:
9594
path: dist
9695

9796
- name: Publish distribution to Test PyPI
98-
uses: pypa/gh-action-pypi-publish@v1.6.4
97+
uses: pypa/gh-action-pypi-publish@v1.8.6
9998
with:
10099
skip_existing: true
101100
user: __token__
102101
password: ${{ secrets.TEST_PYPI_API_TOKEN }}
103102
repository_url: https://test.pypi.org/legacy/
103+
verify-metadata: false
104104

105-
- name: Publish distribution to PyPI
106-
if: startsWith(github.ref, 'refs/tags/v')
107-
uses: pypa/gh-action-pypi-publish@v1.6.4
108-
with:
109-
user: __token__
110-
password: ${{ secrets.PYPI_API_TOKEN }}

‎.github/workflows/production.yml

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
name: Build sdist and wheel and publish to PyPI
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
branches:
9+
- master
10+
11+
jobs:
12+
build_sdist:
13+
name: Build sdist
14+
runs-on: ubuntu-latest
15+
steps:
16+
17+
- uses: actions/checkout@v3
18+
with:
19+
submodules: true
20+
21+
- name: Install ninja
22+
run: pipx install ninja
23+
24+
- name: Build sdist
25+
run: pipx run build --sdist
26+
27+
- name: Check metadata
28+
run: pipx run twine check --strict dist/*
29+
30+
- uses: actions/upload-artifact@v3
31+
with:
32+
path: dist/*.tar.gz
33+
34+
build_wheels:
35+
name: Build wheels on ${{ matrix.os }}
36+
runs-on: ${{ matrix.os }}
37+
strategy:
38+
matrix:
39+
os: [ubuntu-latest, windows-latest, macos-latest]
40+
steps:
41+
42+
- uses: actions/checkout@v3
43+
with:
44+
submodules: true
45+
46+
- name: Build wheels
47+
uses: pypa/cibuildwheel@v2.12.3
48+
49+
- uses: actions/upload-artifact@v3
50+
with:
51+
path: wheelhouse/*.whl
52+
53+
build_arch_wheels:
54+
name: Build wheels on Linux ${{ matrix.arch }}
55+
runs-on: ubuntu-20.04
56+
strategy:
57+
matrix:
58+
arch: [aarch64]
59+
steps:
60+
61+
- uses: actions/checkout@v3
62+
with:
63+
submodules: true
64+
65+
- uses: docker/setup-qemu-action@v2
66+
with:
67+
platforms: all
68+
69+
- uses: pypa/cibuildwheel@v2.12.3
70+
env:
71+
CIBW_ARCHS: ${{ matrix.arch }}
72+
73+
- name: Verify clean directory
74+
run: git diff --exit-code
75+
shell: bash
76+
77+
- name: Upload wheels
78+
uses: actions/upload-artifact@v3
79+
with:
80+
path: wheelhouse/*.whl
81+
82+
upload_pypi:
83+
needs: [build_arch_wheels, build_wheels, build_sdist]
84+
runs-on: ubuntu-latest
85+
environment: PyPI release
86+
if: github.event_name == 'release' && github.event.action == 'published'
87+
steps:
88+
- uses: actions/download-artifact@v3
89+
with:
90+
# unpacks default artifact into dist/
91+
# if `name: artifact` is omitted, the action will create extra parent dir
92+
name: artifact
93+
path: dist
94+
95+
- name: Publish distribution to PyPI
96+
uses: pypa/gh-action-pypi-publish@v1.8.6
97+
with:
98+
user: __token__
99+
password: ${{ secrets.PYPI_API_TOKEN }}
100+
verify-metadata: false

‎.github/workflows/tests.yml

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
name: Build sdist and wheel for testing purposes
2+
3+
on:
4+
push:
5+
branches:
6+
- rtmidi-5.0.0
7+
pull_request:
8+
branches:
9+
- rtmidi-5.0.0
10+
11+
jobs:
12+
build_sdist:
13+
name: Build sdist
14+
runs-on: ubuntu-latest
15+
steps:
16+
17+
- uses: actions/checkout@v3
18+
with:
19+
submodules: true
20+
21+
- name: Install ninja
22+
run: pipx install ninja
23+
24+
- name: Build sdist
25+
run: pipx run build --sdist
26+
27+
- name: Check metadata
28+
run: pipx run twine check --strict dist/*
29+
30+
- uses: actions/upload-artifact@v3
31+
with:
32+
path: dist/*.tar.gz
33+
34+
build_wheels:
35+
name: Build wheels on ${{ matrix.os }}
36+
runs-on: ${{ matrix.os }}
37+
strategy:
38+
fail-fast: true
39+
matrix:
40+
os: [ubuntu-latest, windows-latest, macos-latest]
41+
steps:
42+
43+
- uses: actions/checkout@v3
44+
with:
45+
submodules: true
46+
47+
- name: Build wheels
48+
uses: pypa/cibuildwheel@v2.12.3
49+
50+
- uses: actions/upload-artifact@v3
51+
with:
52+
path: wheelhouse/*.whl
53+
54+
build_arch_wheels:
55+
name: Build wheels on Linux ${{ matrix.arch }}
56+
runs-on: ubuntu-20.04
57+
strategy:
58+
matrix:
59+
arch: [aarch64]
60+
steps:
61+
62+
- uses: actions/checkout@v3
63+
with:
64+
submodules: true
65+
66+
- uses: docker/setup-qemu-action@v2
67+
with:
68+
platforms: all
69+
70+
- uses: pypa/cibuildwheel@v2.12.3
71+
env:
72+
CIBW_ARCHS: ${{ matrix.arch }}
73+
74+
- name: Verify clean directory
75+
run: git diff --exit-code
76+
shell: bash
77+
78+
- name: Upload wheels
79+
uses: actions/upload-artifact@v3
80+
with:
81+
path: wheelhouse/*.whl

‎meson.build

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
project(
22
'python-rtmidi',
33
'cpp',
4-
version: '1.5.0rc1',
4+
version: '1.5.0',
55
license: 'MIT',
66
default_options: [
77
'warning_level=2'
@@ -29,6 +29,11 @@ if host_machine.system() == 'windows' and cpp.get_id() == 'gcc'
2929
endif
3030
##
3131

32+
if host_machine.system() == 'darwin'
33+
# Enable c++11 support
34+
add_project_arguments('-std=c++11', language: ['cpp'])
35+
endif
36+
3237
# Dependencies
3338
jack2_dep = dependency('jack', version: '>=1.9.11', required: false)
3439
jack1_dep = dependency('jack', version: ['>=0.125.0', '<1.0'], required: false)

‎pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ file = "LICENSE.md"
6060
[tool.black]
6161
line-length = 99
6262
target-version = [
63-
"py37",
6463
"py38",
6564
"py39",
6665
"py310",
@@ -103,6 +102,7 @@ before-all = [
103102
[tool.cibuildwheel.macos]
104103
build = "cp3{8,9,10,11}-macosx*"
105104
archs = ["universal2"]
105+
environment = { MACOSX_DEPLOYMENT_TARGET = "10.14" }
106106
before-all = [
107107
"pipx install ninja",
108108
]

‎src/rtmidi

0 commit comments

Comments
 (0)