Skip to content

Commit

Permalink
Updated docker manylinux build
Browse files Browse the repository at this point in the history
  • Loading branch information
philipp authored and philipp committed Dec 12, 2022
1 parent 5c7380d commit 54293c4
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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),
]


Expand Down
16 changes: 8 additions & 8 deletions tools/docker-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
# for PYBIN in /opt/python/*/bin/; do
# "${PYBIN}/pip" install python-manylinux-demo --no-index -f /io/wheelhouse
# (cd "$HOME"; "${PYBIN}/nosetests" pymanylinuxdemo)
#done

0 comments on commit 54293c4

Please sign in to comment.