summaryrefslogtreecommitdiffstats
path: root/python/conda/linux_release
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <wjp@usecode.org>2021-10-27 09:31:00 +0200
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2021-10-27 10:04:48 +0200
commitd4f403fbeb8d68d5407913639c309910d1708562 (patch)
tree8474a6a5e510b2e6919cc20c3f02dd5b299fae82 /python/conda/linux_release
parent2abeca9134f95fe656e117332f892203da4aa7fa (diff)
downloadastra-d4f403fbeb8d68d5407913639c309910d1708562.tar.gz
astra-d4f403fbeb8d68d5407913639c309910d1708562.tar.bz2
astra-d4f403fbeb8d68d5407913639c309910d1708562.tar.xz
astra-d4f403fbeb8d68d5407913639c309910d1708562.zip
Prepare for python 3.10
We can't (easily) build for python 3.10 yet until cython is available in conda.
Diffstat (limited to 'python/conda/linux_release')
-rwxr-xr-xpython/conda/linux_release/build.sh2
-rw-r--r--python/conda/linux_release/release.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/python/conda/linux_release/build.sh b/python/conda/linux_release/build.sh
index e4664da..0187c5c 100755
--- a/python/conda/linux_release/build.sh
+++ b/python/conda/linux_release/build.sh
@@ -20,6 +20,6 @@ CONF=linux_$3_build_config.yaml
conda-build -c nvidia -m astra-toolbox/python/conda/libastra/${CONF} astra-toolbox/python/conda/libastra
-[ x$4 = xfull ] && conda-build -c nvidia -m astra-toolbox/python/conda/astra-toolbox/linux_build_config.yaml astra-toolbox/python/conda/astra-toolbox
+[ x$4 = xfull ] && conda-build -c nvidia -m astra-toolbox/python/conda/astra-toolbox/${CONF} astra-toolbox/python/conda/astra-toolbox
cp /root/miniconda3/conda-bld/linux-64/*astra* /out
diff --git a/python/conda/linux_release/release.sh b/python/conda/linux_release/release.sh
index a936fbe..f324911 100644
--- a/python/conda/linux_release/release.sh
+++ b/python/conda/linux_release/release.sh
@@ -45,6 +45,8 @@ V=1.9.9.dev7
docker run -v $D:/out:z astra-build-env-deb8 /bin/bash /out/build.sh $V 0 deb8
docker run -v $D:/out:z astra-build-env-deb9 /bin/bash /out/build.sh $V 0 deb9 full
+#Disable this until cython is available for python 3.10 in conda
+#docker run -v $D:/out:z astra-build-env-deb11 /bin/bash /out/build.sh $V 0 deb11 full
docker run -v $D:/out:z astra-build-env-deb11 /bin/bash /out/build.sh $V 0 deb11
rm -f $D/build.sh