Changeset 9617

Timestamp:

Feb 6, 2015, 12:03:23 AM (10 years ago)

Author:

steve

Message:

Got the stage where anuga (without pypar) builds successfully on travis ci

Location:

trunk/anuga_core

Files:

• .travis.yml (modified) (3 diffs)
• anuga/abstract_2d_finite_volumes/generic_domain.py (modified) (1 diff)
• anuga/abstract_2d_finite_volumes/tests/test_generic_domain.py (modified) (1 diff)
• anuga/alpha_shape/setup.py (modified) (1 diff)
• anuga/structures/setup.py (modified) (1 diff)
• anuga/tsunami_source/tests/test_okada_tsunami.py (modified) (1 diff)
• anuga/utilities/tests/test_spatialInputUtil.py (modified) (4 diffs)

trunk/anuga_core/.travis.yml

@@ -13 +13 @@
   # conda-based environment instead
   - deactivate
-  - wget http://repo.continuum.io/miniconda/Miniconda-3.8.3-Linux-x86_64.sh \
-       -O miniconda.sh
+  - wget http://repo.continuum.io/miniconda/Miniconda-3.8.3-Linux-x86_64.sh -O miniconda.sh
   - chmod +x miniconda.sh && ./miniconda.sh -b
   - export PATH=/home/travis/miniconda/bin:$PATH
@@ -26 +25 @@
 
   # Conda dependencies
-  - conda create -n testenv --yes python=$PYTHON_VERSION \
-        numpy scipy netcdf4 nose matplotlib
+  - conda create -n testenv --yes python=$PYTHON_VERSION pip numpy scipy netcdf4 nose matplotlib
   - source activate testenv
 
@@ -35 +33 @@
   - export GDAL_DATA=`gdal-config --datadir`
 
+  # Install more software to deal with geographical projections
+  - pip install pyproj
+
   # python 2.6 doesn't have argparse by default
   - if [[ "$PYTHON_VERSION" == "2.6" ]]; then conda install argparse; fi
-
 
   - python setup.py install

trunk/anuga_core/anuga/abstract_2d_finite_volumes/generic_domain.py

@@ -538 +538 @@
             self.CFL = cfl
             msg = 'Setting CFL > 2.0'
-            #warnings.warn(msg)
-            log.warning(msg)
+            import warnings
+            warnings.warn(msg)
+            #log.warning(msg)
 
         assert cfl > 0.0

trunk/anuga_core/anuga/abstract_2d_finite_volumes/tests/test_generic_domain.py

@@ -86 +86 @@
 
 
-        domain.set_CFL(3.0)
-
-        import sys
-        # Drop this test if python version < 2.7
-        if sys.version_info[0] > 1 and sys.version_info[1]>6:
-            try:
-                domain.set_CFL(3.0)
-            except:
-                pass
-            else:
-                msg = 'Should have warned of cfl>2.0'
-                raise Exception, msg
+        #
+
+        # Make CFL > 2 warning an error
+        import warnings
+        warnings.simplefilter("error")
+
+        try:
+            domain.set_CFL(3.0)
+        except:
+            pass
+        else:
+            msg = 'Should have warned of cfl>2.0'
+            raise Exception, msg
 
         assert domain.CFL == 3.0

trunk/anuga_core/anuga/alpha_shape/setup.py

@@ -13 +13 @@
     config = Configuration('alpha_shape', parent_package, top_path)
 
-    config.add_data_dir('test')
+    config.add_data_dir('tests')
 
     return config

trunk/anuga_core/anuga/structures/setup.py

@@ -14 +14 @@
 
     config.add_data_dir('tests')
-    config.add_data_dir(join('test','data'))
+    config.add_data_dir(join('tests','data'))
 
 

trunk/anuga_core/anuga/tsunami_source/tests/test_okada_tsunami.py

@@ -379 +379 @@
         ## independent of this one (i.e. they don't call okada's fortran)
         path=get_pathname_from_package('anuga.tsunami_source')
-        octave=numpy.genfromtxt(path+sep+'okada_tsunami_octave_95.txt')
+        octave=numpy.genfromtxt(path+sep+'tests'+sep+'okada_tsunami_octave_95.txt')
         octave_asvec=numpy.transpose(octave).reshape((1,101*101))
 

trunk/anuga_core/anuga/utilities/tests/test_spatialInputUtil.py

@@ -12 +12 @@
 import numpy
 import os
+import sys
 from anuga.shallow_water.shallow_water_domain import Domain
 from anuga.utilities import plot_utils as util
@@ -158 +159 @@
         # Test conversion to-from Wkb
 
+        # Only run test if python >= 2.7
+        if sys.hexversion < 0x02070000: return
+
         seg=[ [0., -2., 1.], [100., -100., 2.], [10., 8., 3.], [0., -2., 1.]] 
         seg_Wkb=su.ListPts2Wkb(seg,geometry_type='line')    
@@ -228 +232 @@
         #
         # Make an intersection, check it works
+
+        # Only run if python >= 2.7
+        if sys.hexversion < 0x02070000: return
+        
+        
         seg1=[ [-10., 0.], [10., 0.]]
         seg2=[ [0., -10.], [0., 10.]]
@@ -362 +371 @@
     def test_add_intersections_to_domain_features(self):
 
+        # Only run test if python >= 2.7
+        if sys.hexversion < 0x02070000: return
+
         bounding_polygon=[ [0., 0.], [0., 10.], [10., 10.], [10., 0.]]