Changeset 9590

Timestamp:

Feb 2, 2015, 8:28:56 PM (10 years ago)

Author:

steve

Message:

Small errorin test which writes to test directory (and so causes error when run
from site-packages)

Location:

trunk/anuga_core

Files:

• anuga/__init__.py (modified) (1 diff)
• anuga/file_conversion/sts2sww_mesh.py (modified) (1 diff)
• anuga/shallow_water/tests/test_shallow_water_domain.py (modified) (4 diffs)
• setup.py (modified) (3 diffs)

trunk/anuga_core/anuga/__init__.py

@@ -27 +27 @@
 
 from .version import git_revision as __git_revision__
+from .version import svn_revision as __svn_revision__
 from .version import version as __version__
 
 
-
-
-# We first need to detect if we're being called as part of the numpy setup
+# We first need to detect if we're being called as part of the anuga setup
 # procedure itself in a reliable manner.
 try:

trunk/anuga_core/anuga/file_conversion/sts2sww_mesh.py

@@ -51 +51 @@
 
     number_of_points = nrows*ncols
-    points_utm = num.empty((number_of_points,2),float)
+    points_utm = num.zeros((number_of_points,2),num.float)
     points_utm[:,0]=x+x_origin
     points_utm[:,1]=y+y_origin

trunk/anuga_core/anuga/shallow_water/tests/test_shallow_water_domain.py

@@ -7102 +7102 @@
 
         
-        # Get path where this test is run
+        # Get path where thie data file are
         path = get_pathname_from_package('anuga.shallow_water')        
         
@@ -7151 +7151 @@
             interior_regions.append( [polygon, 100] ) 
 
-        meshname = 'offending_mesh.msh'
+        meshname = 'offending_mesh_1.msh'
         create_mesh_from_regions(bounding_polygon,
                                  boundary_tags={'south': [0], 'east': [1],
@@ -7167 +7167 @@
         #----------------------------------------------------------------------
 
-        points_file = os.path.join(path, 'offending_point.pts')
+        points_file = 'offending_point_1.pts'
 
         # Offending point
@@ -7217 +7217 @@
         path = get_pathname_from_package('anuga.shallow_water')        
 
-        meshname = 'test_mesh.msh'
+        meshname = 'test_mesh_2.msh'
         
         W = 304180

trunk/anuga_core/setup.py

@@ -63 +63 @@
 
     return filter(str.isdigit, "$Revision$")
-
-
 
 
@@ -173 +171 @@
     return config
 
-def check_submodules():
-    """ verify that the submodules are checked out and clean
-        use `git submodule update --init`; on failure
-    """
-    if not os.path.exists('.git'):
-        return
-    with open('.gitmodules') as f:
-        for l in f:
-            if 'path' in l:
-                p = l.split('=')[-1].strip()
-                if not os.path.exists(p):
-                    raise ValueError('Submodule %s missing' % p)
-
-
-    proc = subprocess.Popen(['git', 'submodule', 'status'],
-                            stdout=subprocess.PIPE)
-    status, _ = proc.communicate()
-    status = status.decode("ascii", "replace")
-    for line in status.splitlines():
-        if line.startswith('-') or line.startswith('+'):
-            raise ValueError('Submodule not clean: %s' % line)
-
-from distutils.command.sdist import sdist
-
-class sdist_checked(sdist):
-    """ check submodules on sdist to prevent incomplete tarballs """
-    def run(self):
-        check_submodules()
-        sdist.run(self)
-
-def generate_cython():
-    cwd = os.path.abspath(os.path.dirname(__file__))
-    print("Cythonizing sources")
-    p = subprocess.call([sys.executable,
-                          os.path.join(cwd, 'tools', 'cythonize.py'),
-                          'numpy/random'],
-                         cwd=cwd)
-    if p != 0:
-        raise RuntimeError("Running cythonize failed!")
-
-from distutils.core import Command
-
-class PyTest(Command):
-    user_options = []
-    def initialize_options(self):
-        pass
-
-    def finalize_options(self):
-        pass
-
-    def run(self):
-        import sys,subprocess
-        errno = subprocess.call([sys.executable, 'runtests.py'])
-        raise SystemExit(errno)
+
 
     
@@ -249 +194 @@
         license = 'GPL',
         classifiers=[_f for _f in CLASSIFIERS.split('\n') if _f],
-        platforms = ["Windows", "Linux", "Mac OS-X", "Unix"],
-        cmdclass={"sdist": sdist_checked, "test": PyTest},
+        platforms = ["Windows", "Linux", "Mac OS-X", "Unix"]
     )