From 1ce15ee2b95e45089f5b5b978ddda0e2389b2dec Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Mon, 8 Nov 2021 20:00:55 -0800 Subject: [PATCH 1/2] circleci: Match arbitrary python3 version Trying to prevent the CI from barfing when the python version changes --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f825b21..2622f2b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -101,7 +101,8 @@ jobs: echo "PRJ_SCONS_BUILD = /root/project/build" > SConfigISCE echo "PRJ_SCONS_INSTALL = /root/project/install/isce" >> SConfigISCE echo "LIBPATH = /usr/lib64 /usr/lib /opt/conda/lib" >> SConfigISCE - echo "CPPPATH = /opt/conda/include/python3.8 /opt/conda/lib/python3.8/site-packages/numpy/core/include /opt/conda/include /usr/include" >> SConfigISCE + python_inc="$(echo /opt/conda/include/python3.* /opt/conda/lib/python3.*/site-packages/numpy/core/include)" + echo "CPPPATH = $python_inc /opt/conda/include /usr/include" >> SConfigISCE echo "FORTRANPATH = /usr/include /opt/conda/include" >> SConfigISCE echo "FORTRAN = /bin/gfortran" >> SConfigISCE echo "CC = /bin/gcc" >> SConfigISCE From 289a93b5ac9c26c75adaf4dfe54a48072c17f2d9 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Mon, 8 Nov 2021 20:17:01 -0800 Subject: [PATCH 2/2] docker: Match multiple python3 versions --- docker/SConfigISCE | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/SConfigISCE b/docker/SConfigISCE index 146b42e..4782a52 100644 --- a/docker/SConfigISCE +++ b/docker/SConfigISCE @@ -10,7 +10,10 @@ LIBPATH = /usr/lib64 /usr/lib /opt/conda/lib # The location of Python.h. If you have multiple installations of python # make sure that it points to the right one -CPPPATH = /opt/conda/include/python3.8 /opt/conda/lib/python3.8/site-packages/numpy/core/include /opt/conda/include /usr/include +# +# Hack: we don't know a priori which version of python we'll have installed, +# so we're taking a bit of a shotgun approach here. +CPPPATH = /opt/conda/include/python3.8 /opt/conda/lib/python3.8/site-packages/numpy/core/include /opt/conda/include/python3.9 /opt/conda/lib/python3.9/site-packages/numpy/core/include /opt/conda/include /usr/include # The location of the fftw3.h (most likely something like /usr/include or # /usr/local/include /opt/local/include