diff --git a/tools/pylib/_boutcore_build/build-wheels.sh b/tools/pylib/_boutcore_build/build-wheels.sh index b81864e9d93b738165ce7f703eb5a96c5fce0d76..8ee33d550f64af072b86b2783c43f1d6423a223f 100644 --- a/tools/pylib/_boutcore_build/build-wheels.sh +++ b/tools/pylib/_boutcore_build/build-wheels.sh @@ -37,8 +37,6 @@ for whl in wheelhouse/*.whl; do LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/../../../lib/ repair_wheel "$whl" done -ls -l /io/wheelhouse - for PYBIN in /opt/python/cp3*/bin/; do "${PYBIN}/pip" install $NAME --no-index -f /io/wheelhouse if test -e "${PYBIN}/nosetests" @@ -50,10 +48,8 @@ for PYBIN in /opt/python/cp3*/bin/; do fi done -ls -l wheelhouse || : mkdir -p wheelhouse rm -f wheelhouse/*whl -ls -l wheelhouse cp /io/wheelhouse/*whl wheelhouse/ -ls -l wheelhouse -ls -l +mv wheelhouse ../../.. +mv dist ../../.. diff --git a/tools/pylib/_boutcore_build/setup.cfg.in b/tools/pylib/_boutcore_build/setup.cfg.in index 465b468f7e3048958efada367d304adff3e65ee0..6a08b31e81fe9af49b2ac36d95bc563e69de84c1 100644 --- a/tools/pylib/_boutcore_build/setup.cfg.in +++ b/tools/pylib/_boutcore_build/setup.cfg.in @@ -1,6 +1,6 @@ version=$(git tag -l --points-at HEAD) if ! test $version ; then - version=$(PYTHONPATH=.. $PY -c "import boutconfig ; print(boutconfig.config['version'])").dev$(git log --oneline |wc -l) + version=$(PYTHONPATH=.. $PY -c "import boutconfig ; print(boutconfig.config['version'])").dev$(git log --oneline 4fd9dfb999f056996a23c72cc0357cca55cdf2cb..HEAD |wc -l) fi cat <<EOF [metadata]