From d4f403fbeb8d68d5407913639c309910d1708562 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <wjp@usecode.org>
Date: Wed, 27 Oct 2021 09:31:00 +0200
Subject: Prepare for python 3.10

We can't (easily) build for python 3.10 yet until cython is available in conda.
---
 python/conda/astra-toolbox/linux_build_config.yaml     | 18 ------------------
 .../conda/astra-toolbox/linux_deb11_build_config.yaml  | 12 ++++++++++++
 .../conda/astra-toolbox/linux_deb9_build_config.yaml   | 18 ++++++++++++++++++
 python/conda/linux_release/build.sh                    |  2 +-
 python/conda/linux_release/release.sh                  |  2 ++
 5 files changed, 33 insertions(+), 19 deletions(-)
 delete mode 100644 python/conda/astra-toolbox/linux_build_config.yaml
 create mode 100644 python/conda/astra-toolbox/linux_deb11_build_config.yaml
 create mode 100644 python/conda/astra-toolbox/linux_deb9_build_config.yaml

(limited to 'python')

diff --git a/python/conda/astra-toolbox/linux_build_config.yaml b/python/conda/astra-toolbox/linux_build_config.yaml
deleted file mode 100644
index bcde2ce..0000000
--- a/python/conda/astra-toolbox/linux_build_config.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-python:
-  - 2.7
-  - 3.7
-  - 3.8
-  - 3.9
-numpy:
-  - 1.11
-  - 1.11
-  - 1.11
-  - 1.16
-zip_keys:
-  - python
-  - numpy
-
-c_compiler_version:
-  - 7.3
-cxx_compiler_version:
-  - 7.3
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_deb9_build_config.yaml b/python/conda/astra-toolbox/linux_deb9_build_config.yaml
new file mode 100644
index 0000000..bcde2ce
--- /dev/null
+++ b/python/conda/astra-toolbox/linux_deb9_build_config.yaml
@@ -0,0 +1,18 @@
+python:
+  - 2.7
+  - 3.7
+  - 3.8
+  - 3.9
+numpy:
+  - 1.11
+  - 1.11
+  - 1.11
+  - 1.16
+zip_keys:
+  - python
+  - numpy
+
+c_compiler_version:
+  - 7.3
+cxx_compiler_version:
+  - 7.3
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
-- 
cgit v1.2.3