Merge pull request #383 from rtburns-jpl/python-ci

circleci: Match arbitrary python3 version
LT1AB
Ryan Burns 2021-11-08 21:06:42 -08:00 committed by GitHub
commit 3139a545b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions

View File

@ -101,7 +101,8 @@ jobs:
echo "PRJ_SCONS_BUILD = /root/project/build" > SConfigISCE echo "PRJ_SCONS_BUILD = /root/project/build" > SConfigISCE
echo "PRJ_SCONS_INSTALL = /root/project/install/isce" >> SConfigISCE echo "PRJ_SCONS_INSTALL = /root/project/install/isce" >> SConfigISCE
echo "LIBPATH = /usr/lib64 /usr/lib /opt/conda/lib" >> 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 "FORTRANPATH = /usr/include /opt/conda/include" >> SConfigISCE
echo "FORTRAN = /bin/gfortran" >> SConfigISCE echo "FORTRAN = /bin/gfortran" >> SConfigISCE
echo "CC = /bin/gcc" >> SConfigISCE echo "CC = /bin/gcc" >> SConfigISCE

View File

@ -10,7 +10,10 @@ LIBPATH = /usr/lib64 /usr/lib /opt/conda/lib
# The location of Python.h. If you have multiple installations of python # The location of Python.h. If you have multiple installations of python
# make sure that it points to the right one # 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 # The location of the fftw3.h (most likely something like /usr/include or
# /usr/local/include /opt/local/include # /usr/local/include /opt/local/include