Merge branch 'main' into autorift

.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

applications/rtcApp.py

@@ -424,8 +424,7 @@ class GRDSAR(Application):
         self.step('normalize', func=self.runNormalize)
 
         # Geocode
-        self.step('geocode', func=self.runGeocode,
-                args=(self.geocode_list, self.geocode_bbox))
+        self.step('geocode', func=self.runGeocode)
 
         return None
 

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