Changeset 26744 for issm/trunk/src/m/dev/devpath.py

Timestamp:

12/22/21 10:39:44 (3 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 26742

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/dev/devpath.py (modified) (4 diffs)

issm/trunk/src/m/dev/devpath.py ¶

@@ -2 +2 @@
 import os
 import sys
-import warnings
 
 #Recover ISSM_DIR and USERNAME
@@ -16 +15 @@
         dirs.remove('.svn')
     for file in files:
-        if file.find(".py") != -1:
-            if file.find(".pyc") == -1:
+        if file.find('.py') != -1:
+            if file.find('.pyc') == -1:
                 if root not in sys.path:
                     sys.path.append(root)
@@ -36 +35 @@
             sys.path.append(jpl_path)
     else:
-        warnings.warn('cluster settings should be in, {}/usr/{}'.format(JPL_SVN, USERNAME))
+        print('Warning: devpath.py: cluster settings should be in {}'.format(jpl_path))
 
 from runme import runme  #first because plotmodel may fail
@@ -47 +46 @@
 #c.InteractiveShellApp.exec_lines.append('print "Warning: disable autoreload in startup.py to improve performance." ')
 
-print("\n  ISSM development path correctly loaded")
-print("Current path is {}\n\n".format(ISSM_DIR))
+# print("\n  ISSM development path correctly loaded")
+# print("Current path is {}\n\n".format(ISSM_DIR))