diff options
| author | Willem Jan Palenstijn <wjp@usecode.org> | 2021-10-27 09:31:00 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2021-10-27 10:04:48 +0200 |
| commit | d4f403fbeb8d68d5407913639c309910d1708562 (patch) | |
| tree | 8474a6a5e510b2e6919cc20c3f02dd5b299fae82 /python | |
| parent | 2abeca9134f95fe656e117332f892203da4aa7fa (diff) | |
| download | astra-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')
| -rw-r--r-- | python/conda/astra-toolbox/linux_deb11_build_config.yaml | 12 | ||||
| -rw-r--r-- | python/conda/astra-toolbox/linux_deb9_build_config.yaml (renamed from python/conda/astra-toolbox/linux_build_config.yaml) | 0 | ||||
| -rwxr-xr-x | python/conda/linux_release/build.sh | 2 | ||||
| -rw-r--r-- | python/conda/linux_release/release.sh | 2 |
4 files changed, 15 insertions, 1 deletions
diff --git a/python/conda/astra-toolbox/linux_deb11_build_config.yaml b/python/conda/astra-toolbox/linux_deb11_build_config.yaml new file mode 100644 index 0000000..ba3c945 --- /dev/null +++ b/python/conda/astra-toolbox/linux_deb11_build_config.yaml @@ -0,0 +1,12 @@ +python: + - 3.10 +numpy: + - 1.16 +zip_keys: + - python + - numpy + +c_compiler_version: + - 9.3 +cxx_compiler_version: + - 9.3 diff --git a/python/conda/astra-toolbox/linux_build_config.yaml b/python/conda/astra-toolbox/linux_deb9_build_config.yaml index bcde2ce..bcde2ce 100644 --- a/python/conda/astra-toolbox/linux_build_config.yaml +++ b/python/conda/astra-toolbox/linux_deb9_build_config.yaml 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 |