Index: /issm/trunk-jpl/jenkins/pine_island-mac
===================================================================
--- /issm/trunk-jpl/jenkins/pine_island-mac	(revision 25669)
+++ /issm/trunk-jpl/jenkins/pine_island-mac	(revision 25670)
@@ -1,7 +1,2 @@
-# NOTE: We do not have a project on Jenkins based on this configuration, but we
-#		should maintain it as a way to efficiently test both MATLAB and Python 
-#		APIs.
-#
-
 #--------------------#
 # ISSM Configuration #
@@ -19,6 +14,4 @@
 	--with-numthreads=4 \
 	--with-matlab-dir=${MATLAB_PATH} \
-	--with-python-dir=/System/Library/Frameworks/Python.framework/Versions/2.7 \
-	--with-python-numpy-dir=/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python/numpy \
 	--with-fortran-lib="-L/usr/local/Cellar/gcc/10.2.0/lib/gcc/10 -lgfortran" \
 	--with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
@@ -28,9 +21,5 @@
 	--with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
 	--with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \
-	--with-hdf5-dir=${ISSM_DIR}/externalpackages/petsc/install \
 	--with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \
-	--with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \
-	--with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
-	--with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
 	--with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
 	--with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
@@ -48,14 +37,4 @@
 	cmake		install.sh
 	petsc		install-3.12-mac.sh
-	gsl			install.sh
-	boost		install-1.7-mac.sh
-	dakota		install-6.2-mac.sh
-	curl		install-7.67.sh
-	netcdf		install-4.7-parallel.sh
-	proj		install-6.2.sh
-	gdal		install-3-python-netcdf.sh
-	gshhg		install.sh
-	gmt			install-6.0-mac.sh
-	gmsh		install-4.sh
 	triangle	install-mac.sh
 	chaco		install.sh
@@ -71,5 +50,5 @@
 # Test suites
 MATLAB_TEST=1
-PYTHON_TEST=1
+PYTHON_TEST=0
 JAVASCRIPT_TEST=0
 EXAMPLES_TEST=0
@@ -87,14 +66,9 @@
 # Nightly run options
 #
-# See documentation in test/NightlyRun/runme.* for more information.
+# See documentation in test/NightlyRun/runme.* for more information
 #
 # NOTE:
-# - Errors are large for tests 234, 235, 418, and 420 under MATLAB
-# - Tests 444 and 445 fail intermittently under MATLAB with "Index exceeds array bounds."
-# - Errors are large for tests 234 418 and 420 under Python
-# - See test417.py for why it is excluded
-# - Test 444 fails intermittently under Python with "IndexError: list index out of range"
 # - test701 is skipped because it uses full Stokes equations
 #
-MATLAB_NROPTIONS="'exclude',[234 235 418 420 435 444 445 701 702 703]"
-PYTHON_NROPTIONS="--exclude 234 417 418 420 435 444 445 701 702 703]"
+MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota'),435,701,702,703]"
+PYTHON_NROPTIONS=""
Index: /issm/trunk-jpl/jenkins/ross-debian_linux
===================================================================
--- /issm/trunk-jpl/jenkins/ross-debian_linux	(revision 25669)
+++ /issm/trunk-jpl/jenkins/ross-debian_linux	(revision 25670)
@@ -1,7 +1,2 @@
-# NOTE: We do not have a project on Jenkins based on this configuration, but we
-#		should maintain it as a way to efficiently test both MATLAB and Python 
-#		APIs.
-#
-
 #--------------------#
 # ISSM Configuration #
@@ -9,5 +4,4 @@
 
 MATLAB_PATH="/usr/local/MATLAB/R2019b"
-
 ISSM_CONFIG='\
 	--prefix=${ISSM_DIR} \
@@ -16,6 +10,4 @@
 	--enable-debugging \
 	--with-numthreads=4 \
-	--with-python-dir=/usr \
-	--with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
 	--with-matlab-dir=${MATLAB_PATH} \
 	--with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
@@ -26,9 +18,5 @@
 	--with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
 	--with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \
-	--with-hdf5-dir=${ISSM_DIR}/externalpackages/petsc/install \
 	--with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \
-	--with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \
-	--with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
-	--with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
 	--with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
 	--with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
@@ -45,14 +33,4 @@
 	cmake		install.sh
 	petsc		install-3.12-linux.sh
-	gsl			install.sh
-	boost		install-1.7-linux.sh
-	dakota		install-6.2-linux.sh
-	curl		install-7.67.sh
-	netcdf		install-4.7-parallel.sh
-	proj		install-6.2.sh
-	gdal		install-3-python-netcdf.sh
-	gshhg		install.sh
-	gmt			install-6.0-linux.sh
-	gmsh		install-4.sh
 	triangle	install-linux.sh
 	chaco		install.sh
@@ -68,5 +46,5 @@
 # Test suites
 MATLAB_TEST=1
-PYTHON_TEST=1
+PYTHON_TEST=0
 JAVASCRIPT_TEST=0
 EXAMPLES_TEST=0
@@ -86,9 +64,4 @@
 # See documentation in test/NightlyRun/runme.* for more information.
 #
-# - Errors are large for tests 234, 418, and 420 under Python
-# - Tests 2002, 2003, 2010, 2101, and 2021 are excluded as Gmsh produces 
-#	different-sized meshes on macOS and Linux for 3d objects (archives are 
-#	generated on macOS).
-#
-MATLAB_NROPTIONS="'exclude',[2002 2003 2010 2021 2101]"
-PYTHON_NROPTIONS="--exclude 234 418 420 2002 2003 2010 2021 2101"
+MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota')]"
+PYTHON_NROPTIONS=""
Index: /issm/trunk-jpl/test/NightlyRun/runme.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/runme.m	(revision 25669)
+++ /issm/trunk-jpl/test/NightlyRun/runme.m	(revision 25670)
@@ -107,5 +107,5 @@
 %Process Ids according to benchmarks{{{
 if strcmpi(benchmark,'nightly'),
-	test_ids=intersect(test_ids,union([1:999],[2001:2500]));
+	test_ids=intersect(test_ids,[1:999]);
 elseif strcmpi(benchmark,'validation'),
 	test_ids=intersect(test_ids,[1001:1999]);
Index: /issm/trunk-jpl/test/NightlyRun/runme.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/runme.py	(revision 25669)
+++ /issm/trunk-jpl/test/NightlyRun/runme.py	(revision 25670)
@@ -114,5 +114,5 @@
     #Process Ids according to benchmarks {{{
     if benchmark == 'nightly':
-        test_ids = test_ids.intersection(set(range(1, 1000)).union(set(range(2001, 2500))))
+        test_ids = test_ids.intersection(set(range(1, 1000)))
     elif benchmark == 'validation':
         test_ids = test_ids.intersection(set(range(1001, 2000)))
