Changeset 9549

Timestamp:

Jan 29, 2015, 6:14:20 PM (10 years ago)

Author:

steve

Message:

More name resolving

Location:

trunk/anuga_core/source

Files:

• anuga/fit_interpolate/test/test_interpolate.py (modified) (2 diffs)
• anuga/pmesh/test/test_mesh_interface.py (modified) (1 diff)
• setup.cfg (modified) (1 diff)

trunk/anuga_core/source/anuga/fit_interpolate/test/test_interpolate.py

@@ -12 +12 @@
 import tempfile
 import csv
-
-from anuga.file.netcdf import NetCDFFile
 
 import numpy as num
@@ -25 +23 @@
 from anuga.file.sww import SWW_file
 from anuga.shallow_water.shallow_water_domain import Domain
-from abstract_2d_finite_volumes.quantity import Quantity
+from anuga.abstract_2d_finite_volumes.quantity import Quantity
 from anuga.geospatial_data.geospatial_data import Geospatial_data
 from anuga.pmesh.mesh import Mesh
+from anuga.file.netcdf import NetCDFFile
 
 def distance(x, y):

trunk/anuga_core/source/anuga/pmesh/test/test_mesh_interface.py

@@ -4 +4 @@
 import unittest
 import os
+
 from anuga.pmesh.mesh import importMeshFromFile
 from anuga.pmesh.mesh_interface import create_mesh_from_regions
-
 from anuga.pmesh.mesh_interface import _create_mesh_from_regions
-
-from load_mesh.loadASCII import *
+from anuga.load_mesh.loadASCII import *
 from anuga.geometry.polygon import is_inside_polygon
 from anuga.coordinate_transforms.geo_reference import Geo_reference,DEFAULT_ZONE

trunk/anuga_core/source/setup.cfg

@@ -1 +1 @@
 
 [pytest]
-addopts = --ignore=setup.py --ignore=anuga/parallel --cov-report term --cov .
+addopts = --ignore=test_all.py --ignore=setup.py --ignore=anuga/parallel --cov-report term --cov .