Changeset 9615

Timestamp:

Feb 5, 2015, 4:18:25 PM (10 years ago)

Author:

steve

Message:

cleaned up some polt tests to avoid needed DISPLAY variable

Location:

trunk/anuga_core

Files:

• .travis.yml (modified) (2 diffs)
• anuga/abstract_2d_finite_volumes/generic_domain.py (modified) (2 diffs)
• anuga/abstract_2d_finite_volumes/tests/test_util.py (modified) (1 diff)
• anuga/abstract_2d_finite_volumes/util.py (modified) (2 diffs)
• anuga/geometry/polygon.py (modified) (2 diffs)

trunk/anuga_core/.travis.yml

@@ -1 +1 @@
 language: python
+virtualenv:
+  system_site_packages: true
 env:
-matrix:
-- PYTHON_VERSION="2.7"
-- PYTHON_VERSION="2.6"
+  matrix:
+    - PYTHON_VERSION="2.7"
+    - PYTHON_VERSION="2.6"
 install:
   - sudo apt-get update
@@ -19 +21 @@
   # Useful for debugging any issues with conda
   - conda info -a
+  # More debugging
+  - printenv
 
   # Conda dependencies
-  - conda create -q -n test-environment python="$PYTHON_VERSION" scipy gdal netcdf4 nose matplotlib
+  - conda create -n test-environment --yes python=$PYTHON_VERSION numpy scipy gdal geos netcdf4 nose matplotlib
   - source activate test-environment
+  - conda install -c https://conda.binstar.org/pingucarsti gdal-data
   # python 2.6 doesn't have argparse by default
-  - if [[ "$PYTHON_VERSION" == "2.6" ]]; then
-      conda install argparse
-    fi
+  - 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

@@ -539 +539 @@
             msg = 'Setting CFL > 2.0'
             #warnings.warn(msg)
-            log.warn()
+            log.warning(msg)
 
         assert cfl > 0.0
@@ -1449 +1449 @@
             triang = num.array(range(0,3*n))
             triang.shape = (n, 3)
-            plt.triplot(gx, g, triang, 'b--')
+            plt.triplot(gx, gy, triang, 'b--')
 
         # Save triangulation to location pointed by filename

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

@@ -1479 +1479 @@
     def test_make_plots_from_csv_files(self):
         
-        #if sys.platform == 'win32':  #Windows
-            try: 
-                import pylab
-            except ImportError:
-                #ANUGA don't need pylab to work so the system doesn't 
-                #rely on pylab being installed 
-                return
-            
-        
-            current_dir=getcwd()+sep+'abstract_2d_finite_volumes'
-            temp_dir = tempfile.mkdtemp('','figures')
-    #        print 'temp_dir',temp_dir
-            fileName = temp_dir+sep+'time_series_3.csv'
-            file = open(fileName,"w")
-            file.write("time,stage,speed,momentum,elevation\n\
+#         #if sys.platform == 'win32':  #Windows
+#         try: 
+#             import pylab
+#         except ImportError:
+#             #ANUGA don't need pylab to work so the system doesn't 
+#             #rely on pylab being installed 
+#             return
+        
+        try:
+            import matplotlib
+            matplotlib.use('Agg')
+            import matplotlib.pyplot as plt
+        except:
+            #print "Couldn't import module from matplotlib, probably you need to update matplotlib"
+            return
+        
+    
+        current_dir=getcwd()+sep+'abstract_2d_finite_volumes'
+        temp_dir = tempfile.mkdtemp('','tmp_figures')
+#        print 'temp_dir',temp_dir
+        fileName = temp_dir+sep+'time_series_3.csv'
+        fid = open(fileName,"w")
+        fid.write("time,stage,speed,momentum,elevation\n\
 1.0, 0, 0, 0, 10 \n\
 2.0, 5, 2, 4, 10 \n\
 3.0, 3, 3, 5, 10 \n")
-            file.close()
-    
-            fileName1 = temp_dir+sep+'time_series_4.csv'
-            file1 = open(fileName1,"w")
-            file1.write("time,stage,speed,momentum,elevation\n\
+        fid.close()
+
+        fileName1 = temp_dir+sep+'time_series_4.csv'
+        fid1 = open(fileName1,"w")
+        fid1.write("time,stage,speed,momentum,elevation\n\
 1.0, 0, 0, 0, 5 \n\
 2.0, -5, -2, -4, 5 \n\
 3.0, -4, -3, -5, 5 \n")
-            file1.close()
-    
-            fileName2 = temp_dir+sep+'time_series_5.csv'
-            file2 = open(fileName2,"w")
-            file2.write("time,stage,speed,momentum,elevation\n\
+        fid1.close()
+
+        fileName2 = temp_dir+sep+'time_series_5.csv'
+        fid2 = open(fileName2,"w")
+        fid2.write("time,stage,speed,momentum,elevation\n\
 1.0, 0, 0, 0, 7 \n\
 2.0, 4, -0.45, 57, 7 \n\
 3.0, 6, -0.5, 56, 7 \n")
-            file2.close()
-            
-            dir, name=os.path.split(fileName)
-            csv2timeseries_graphs(directories_dic={dir:['gauge', 0, 0]},
-                                  output_dir=temp_dir,
-                                  base_name='time_series_',
-                                  plot_numbers=['3-5'],
-                                  quantities=['speed','stage','momentum'],
-                                  assess_all_csv_files=True,
-                                  extra_plot_name='test')
-            
-            #print dir+sep+name[:-4]+'_stage_test.png'
-            assert(access(dir+sep+name[:-4]+'_stage_test.png',F_OK)==True)
-            assert(access(dir+sep+name[:-4]+'_speed_test.png',F_OK)==True)
-            assert(access(dir+sep+name[:-4]+'_momentum_test.png',F_OK)==True)
-    
-            dir1, name1=os.path.split(fileName1)
-            assert(access(dir+sep+name1[:-4]+'_stage_test.png',F_OK)==True)
-            assert(access(dir+sep+name1[:-4]+'_speed_test.png',F_OK)==True)
-            assert(access(dir+sep+name1[:-4]+'_momentum_test.png',F_OK)==True)
-    
-    
-            dir2, name2=os.path.split(fileName2)
-            assert(access(dir+sep+name2[:-4]+'_stage_test.png',F_OK)==True)
-            assert(access(dir+sep+name2[:-4]+'_speed_test.png',F_OK)==True)
-            assert(access(dir+sep+name2[:-4]+'_momentum_test.png',F_OK)==True)
-    
-            del_dir(temp_dir)
+        fid2.close()
+        
+        dir, name=os.path.split(fileName)
+        csv2timeseries_graphs(directories_dic={dir:['gauge', 0, 0]},
+                              output_dir=temp_dir,
+                              base_name='time_series_',
+                              plot_numbers=['3-5'],
+                              quantities=['speed','stage','momentum'],
+                              assess_all_csv_files=True,
+                              extra_plot_name='test')
+        
+        #print dir+sep+name[:-4]+'_stage_test.png'
+        assert(access(dir+sep+name[:-4]+'_stage_test.png',F_OK)==True)
+        assert(access(dir+sep+name[:-4]+'_speed_test.png',F_OK)==True)
+        assert(access(dir+sep+name[:-4]+'_momentum_test.png',F_OK)==True)
+
+        dir1, name1=os.path.split(fileName1)
+        assert(access(dir+sep+name1[:-4]+'_stage_test.png',F_OK)==True)
+        assert(access(dir+sep+name1[:-4]+'_speed_test.png',F_OK)==True)
+        assert(access(dir+sep+name1[:-4]+'_momentum_test.png',F_OK)==True)
+
+
+        dir2, name2=os.path.split(fileName2)
+        assert(access(dir+sep+name2[:-4]+'_stage_test.png',F_OK)==True)
+        assert(access(dir+sep+name2[:-4]+'_speed_test.png',F_OK)==True)
+        assert(access(dir+sep+name2[:-4]+'_momentum_test.png',F_OK)==True)
+
+        del_dir(temp_dir)
         
 

trunk/anuga_core/anuga/abstract_2d_finite_volumes/util.py

@@ -441 +441 @@
     """
 
-    try: 
-        import pylab
-    except ImportError:
-        msg='csv2timeseries_graphs needs pylab to be installed correctly'
-        raise Exception(msg)
-            #ANUGA don't need pylab to work so the system doesn't 
-            #rely on pylab being installed 
+#     try: 
+#         import pylab
+#     except ImportError:
+#         msg='csv2timeseries_graphs needs pylab to be installed correctly'
+#         raise Exception(msg)
+#             #ANUGA don't need pylab to work so the system doesn't 
+#             #rely on pylab being installed 
+#         return
+    
+    try:
+        import matplotlib
+        matplotlib.use('Agg')
+        import matplotlib.pyplot as pylab
+    except:
+        #print "Couldn't import module from matplotlib, probably you need to update matplotlib"
         return
 
@@ -544 +552 @@
                 #add tide to stage if provided
                 if quantity == 'stage':
-                     quantity_value[quantity] = num.array(quantity_value[quantity],
+                    quantity_value[quantity] = num.array(quantity_value[quantity],
                                                           num.float) + directory_add_tide
 

trunk/anuga_core/anuga/geometry/polygon.py

@@ -724 +724 @@
        
 
-    from matplotlib.pyplot import hold, plot, savefig, xlabel, \
+
+    try:
+        import matplotlib
+        matplotlib.use('Agg')
+        from matplotlib.pyplot import hold, plot, savefig, xlabel, \
                     ylabel, title, close, title, fill
+    except:
+        return
 
     assert type(polygons_points) == list, \
@@ -780 +786 @@
     #ioff()
     hold(False)
+    
     close('all')