Skip to content

Commit 6c4dc65

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

File tree

132 files changed

+1616
-2388
lines changed

Some content is hidden

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

132 files changed

+1616
-2388
lines changed

‎.github/workflows/build_nix.yml‎

Lines changed: 17 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,11 @@ 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.11']
31+
# python-version: ['3.9', '3.10', '3.11'] # , '3.12' - not ready yet
2532

2633
steps:
27-
- uses: actions/checkout@v2
34+
- uses: actions/checkout@v3
2835
with:
2936
submodules: true
3037

@@ -33,32 +40,28 @@ jobs:
3340
python-version: ${{ matrix.python-version }}
3441
architecture: x64
3542

36-
37-
38-
39-
4043
- name: info
4144
run: |
4245
python3 -V
4346
gcc -v
4447
swig -version
4548
46-
- name: pip
49+
- name: pip # tensorflow not released for 3.12 as of 26-OCT-2023
4750
run: |
4851
python3 -m pip install wheel pip --upgrade
4952
python3 -m pip install -r requirements.txt
50-
python3 -m pip install tensorflow-cpu
53+
[ "${{ matrix.python-version }}" != "3.12" ] && python3 -m pip install tensorflow-cpu
5154
5255
- name: build
5356
run: |
5457
curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn_nix
5558
chmod +x mkn
56-
PATH=$PWD:$PATH KLOG=3 ./sh/mkn.sh
59+
./mkn -C lib build -g 0 -dtOa "-fPIC -std=c++17"
5760
5861
- name: cpptest
5962
run: |
60-
PATH=$PWD:$PATH KLOG=3 ./sh/gtest.sh
63+
chmod +x sh/gtest_all.sh
64+
PATH=$PWD:$PATH ./sh/gtest_all.sh "-fPIC -std=c++17"
6165
6266
- name: pytest
63-
run: |
64-
python3 setup.py pytest
67+
run: chmod +x sh/pytest.sh && ./sh/pytest.sh

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

Lines changed: 15 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,11 @@ 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']
30+
# python-version: ['3.9', '3.10', '3.11', '3.12']
2531

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

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

36-
37-
38-
39-
4042
- name: info
4143
run: |
4244
python3 -V
@@ -52,12 +54,13 @@ jobs:
5254
run: |
5355
curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn_osx
5456
chmod +x mkn
55-
PATH=$PWD:$PATH KLOG=3 ./sh/mkn.sh
57+
./mkn -C lib build -g 0 -dtOa "-fPIC -std=c++17"
5658
5759
- name: cpptest
5860
run: |
59-
PATH=$PWD:$PATH KLOG=3 ./sh/gtest.sh
61+
chmod +x sh/gtest_all.sh
62+
PATH=$PWD:$PATH ./sh/gtest_all.sh "-fPIC -std=c++17"
6063
6164
- name: pytest
6265
run: |
63-
python -m unittest discover -v . "*_test.py"
66+
chmod +x sh/pytest.sh && ./sh/pytest.sh

‎.github/workflows/build_win.yml‎

Lines changed: 16 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,8 @@ 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.11']
30+
# python-version: ['3.9', '3.10', '3.11', '3.12']
2631

2732
steps:
2833
- uses: actions/checkout@v3
@@ -50,15 +55,15 @@ jobs:
5055
python3 -m pip install -r requirements.txt
5156
5257
- 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'
58+
shell: bash
59+
run: |
60+
curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn.exe
61+
./mkn -C lib build -g 0 -dtOa "-std:c++17 -EHsc"
5762
5863
- name: cpptest
59-
run: |
60-
bash -c 'PATH=$PWD:$PATH KLOG=3 ./sh/gtest.sh'
64+
shell: bash
65+
run: PATH=$PWD:$PATH ./sh/gtest_all.sh "-std:c++17 -EHsc"
6166

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

0 commit comments

Comments
 (0)