initial work on new wheel release mechanism

X-DataInitiative · Oct 27, 2023 · 2ba9f35 · 2ba9f35
1 parent 04dbb37
commit 2ba9f35
Show file tree

Hide file tree

Showing 118 changed files with 1,429 additions and 2,154 deletions.
diff --git a/.github/workflows/build_nix.yml b/.github/workflows/build_nix.yml
@@ -8,9 +8,9 @@ on:
     branches: [ master ]
 
 env:
-  TICK_DEBUG: 0
-  TICK_WERROR: 0
+  MKN_COMPILE_THREADS: 2
   MKN_GCC_PREFERRED: 1
+  PYTHON_EMBED_LIB: 1
 
 jobs:
   build:
@@ -21,10 +21,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' - not ready yet
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: true
 
@@ -43,22 +43,22 @@ jobs:
         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
+        PATH=$PWD:$PATH KLOG=3 mkn -C lib clean build -g 0 -tOa "-fPIC -std=c++17"
 
     - name: cpptest
       run: |
-        PATH=$PWD:$PATH KLOG=3 ./sh/gtest.sh
+        PATH=$PWD:$PATH KLOG=3 mkn -C lib -p gtest build run test -dOta "-fPIC -std=c++17"
 
     - name: pytest
       run: |
-        python3 setup.py pytest
+        python3 -m unittest discover -v . "*_test.py"
diff --git a/.github/workflows/build_osx.yml.off → .github/workflows/build_osx.yml b/.github/workflows/build_osx.yml.off → .github/workflows/build_osx.yml
@@ -8,8 +8,8 @@ on:
     branches: [ master ]
 
 env:
-  TICK_DEBUG: 0
-  TICK_WERROR: 0
+  MKN_COMPILE_THREADS: 2
+
 
 
 jobs:
@@ -21,10 +21,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
 
@@ -48,16 +48,18 @@ jobs:
         python3 -m pip install wheel pip --upgrade
         python3 -m pip install -r requirements.txt
 
+
     - name: build
       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
+        PATH=$PWD:$PATH KLOG=3 mkn -C lib clean build -g 0 -tOa "-fPIC -std=c++17"
 
     - name: cpptest
       run: |
-        PATH=$PWD:$PATH KLOG=3 ./sh/gtest.sh
+        PATH=$PWD:$PATH KLOG=3 mkn -C lib -p gtest build run test -dOta "-fPIC -std=c++17"
 
     - name: pytest
       run: |
         python -m unittest discover -v . "*_test.py"
+# echo "Tests not run until test failures assessed./"
diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml
@@ -8,11 +8,10 @@ on:
     branches: [ master ]
 
 env:
-  TICK_DEBUG: 0
-  TICK_WERROR: 0
   MKN_CL_PREFERRED: 1
   MKN_COMPILE_THREADS: 2
 
+
 jobs:
   build:
     name: Python ${{ matrix.python-version }}
@@ -22,7 +21,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
@@ -49,15 +48,16 @@ jobs:
         python3 -m pip install wheel pip --upgrade
         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'
+        bash -c 'PATH=$PWD:$PATH KLOG=3 mkn -C lib clean build -g 0 -tOa "-EHsc -std:c++17"'
 
     - name: cpptest
       run: |
-        bash -c 'PATH=$PWD:$PATH KLOG=3 ./sh/gtest.sh'
+        bash -c 'PATH=$PWD:$PATH KLOG=3 mkn -C lib -p gtest build run test -dOta "-EHsc -std:c++17"'
 
     - name: pytest
       run: |

diff --git a/.github/workflows/merge_master.yaml b/.github/workflows/merge_master.yaml
@@ -0,0 +1,108 @@
+name: Master merge
+
+# on:
+#   push:
+#     branches: [ master ]
+#   workflow_dispatch:
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+env:
+  MKN_GCC_PREFERRED: 1
+  MKN_COMPILE_THREADS: 2
+
+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 KLOG=3 mkn -C lib clean build -g 0 -tOa "-fPIC -std=c++17"
+          python3 -m build
+          python3 -m twine check dist/*
+          rename 'linux_x86_64' 'manylinux_2_28_x86_64' dist/*.whl
+
+      - 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
+
+
+  test_wheels:
+    needs: [build_linux]
+    strategy:
+      matrix:
+        os: [ubuntu-latest] # ,macos-11, windows-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
+        run: |
+            python3 -V
+            pip install -r requirements.txt
+            cd tick && python3 -m unittest discover -v . "*_test.py"
+
+  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
diff --git a/.github/workflows/pythonpublish-linux.yml b/.github/workflows/pythonpublish-linux.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     container: jeandet/manylinuxcpp2017
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: true
 

diff --git a/.github/workflows/pythonpublish-osx.yml b/.github/workflows/pythonpublish-osx.yml
@@ -14,14 +14,14 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
     name: Python ${{ matrix.python-version }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: true
 
-    - uses: actions/setup-python@v1
+    - uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
         architecture: x64

diff --git a/.github/workflows/pythonpublish-win.yml b/.github/workflows/pythonpublish-win.yml
@@ -17,11 +17,11 @@ jobs:
         python-version: ['3.7', '3.8', '3.9', '3.10']
     name: Python ${{ matrix.python-version }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: true
 
-    - uses: actions/setup-python@v1
+    - uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
         architecture: x64

diff --git a/.gitignore b/.gitignore
@@ -58,3 +58,5 @@ tools/benchmark/data
 env*/
 venv*/
 tickf.yml
+dist
+tick.egg-info/
diff --git a/.travis.yml.off b/.travis.yml.off
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,8 +1,3 @@
-# Setuptools is not aware of source headers, or non-module SWIG files, so we
-# grab them here
-global-include *.h
-global-include *.i
-global-include *.inl
+recursive-include tick *
+recursive-exclude lib *
 
-# Getting the Cereal header-only library
-recursive-include lib/third_party/cereal/include *.h *.hpp