From 2a70bf71a725153cf4daf63cf5f672a19cdc5748 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Schw=C3=B6rer?= <dave@ipp.mpg.de>
Date: Sat, 6 Mar 2021 13:42:32 +0100
Subject: [PATCH] move artefacts to root folder
---
tools/pylib/_boutcore_build/build-wheels.sh | 8 ++------
tools/pylib/_boutcore_build/setup.cfg.in | 2 +-
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/tools/pylib/_boutcore_build/build-wheels.sh b/tools/pylib/_boutcore_build/build-wheels.sh
index b81864e9d..8ee33d550 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 465b468f7..6a08b31e8 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]
--
GitLab