Changeset 725

Timestamp:

17/08/16 16:24:36 (5 years ago)

Author:

mjuckes

Message:

update

Location:

CMIP6dreq/trunk/dreqPy

Files:

• dreq.py (modified) (2 diffs)
• dreqCmdl.py (modified) (1 diff)
• examples/__init__.py (added)
• examples/ex203.py (modified) (2 diffs)
• packageConfig.py (modified) (1 diff)

CMIP6dreq/trunk/dreqPy/dreq.py

@@ -9 +9 @@
 import re, shelve, os, sys
 try:
-  from __init__ import DOC_DIR, version
+  from __init__ import DOC_DIR, version, PACKAGE_DIR
 except:
-  from dreqPy.__init__ import DOC_DIR, version
+  from dreqPy.__init__ import DOC_DIR, version, PACKAGE_DIR
 
 python2 = True
@@ -530 +530 @@
         assert len( bits ) > 1, 'Failed to parse line in manifest %s: \n%s' % (manifest,l)
         for b in bits[:2]:
+          if not os.path.isfile( b ):
+             b = '%s/%s' % (PACKAGE_DIR,b)
           assert os.path.isfile( b ), 'File %s not found (listed in %s)' % (b,manifest )
         docl.append( tuple( bits[:2] ) )

CMIP6dreq/trunk/dreqPy/dreqCmdl.py

@@ -22 +22 @@
       import simpleCheck
       print( "Starting test suite 2" )
-      import example
+      import examples.ex203
       print( "Tests completed" )
   else:

CMIP6dreq/trunk/dreqPy/examples/ex203.py

@@ -1 +1 @@
 import sys, os
 
-if len(sys.argv) > 1:
+if len(sys.argv) > 1 and __name__ == '__main__':
   if os.path.isdir( sys.argv[1] ):
     if os.path.isfile( '%s/scope.py' % sys.argv[1] ):
@@ -10 +10 @@
       sys.exit(0)
   else:
-    print ( 'Specified directoty does not exist' )
+    print ( 'Specified directory does not exist: %s' % sys.argv[1] )
     sys.exit(0)
 else:

CMIP6dreq/trunk/dreqPy/packageConfig.py

@@ -7 +7 @@
 import os
 
-HERE = os.path.dirname(os.path.abspath(__file__) )
+PACKAGE_DIR = os.path.dirname(os.path.abspath(__file__) )
 
 ##DOC_DEFAULT_DIR
-DOC_DEFAULT_DIR = os.path.join(HERE, 'docs')
+DOC_DEFAULT_DIR = os.path.join(PACKAGE_DIR, 'docs')
 
 DOC_DIR = os.environ.get('DRQ_CONFIG_DIR', DOC_DEFAULT_DIR)