Changeset 9674

Timestamp:

Feb 16, 2015, 11:50:21 AM (10 years ago)

Author:

steve

Message:

Update version

Location:

trunk/anuga_core

Files:

• anuga/__init__.py (modified) (2 diffs)
• anuga/tsunami_source/setup.py (modified) (1 diff)
• setup.cfg (modified) (1 diff)
• setup.py (modified) (4 diffs)

trunk/anuga_core/anuga/__init__.py

@@ -39 +39 @@
 # Dev branch marker is: 'X.Y.dev' or 'X.Y.devN' where N is an integer.
 #
-__version__ = '1.3.6'
+__version__ = '1.3.7'
 
 __svn_revision__ = filter(str.isdigit, "$Revision$")
@@ -82 +82 @@
         import subprocess
         try:
-            output = subprocess.check_output('gcc -dumpmachine', shell=True)
+            output = subprocess.check_output('gcc -dumpmachine', shell=True, stderr=subprocess.STDOUT)
             MinGW = 'mingw' in output
         except Exception as e:

trunk/anuga_core/anuga/tsunami_source/setup.py

@@ -16 +16 @@
     config.add_data_dir(join('tests','data'))
     
-    if sys.platform != 'win32':
-                config.add_extension('okada_tsunami_fortran',
-                            sources=['okada_tsunami_fortran.f'])
+    
+    #config.add_extension('okada_tsunami_fortran',
+        #                                       sources=['okada_tsunami_fortran.f'])
 
     

trunk/anuga_core/setup.cfg

@@ -12 +12 @@
 
 
-#[pip]
-#compiler=mingw32
 
 #[build]

trunk/anuga_core/setup.py

@@ -72 +72 @@
         zip_safe=False,  # the package can run out of an .egg file
         include_package_data=True,
+                install_requires=['numpy', 
+                          'scipy', 
+                          'netcdf4', 
+                          'nose', 
+                          'matplotlib',
+                          'gdal']
     )
 else:
@@ -89 +95 @@
             for filename in filenames:
                 if (filename.endswith('.so') or filename.endswith('.pyd')
-                        or filename.endswith('.dll')
                         or filename.endswith('.pyc')):
                     os.unlink(os.path.join(dirpath, filename))
@@ -141 +146 @@
                                  'Programming Language :: Python :: 2.7',
                                  ],
-                    install_requires=['numpy', 
-                                      'scipy', 
-                                      'netcdf4', 
-                                      'nose', 
-                                      'matplotlib',
-                                      'gdal',
-                                      'geos'],
                     cmdclass={'clean': CleanCommand},
                     **extra_setuptools_args)
@@ -176 +174 @@
 if __name__ == "__main__":
 
+
     setup_package()