Skip to content

Commit

Permalink
initial work on new wheel release mechanism
Browse files Browse the repository at this point in the history
  • Loading branch information
PhilipDeegan committed Dec 7, 2023
1 parent 04dbb37 commit 10a6983
Show file tree
Hide file tree
Showing 132 changed files with 1,611 additions and 2,389 deletions.
30 changes: 16 additions & 14 deletions .github/workflows/build_nix.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@

name: Build Tick on Ubuntu

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

env:
TICK_DEBUG: 0
TICK_WERROR: 0
MKN_COMPILE_THREADS: 2
MKN_GCC_PREFERRED: 1
MKN_PYTHON_LIB_EMBED: 1
MKN_LIB_LINK_LIB: 1
KLOG: 3

jobs:
build:
Expand All @@ -21,10 +27,10 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: ['3.7', '3.9', '3.10', '3.11'] # '3.8' has "'tp_print' is deprecated [-Werror,-Wdeprecated-declarations]"
python-version: ['3.9', '3.10', '3.11', '3.12']

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: true

Expand All @@ -33,32 +39,28 @@ jobs:
python-version: ${{ matrix.python-version }}
architecture: x64





- name: info
run: |
python3 -V
gcc -v
swig -version
- name: pip
- name: pip # tensorflow not released for 3.12 as of 26-OCT-2023
run: |
python3 -m pip install wheel pip --upgrade
python3 -m pip install -r requirements.txt
python3 -m pip install tensorflow-cpu
[ "${{ matrix.python-version }}" != "3.12" ] && python3 -m pip install tensorflow-cpu
- name: build
run: |
curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn_nix
chmod +x mkn
PATH=$PWD:$PATH KLOG=3 ./sh/mkn.sh
./mkn -C lib build -g 0 -dtOa "-fPIC -std=c++17"
- name: cpptest
run: |
PATH=$PWD:$PATH KLOG=3 ./sh/gtest.sh
chmod +x sh/gtest_all.sh
PATH=$PWD:$PATH ./sh/gtest_all.sh "-fPIC -std=c++17"
- name: pytest
run: |
python3 setup.py pytest
run: chmod +x sh/pytest.sh && ./sh/pytest.sh
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@

name: Build Tick on OSX

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

env:
TICK_DEBUG: 0
TICK_WERROR: 0

MKN_COMPILE_THREADS: 2
MKN_LIB_LINK_LIB: 1
MKN_PYTHON_LIB_EMBED: 1
KLOG: 3

jobs:
build:
Expand All @@ -21,10 +26,10 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: ['3.7', '3.9', '3.10'] # '3.8' has "'tp_print' is deprecated [-Werror,-Wdeprecated-declarations]"
python-version: ['3.9', '3.10', '3.11', '3.12']

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: true

Expand All @@ -33,10 +38,6 @@ jobs:
python-version: ${{ matrix.python-version }}
architecture: x64





- name: info
run: |
python3 -V
Expand All @@ -52,12 +53,13 @@ jobs:
run: |
curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn_osx
chmod +x mkn
PATH=$PWD:$PATH KLOG=3 ./sh/mkn.sh
./mkn -C lib build -g 0 -dtOa "-fPIC -std=c++17"
- name: cpptest
run: |
PATH=$PWD:$PATH KLOG=3 ./sh/gtest.sh
chmod +x sh/gtest_all.sh
PATH=$PWD:$PATH ./sh/gtest_all.sh "-fPIC -std=c++17"
- name: pytest
run: |
python -m unittest discover -v . "*_test.py"
chmod +x sh/pytest.sh && ./sh/pytest.sh
26 changes: 15 additions & 11 deletions .github/workflows/build_win.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@

name: Build Tick on Windows

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

env:
TICK_DEBUG: 0
TICK_WERROR: 0
MKN_CL_PREFERRED: 1
MKN_COMPILE_THREADS: 2
KLOG: 3


jobs:
build:
Expand All @@ -22,7 +26,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
python-version: ['3.9', '3.10', '3.11', '3.12']

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -50,15 +54,15 @@ jobs:
python3 -m pip install -r requirements.txt
- name: build
run: | # MINGW link interferres with MSVC link.exe
bash -c "rm /bin/link"
bash -c "curl -Lo mkn.exe https://github.com/mkn/mkn/releases/download/latest/mkn.exe"
bash -c 'PATH=$PWD:$PATH KLOG=3 ./sh/mkn.sh'
shell: bash
run: |
curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn.exe
./mkn -C lib build -g 0 -dtOa "-std:c++17 -EHsc"
- name: cpptest
run: |
bash -c 'PATH=$PWD:$PATH KLOG=3 ./sh/gtest.sh'
shell: bash
run: PATH=$PWD:$PATH ./sh/gtest_all.sh "-std:c++17 -EHsc"

- name: pytest
run: |
python -m unittest discover -v . "*_test.py"
shell: bash
run: ./sh/pytest.sh
195 changes: 195 additions & 0 deletions .github/workflows/merge_master.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,195 @@
name: Master merge

# on:
# push:
# branches: [ master ]
# workflow_dispatch:

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

env:
MKN_COMPILE_THREADS: 2
MKN_GCC_PREFERRED: 1
MKN_LIB_LINK_LIB: 1
KLOG: 3

jobs:

build_linux:
runs-on: ubuntu-latest
container: quay.io/pypa/manylinux2014_x86_64

strategy:
fail-fast: false
max-parallel: 4
matrix:
python-version: ['cp39-cp39', 'cp310-cp310', 'cp311-cp311', 'cp312-cp312']

steps:
- name: add Python dir to path
run: |
echo "/opt/python/${{ matrix.python-version }}/bin" >> $GITHUB_PATH
- uses: actions/checkout@v3
with:
submodules: true
- name: Build for Python ${{ matrix.python-version }}
run: |
git config --global --add safe.directory '*'
python3 -V
python3 -m pip install -U pip
python3 -m pip install -U build twine wheel
python3 -m pip install -U -r requirements.txt
curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn_manylinux
chmod +x mkn
PATH=$PWD:$PATH mkn -C lib build -g 0 -dtO 2 -a "-fPIC -std=c++17"
python3 -m build --wheel --no-isolation .
python3 -m twine check dist/*
- name: Make wheels universal
run: for wheel in $(ls dist/*.whl); do auditwheel repair $wheel; done
- name: Save packages as artifacts
uses: actions/upload-artifact@v3
with:
name: wheels
path: wheelhouse/*.whl

build_other:
strategy:
fail-fast: false
max-parallel: 4
matrix:
os: [macos-latest, windows-latest]
python-version: ['3.9', '3.10', '3.11', '3.12']

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
with:
submodules: true
- uses: ilammy/msvc-dev-cmd@v1
if: runner.os == 'Windows'
with:
arch: amd64
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
architecture: x64

- name: setup Python ${{ matrix.os }} ${{ matrix.python-version }}
run: |
git config --global --add safe.directory '*'
python3 -V
python3 -m pip install -U pip
python3 -m pip install -U build twine wheel
python3 -m pip install -U -r requirements.txt
- name: build windows
env:
MKN_CL_PREFERRED: 1
if: runner.os == 'Windows'
shell: bash
run: |
curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn.exe
./mkn -C lib build -g 0 -dtO 2 -a "-std:c++17 -EHsc"
- name: build macos
env:
MKN_PYTHON_LIB_EMBED: 1
if: runner.os != 'Windows'
run: |
curl -Lo mkn https://github.com/mkn/mkn/releases/download/latest/mkn_osx
chmod +x mkn
PATH=$PWD:$PATH mkn -C lib build -g 0 -dtO 2 -a "-fPIC -std=c++17"
- name: build wheel
run: |
python3 -m build --wheel --no-isolation .
python3 -m twine check dist/*
- name: Save packages as artifacts
uses: actions/upload-artifact@v3
with:
name: wheels
path: dist/*.whl

# build_macos_arm:
# strategy:
# matrix:
# python-version: ['3.11']
# runs-on: self-hosted
# steps:
# - uses: actions/checkout@v3
# - name: add pyenv to path
# run: |
# echo "$HOME/.pyenv/shims" >> $GITHUB_PATH
# - name: install dependencies
# run: |
# brew install pyenv
# pyenv install ${{ matrix.python-version }}
# pyenv local ${{ matrix.python-version }}
# python3 -V
# python3 -m pip install -U pip
# python3 -m pip install -U build twine wheel
# python3 -m pip install -U -r requirements.txt
# - name: build package
# run: |
# pyenv local ${{ matrix.python-version }}
# CC=gcc-13 CXX=g++-13 python3 -m build --wheel --no-isolation .
# - name: Save packages as artifacts
# uses: actions/upload-artifact@v3
# with:
# name: wheels
# path: dist/*.whl

test_wheels:
needs: [build_linux, build_other]
strategy:
matrix:
os: [macos-latest, windows-latest, ubuntu-latest]
python-version: ['3.9', '3.10', '3.11', '3.12']
runs-on: ${{ matrix.os }}
steps:
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
architecture: x64
- uses: actions/download-artifact@v3
with:
name: wheels
path: dist
- name: install wheel (Unix)
if: runner.os != 'Windows'
run: pip install --find-links $GITHUB_WORKSPACE/dist tick
- name: install wheel (Windows)
if: runner.os == 'Windows'
run: pip install --find-links $env:GITHUB_WORKSPACE\dist tick
- uses: actions/checkout@v3
- name: run tests
shell: bash
run: | # hide tick dir to avoid conflicts but still run tests
rm -rf tick/tick_cpp && mv tick _tick
chmod +x sh/pytest.sh && ./sh/pytest.sh
upload_test_pypi:
needs: [test_wheels]
runs-on: ubuntu-latest
# upload to test PyPI on github pushes
# if: github.event_name == 'push' && github.repository_owner == 'Tick'
steps:
- uses: actions/download-artifact@v3
with:
name: wheels
path: dist
- uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.TEST_PYPI_PASSWORD }}
repository-url: https://test.pypi.org/legacy/
skip-existing: false
Loading

0 comments on commit 10a6983

Please sign in to comment.