Changeset 9677

Timestamp:

Feb 17, 2015, 4:52:27 PM (10 years ago)

Author:

steve

Message:

small cleanup of get_revision code

Location:

trunk/anuga_core

Files:

• .gitignore (modified) (1 diff)
• .travis.yml (modified) (4 diffs)
• LICENCE.txt (modified) (1 diff)
• anuga/file_conversion/setup.py (modified) (1 diff)
• anuga/parallel/tests/test_parallel_boyd_box_operator.py (modified) (1 diff)
• anuga/utilities/system_tools.py (modified) (1 diff)

trunk/anuga_core/.gitignore

@@ -17 +17 @@
 *.tmp
 *.vim
+*.sww
 tags
 

trunk/anuga_core/.travis.yml

@@ -4 +4 @@
 env:
   matrix:
-    - PYTHON_VERSION="2.7"
-    - PYTHON_VERSION="2.6"
+    - PYTHON_VERSION="2.7"  PARALLEL="mpich2"
+    - PYTHON_VERSION="2.7"  PARALLEL="false"
+    - PYTHON_VERSION="2.6"  PARALLEL="false"
 install:
   - sudo apt-get update
   - sudo apt-get install gfortran
+
+  - if [[ "$PARALLEL" == "mpich2" ]]; then
+       sudo apt-get install mpich2;
+       mpirun -np 4 pwd;
+    fi
 
   # Deactivate the travis-provided virtual environment and setup a
@@ -21 +27 @@
   # Useful for debugging any issues with conda
   - conda info -a
-  # More debugging
-  - printenv
 
   # Conda dependencies
@@ -29 +33 @@
 
   - python --version
-  # Get GDAL from the PinguCarsti binstar channel.
-  # On Windows Get GDAL from jjhelmus binstar channel 
-  - conda install -c pingucarsti gdal geos gdal-data
- 
-  - export GDAL_DATA=`gdal-config --datadir`
+
+  # Get GDAL from the PinguCarsti binstar channel for python 2.7 
+  # On osx get GDAL from jjhelmus binstar channel
+  - if [[ "$PYTHON_VERSION" == "2.7" ]]; then
+       conda install -c pingucarsti gdal-data;
+       export GDAL_DATA=`gdal-config --datadir`;
+    fi
+
+  - if [[ "$PYTHON_VERSION" == "2.6" ]]; then conda install gdal; fi
 
   # Install more software to deal with geographical projections
@@ -41 +49 @@
   - if [[ "$PYTHON_VERSION" == "2.6" ]]; then conda install argparse; fi
 
+
+  # Install pypar if parallel
+  - if [[ "$PARALLEL" == "mpich2" ]]; then
+       svn checkout http://pypar.googlecode.com/svn/ pypar;
+       cd pypar/source;
+       python setup.py install;
+       cd ../..;
+    fi
+
+  # More debugging
+  - printenv
+  - conda list
+
   - python setup.py install
 

trunk/anuga_core/LICENCE.txt

@@ -4 +4 @@
 
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010 Australian National University and Geoscience Australia. All rights reserved.
+Copyright 2004 - 2015 Australian National University 
+and Geoscience Australia. All rights reserved.
 
 

trunk/anuga_core/anuga/file_conversion/setup.py

@@ -14 +14 @@
 
     config.add_data_dir('tests')
-    config.add_data_dir(join('tests','data'))
 
     util_dir = os.path.abspath(join(os.path.dirname(__file__),'..','utilities'))

trunk/anuga_core/anuga/parallel/tests/test_parallel_boyd_box_operator.py

@@ -333 +333 @@
         if myid == 0:
             if verbose: print 'PARALLEL START'
+            random.seed(1001)
             for i in range(samples):
                 x = random.randrange(0,1000)/1000.0 * length

trunk/anuga_core/anuga/utilities/system_tools.py

@@ -194 +194 @@
     
 def get_revision_number():
-    """Get the version number of this repository copy.
-
-    Try getting data from stored_version_info.py first, otherwise
-    try using SubWCRev.exe (Windows) or svnversion (linux), otherwise
-    try reading file .svn/entries for version information, otherwise
-    throw an exception.
-
-    NOTE: This requires that the command svn is on the system PATH
-    (simply aliasing svn to the binary will not work)
-    """
-
-    # try to get revision information from stored_version_info.py
-    try:
-        return __get_revision_from_svn_client__()
-    except:
-        try:
-            from anuga.stored_version_info import version_info
-            return process_version_info(version_info)
-        except:
-            from anuga.version import version
-            return version
+    """Get the (svn) revision number of this repository copy.
+    """
+
+    from anuga import __svn_revision__ as revision
+    return revision
+            
 
 def process_version_info(version_info):