From 54293c44f1986bf484f393fbe2283d5e54100eef Mon Sep 17 00:00:00 2001
From: philipp <Philipp Kraft>
Date: Mon, 12 Dec 2022 17:28:14 +0100
Subject: [PATCH] Updated docker manylinux build

---
 setup.py              |  2 +-
 tools/docker-build.sh | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/setup.py b/setup.py
index 8aa9cf8b..92df30f6 100755
--- a/setup.py
+++ b/setup.py
@@ -133,7 +133,7 @@ def build(self):
                   build_script='install_solvers'),
     StaticLibrary('cmf/cmf_core_src', 'lib/lib',
                   'cmf_core',
-                  build_script='install_cmf_core', build_always=True),
+                  build_script='install_cmf_core', build_always=False),
 ]
 
 
diff --git a/tools/docker-build.sh b/tools/docker-build.sh
index 8df48ede..103c0e28 100644
--- a/tools/docker-build.sh
+++ b/tools/docker-build.sh
@@ -8,14 +8,14 @@ function repair_wheel {
     if ! auditwheel show "$wheel"; then
         echo "Skipping non-platform wheel $wheel"
     else
-        auditwheel repair "$wheel" --plat "$PLAT" -w /io/wheelhouse/
+        auditwheel repair "$wheel" -w /io/wheelhouse/
     fi
 }
 
 
 export CFLAGS="-fPIC"
 export CXXFLAGS="-fPIC"
-CMFDIR=/io/cmf
+CMFDIR=/io/cmf2
 TOOLDIR=$CMFDIR/tools
 
 # Install solvers
@@ -33,9 +33,9 @@ make -C $CMFBUILDDIR
 make install -C $CMFBUILDDIR
 
 # Compile wheels
-for PYBIN in /opt/python/*/bin; do
+for PYBIN in /opt/python/cp31*/bin; do
     "${PYBIN}/pip" install -r $CMFDIR/requirements.txt
-    "${PYBIN}/python" bdist_wheel
+    "${PYBIN}/pip" wheel $CMFDIR/ --no-deps -w dist/
 done
 
 # Bundle external shared libraries into the wheels
@@ -44,7 +44,7 @@ for whl in dist/*.whl; do
 done
 
 # Install packages and test
-for PYBIN in /opt/python/*/bin/; do
-    "${PYBIN}/pip" install python-manylinux-demo --no-index -f /io/wheelhouse
-    (cd "$HOME"; "${PYBIN}/nosetests" pymanylinuxdemo)
-done
\ No newline at end of file
+# for PYBIN in /opt/python/*/bin/; do
+#    "${PYBIN}/pip" install python-manylinux-demo --no-index -f /io/wheelhouse
+#    (cd "$HOME"; "${PYBIN}/nosetests" pymanylinuxdemo)
+#done