Skip to content

Commit 847c340

Browse files
PhilipDeeganPhilipDeegan
committed
initial work on new wheel release mechanism
1 parent 04dbb37 commit 847c340

File tree

13 files changed

+1134
-970
lines changed

13 files changed

+1134
-970
lines changed

‎.github/workflows/build_nix.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ env:
1212
TICK_WERROR: 0
1313
MKN_GCC_PREFERRED: 1
1414

15+
1516
jobs:
1617
build:
1718
name: Python ${{ matrix.python-version }}
@@ -21,10 +22,10 @@ jobs:
2122
fail-fast: false
2223
max-parallel: 4
2324
matrix:
24-
python-version: ['3.7', '3.9', '3.10', '3.11'] # '3.8' has "'tp_print' is deprecated [-Werror,-Wdeprecated-declarations]"
25+
python-version: ['3.9', '3.10', '3.11', '3.12']
2526

2627
steps:
27-
- uses: actions/checkout@v2
28+
- uses: actions/checkout@v3
2829
with:
2930
submodules: true
3031

@@ -61,4 +62,4 @@ jobs:
6162
6263
- name: pytest
6364
run: |
64-
python3 setup.py pytest
65+
python3 -m unittest discover -v . "*_test.py"

‎.github/workflows/build_osx.yml.off‎ renamed to ‎.github/workflows/build_osx.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ env:
1212
TICK_WERROR: 0
1313

1414

15+
1516
jobs:
1617
build:
1718
name: Python ${{ matrix.python-version }}
@@ -21,10 +22,10 @@ jobs:
2122
fail-fast: false
2223
max-parallel: 4
2324
matrix:
24-
python-version: ['3.7', '3.9', '3.10'] # '3.8' has "'tp_print' is deprecated [-Werror,-Wdeprecated-declarations]"
25+
python-version: ['3.9', '3.10', '3.11', '3.12']
2526

2627
steps:
27-
- uses: actions/checkout@v2
28+
- uses: actions/checkout@v3
2829
with:
2930
submodules: true
3031

@@ -48,6 +49,7 @@ jobs:
4849
python3 -m pip install wheel pip --upgrade
4950
python3 -m pip install -r requirements.txt
5051
52+
5153
- name: build
5254
run: |
5355
curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn_osx
@@ -60,4 +62,5 @@ jobs:
6062
6163
- name: pytest
6264
run: |
63-
python -m unittest discover -v . "*_test.py"
65+
echo "Tests not run until test failures assessed./"
66+
# python -m unittest discover -v . "*_test.py"

‎.github/workflows/build_win.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
fail-fast: false
2323
max-parallel: 4
2424
matrix:
25-
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
25+
python-version: ['3.9', '3.10', '3.11', '3.12']
2626

2727
steps:
2828
- uses: actions/checkout@v3
@@ -49,6 +49,7 @@ jobs:
4949
python3 -m pip install wheel pip --upgrade
5050
python3 -m pip install -r requirements.txt
5151
52+
5253
- name: build
5354
run: | # MINGW link interferres with MSVC link.exe
5455
bash -c "rm /bin/link"

‎.github/workflows/merge_master.yaml‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
name: Master merge
2+
3+
# on:
4+
# push:
5+
# branches: [ master ]
6+
# workflow_dispatch:
7+
8+
on:
9+
push:
10+
branches: [ master ]
11+
pull_request:
12+
branches: [ master ]
13+
14+
jobs:
15+
16+
17+
build_linux:
18+
runs-on: ubuntu-latest
19+
container: quay.io/pypa/manylinux2014_x86_64
20+
21+
strategy:
22+
fail-fast: false
23+
max-parallel: 4
24+
matrix:
25+
python-version: ['cp38-cp38', 'cp39-cp39', 'cp310-cp310', 'cp311-cp311', 'cp312-cp312']
26+
27+
steps:
28+
- name: add Python dir to path
29+
run: |
30+
echo "/opt/python/${{ matrix.python-version }}/bin" >> $GITHUB_PATH
31+
- uses: actions/checkout@v3
32+
with:
33+
submodules: true
34+
- name: Build for Python ${{ matrix.python-version }}
35+
run: |
36+
git config --global --add safe.directory '*'
37+
python3 -V
38+
python3 -m pip install -U pip
39+
python3 -m pip install -U build twine wheel
40+
python3 -m pip install -U -r requirements.txt
41+
42+
curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn_nix
43+
chmod +x mkn
44+
PATH=$PWD:$PATH KLOG=3 ./sh/mkn.sh
45+
python3 -m build
46+
python3 -m twine check dist/*
47+
rename 'linux_x86_64' 'manylinux_2_28_x86_64' dist/*.whl
48+
49+
- name: Make wheels universal
50+
run: for wheel in $(ls dist/*.whl); do auditwheel repair $wheel; done
51+
- name: Save packages as artifacts
52+
uses: actions/upload-artifact@v3
53+
with:
54+
name: wheels
55+
path: wheelhouse/*.whl
56+
57+
58+
# - uses: actions/checkout@v3
59+
60+
# - uses: actions/setup-python@v4
61+
# with:
62+
# python-version: ${{ matrix.python-version }}
63+
# architecture: x64
64+
65+
# - env:
66+
# TWINE_USERNAME: __token__
67+
# TWINE_PASSWORD: ${{ secrets.TEST_PYPI_PASSWORD }}
68+
# run: |
69+
70+
# curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn_nix
71+
# chmod +x mkn
72+
# PATH=$PWD:$PATH KLOG=3 ./sh/mkn.sh
73+
74+
# python3 -m pip install build twine pip --upgrade
75+
# python3 -m build
76+
# python3 -m twine check dist/*
77+
# python3 -m twine upload --repository testpypi --skip-existing dist/*

‎.github/workflows/pythonpublish-linux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
container: jeandet/manylinuxcpp2017
1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v3
1818
with:
1919
submodules: true
2020

‎.github/workflows/pythonpublish-osx.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ jobs:
1414
strategy:
1515
max-parallel: 4
1616
matrix:
17-
python-version: ['3.7', '3.8', '3.9', '3.10']
17+
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
1818
name: Python ${{ matrix.python-version }}
1919
steps:
20-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v3
2121
with:
2222
submodules: true
2323

24-
- uses: actions/setup-python@v1
24+
- uses: actions/setup-python@v4
2525
with:
2626
python-version: ${{ matrix.python-version }}
2727
architecture: x64

‎.github/workflows/pythonpublish-win.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
python-version: ['3.7', '3.8', '3.9', '3.10']
1818
name: Python ${{ matrix.python-version }}
1919
steps:
20-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v3
2121
with:
2222
submodules: true
2323

24-
- uses: actions/setup-python@v1
24+
- uses: actions/setup-python@v4
2525
with:
2626
python-version: ${{ matrix.python-version }}
2727
architecture: x64

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,5 @@ tools/benchmark/data
5858
env*/
5959
venv*/
6060
tickf.yml
61+
dist
62+
tick.egg-info/

‎MANIFEST.in‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
# Setuptools is not aware of source headers, or non-module SWIG files, so we
2-
# grab them here
3-
global-include *.h
4-
global-include *.i
5-
global-include *.inl
1+
recursive-include tick *
2+
recursive-exclude lib *
63

7-
# Getting the Cereal header-only library
8-
recursive-include lib/third_party/cereal/include *.h *.hpp

‎lib/mkn.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ property:
3030

3131
nix_cargs: ${nixish_cargs}
3232

33-
bsd_cargs: ${nixish_cargs}
33+
# sprintf deprecated but used in swig and only OSX complains
34+
# https://developer.apple.com/forums/thread/714675
35+
bsd_cargs: ${nixish_cargs} -Wno-deprecated-declarations
3436

3537
nixish_largs: -fstack-protector-strong -Wformat
3638
-Werror=format-security -Wdate-time

0 commit comments

Comments
 (0)