Skip to content

Commit a11e617

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

File tree

136 files changed

+1682
-2397
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+1682
-2397
lines changed

‎.github/workflows/build_nix.yml‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11

22
name: Build Tick on Ubuntu
33

4+
concurrency:
5+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
6+
cancel-in-progress: true
7+
48
on:
59
push:
610
branches: [ master ]
711
pull_request:
812
branches: [ master ]
913

1014
env:
11-
TICK_DEBUG: 0
12-
TICK_WERROR: 0
15+
MKN_COMPILE_THREADS: 2
1316
MKN_GCC_PREFERRED: 1
17+
MKN_PYTHON_LIB_EMBED: 1
18+
MKN_LIB_LINK_LIB: 1
19+
KLOG: 3
1420

1521
jobs:
1622
build:
@@ -21,10 +27,10 @@ jobs:
2127
fail-fast: false
2228
max-parallel: 4
2329
matrix:
24-
python-version: ['3.7', '3.9', '3.10', '3.11'] # '3.8' has "'tp_print' is deprecated [-Werror,-Wdeprecated-declarations]"
30+
python-version: ['3.9', '3.10', '3.11'] # , '3.12' not ready
2531

2632
steps:
27-
- uses: actions/checkout@v2
33+
- uses: actions/checkout@v3
2834
with:
2935
submodules: true
3036

@@ -33,32 +39,28 @@ jobs:
3339
python-version: ${{ matrix.python-version }}
3440
architecture: x64
3541

36-
37-
38-
39-
4042
- name: info
4143
run: |
4244
python3 -V
4345
gcc -v
4446
swig -version
4547
46-
- name: pip
48+
- name: pip # tensorflow not released for 3.12 as of 26-OCT-2023
4749
run: |
4850
python3 -m pip install wheel pip --upgrade
4951
python3 -m pip install -r requirements.txt
50-
python3 -m pip install tensorflow-cpu
52+
[ "${{ matrix.python-version }}" != "3.12" ] && python3 -m pip install tensorflow-cpu
5153
5254
- name: build
5355
run: |
5456
curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn_nix
5557
chmod +x mkn
56-
PATH=$PWD:$PATH KLOG=3 ./sh/mkn.sh
58+
./mkn -C lib build -g 0 -dtOa "-fPIC -std=c++17"
5759
5860
- name: cpptest
5961
run: |
60-
PATH=$PWD:$PATH KLOG=3 ./sh/gtest.sh
62+
chmod +x sh/gtest_all.sh
63+
PATH=$PWD:$PATH ./sh/gtest_all.sh "-fPIC -std=c++17"
6164
6265
- name: pytest
63-
run: |
64-
python3 setup.py pytest
66+
run: chmod +x sh/pytest.sh && ./sh/pytest.sh

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11

22
name: Build Tick on OSX
33

4+
concurrency:
5+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
6+
cancel-in-progress: true
7+
48
on:
59
push:
610
branches: [ master ]
711
pull_request:
812
branches: [ master ]
913

1014
env:
11-
TICK_DEBUG: 0
12-
TICK_WERROR: 0
13-
15+
MKN_COMPILE_THREADS: 2
16+
MKN_LIB_LINK_LIB: 1
17+
MKN_PYTHON_LIB_EMBED: 1
18+
KLOG: 3
1419

1520
jobs:
1621
build:
@@ -21,10 +26,10 @@ jobs:
2126
fail-fast: false
2227
max-parallel: 4
2328
matrix:
24-
python-version: ['3.7', '3.9', '3.10'] # '3.8' has "'tp_print' is deprecated [-Werror,-Wdeprecated-declarations]"
29+
python-version: ['3.11', '3.12']
2530

2631
steps:
27-
- uses: actions/checkout@v2
32+
- uses: actions/checkout@v3
2833
with:
2934
submodules: true
3035

@@ -33,10 +38,6 @@ jobs:
3338
python-version: ${{ matrix.python-version }}
3439
architecture: x64
3540

36-
37-
38-
39-
4041
- name: info
4142
run: |
4243
python3 -V
@@ -52,12 +53,13 @@ jobs:
5253
run: |
5354
curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn_osx
5455
chmod +x mkn
55-
PATH=$PWD:$PATH KLOG=3 ./sh/mkn.sh
56+
./mkn -C lib build -g 0 -dtOa "-fPIC -std=c++17"
5657
5758
- name: cpptest
5859
run: |
59-
PATH=$PWD:$PATH KLOG=3 ./sh/gtest.sh
60+
chmod +x sh/gtest_all.sh
61+
PATH=$PWD:$PATH ./sh/gtest_all.sh "-fPIC -std=c++17"
6062
6163
- name: pytest
6264
run: |
63-
python -m unittest discover -v . "*_test.py"
65+
chmod +x sh/pytest.sh && ./sh/pytest.sh

‎.github/workflows/build_win.yml‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11

22
name: Build Tick on Windows
33

4+
concurrency:
5+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
6+
cancel-in-progress: true
7+
48
on:
59
push:
610
branches: [ master ]
711
pull_request:
812
branches: [ master ]
913

1014
env:
11-
TICK_DEBUG: 0
12-
TICK_WERROR: 0
1315
MKN_CL_PREFERRED: 1
1416
MKN_COMPILE_THREADS: 2
17+
KLOG: 3
18+
1519

1620
jobs:
1721
build:
@@ -22,7 +26,7 @@ jobs:
2226
fail-fast: false
2327
max-parallel: 4
2428
matrix:
25-
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
29+
python-version: ['3.9', '3.10', '3.11', '3.12']
2630

2731
steps:
2832
- uses: actions/checkout@v3
@@ -50,15 +54,15 @@ jobs:
5054
python3 -m pip install -r requirements.txt
5155
5256
- name: build
53-
run: | # MINGW link interferres with MSVC link.exe
54-
bash -c "rm /bin/link"
55-
bash -c "curl -Lo mkn.exe https://github.com/mkn/mkn/releases/download/latest/mkn.exe"
56-
bash -c 'PATH=$PWD:$PATH KLOG=3 ./sh/mkn.sh'
57+
shell: bash
58+
run: |
59+
curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn.exe
60+
./mkn -C lib build -g 0 -dtOa "-std:c++17 -EHsc"
5761
5862
- name: cpptest
59-
run: |
60-
bash -c 'PATH=$PWD:$PATH KLOG=3 ./sh/gtest.sh'
63+
shell: bash
64+
run: PATH=$PWD:$PATH ./sh/gtest_all.sh "-std:c++17 -EHsc"
6165

6266
- name: pytest
63-
run: |
64-
python -m unittest discover -v . "*_test.py"
67+
shell: bash
68+
run: ./sh/pytest.sh

0 commit comments

Comments
 (0)