From 5754d6849697131e28b73f2c480b9e30de83fcaa Mon Sep 17 00:00:00 2001
From: gagolews <m.gagolewski@gmail.com>
Date: Thu, 22 Aug 2024 11:32:08 +0200
Subject: [PATCH] more

---
 .github/workflows/cibuildwheel.yml | 17 +++++++++++++----
 requirements.txt                   |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml
index 144510f..0a8724b 100644
--- a/.github/workflows/cibuildwheel.yml
+++ b/.github/workflows/cibuildwheel.yml
@@ -10,8 +10,7 @@ env:
     # TODO: manylinux aarch64
     # TODO: macos arm64
     CIBW_SKIP: cp2* pp* cp35* cp36* cp37* cp38* cp39* *-win32 *-musllinux* *-macosx_*_universal2* *win_arm64* *-manylinux_arm64 *-manylinux_i686 *-manylinux_ppc64le *-manylinux_s390x *-manylinux_aarch64
-    CIBW_BEFORE_BUILD: python -m pip install -r requirements.txt --upgrade
-    CIBW_TEST_SKIP: "*-macosx_arm64"
+    #CIBW_TEST_SKIP: "*-macosx_arm64"
     #CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
     CIBW_ARCHS: all
 
@@ -28,8 +27,18 @@ jobs:
 
       - uses: actions/setup-python@v5
 
-      - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.20.0
+      - name: Setup venv
+        run: |
+            cd ../../
+            python -m venv build_env
+            source build_env/bin/activate
+            python -m pip install numpy scipy cython --upgrade
+            python -m pip install twine build --upgrade
+            python -m pip install cibuildwheel==2.20.0
+            cd genieclust/genieclust
+
+      - name: Install requirements
+        run: python -m pip install -r requirements.txt --upgrade
 
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse
diff --git a/requirements.txt b/requirements.txt
index 781bf2f..a368ed9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
+Cython
 numpy
 scipy
-Cython
 matplotlib
 scikit-learn