Changeset 25198

Timestamp:

07/02/20 16:43:44 (5 years ago)

Author:

jdquinn

Message:

CHG: Now installing netcdf4-python via pip

Location:

issm/trunk-jpl

Files:

• jenkins/ross-debian_linux-binaries-solid_earth (modified) (1 diff)
• jenkins/ross-debian_linux-solid_earth (modified) (1 diff)
• src/m/dev/devpath.py (modified) (1 diff)

issm/trunk-jpl/jenkins/ross-debian_linux-binaries-solid_earth

@@ -50 +50 @@
         curl                    install-7.67-static.sh
         netcdf                  install-4.7-parallel-static.sh
-        netcdf-python   install.sh
         proj                    install-6.2-static.sh
         gdal                    install-3.0-python-netcdf-static.sh

issm/trunk-jpl/jenkins/ross-debian_linux-solid_earth

@@ -41 +41 @@
         curl                    install-7.67.sh
         netcdf                  install-4.7-parallel.sh
-        netcdf-python   install.sh
         proj                    install-6.2.sh
         gdal                    install-3.0-python-netcdf.sh

issm/trunk-jpl/src/m/dev/devpath.py

@@ -11 +11 @@
     raise NameError('"ISSM_DIR" environment variable is empty! You should define ISSM_DIR in your .cshrc or .bashrc!')
 
-#Get paths to locally installed Python libraries
-tpls = [
-    'cftime', # Needed for netCDF4
-    'netCDF4'
-]
-for tpl in os.listdir(ISSM_DIR + '/externalpackages'):
-    tpl_path = ISSM_DIR + '/externalpackages/' + tpl
-    for dirpath, dirnames, filenames in os.walk(tpl_path):
-        install_lib_path = dirpath + '/install/lib'
-        for dirpath, dirnames, filenames in os.walk(install_lib_path):
-            for dirname in dirnames:
-                if dirname in tpls:
-                    dir = dirpath + '/' + dirname
-                    for file in os.listdir(dir):
-                        if file.find(".py") != -1:
-                            if file.find(".pyc") == -1:
-                                if dirpath not in sys.path:
-                                    sys.path.append(dirpath)
+# NOTE: Now having user install netcdf4 via pip
+#
+# #Get paths to locally installed Python libraries
+# tpls = [
+#     'cftime', # Needed for netCDF4
+#     'netCDF4'
+# ]
+# for tpl in os.listdir(ISSM_DIR + '/externalpackages'):
+#     tpl_path = ISSM_DIR + '/externalpackages/' + tpl
+#     for dirpath, dirnames, filenames in os.walk(tpl_path):
+#         install_lib_path = dirpath + '/install/lib'
+#         for dirpath, dirnames, filenames in os.walk(install_lib_path):
+#             for dirname in dirnames:
+#                 if dirname in tpls:
+#                     dir = dirpath + '/' + dirname
+#                     for file in os.listdir(dir):
+#                         if file.find(".py") != -1:
+#                             if file.find(".pyc") == -1:
+#                                 if dirpath not in sys.path:
+#                                     sys.path.append(dirpath)
 
 #Go through src/m and append any directory that contains a *.py file to PATH