Merge branch 'ManifoldFR-patch-1'

CONTRIBUTORS.txt

@@ -10,3 +10,4 @@ jakirkham
 Adrian Butscher
 Wolfram Moebius
 Jens Glaser
+ManifoldFR

LICENSE.txt

@@ -1,7 +1,7 @@
 Unless otherwise specified by LICENSE.txt files in individual
 directories, all code is
 
-Copyright (C) 2017 the scikit-fmm team
+Copyright (C) 2019 the scikit-fmm team
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

README.md

@@ -151,8 +151,12 @@ masked array. A function is provided to compute extension velocities.
 * 0.0.9: August 5th 2016
    * Periodic boundaries: an optional "periodic" keyword argument
      enables periodic boundaries in one or more directions (Wolfram Moebius).
+* 2019.1.30 January 30th 2019
+   * Abrupt change to version numbering scheme.
+   * Bugfix in setup.py to allow installing via pip with numpy (ManifoldFR).
+   * Handle C++ exceptions during fast marching (Jens Glaser).
+   * Accept a zero discriminant in travel time point update.
 
-
-Copyright 2017 The scikit-fmm team.
+Copyright 2019 The scikit-fmm team.
 
 BSD-style license. See LICENSE.txt in the source directory.

doc/conf.py

@@ -63,16 +63,16 @@ def __getattr__(self, name):
 
 # General information about the project.
 project = u'scikit-fmm'
-copyright = u'2015, the scikit-fmm team'
+copyright = u'2019, the scikit-fmm team'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.0.9'
+version = '2019.1.30'
 # The full version, including alpha/beta/rc tags.
-release = '0.0.9'
+release = '2019.1.30'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -17,7 +17,7 @@
 DESCRIPTION      = "An extension module implementing the fast marching method"
 MAINTAINER       = "Jason Furtney"
 MAINTAINER_EMAIL = "jkfurtney@gmail.com"
-VERSION          = "0.0.9"
+VERSION          = "2019.1.30"
 URL              = 'https://github.com/scikit-fmm/scikit-fmm'
 LICENSE          = 'BSD'
 KEYWORDS         = "fast marching method, Eikonal equation, interface, boundary"
@@ -38,9 +38,49 @@ def configuration(parent_package='',top_path=None):
 
     return config
 
+
+def parse_setuppy_commands():
+    """Check the commands and respond appropriately
+
+    Inspired heavily from SciPy's setup script : https://github.com/scipy/scipy/blob/master/setup.py
+    """
+    if len(sys.argv) < 2:
+        # User forgot to give an argument probably, let setuptools handle that.
+        return True
+
+    info_commands= ['--help-commands',
+                        'egg_info',
+                        '--version',
+                        'clean',
+                        'install_egg_info',
+                        'rotate'
+                   ]
+
+    for command in info_commands:
+        if command in sys.argv[1:]:
+            return False
+
+    good_commands = ('develop', 'sdist', 'build', 'build_ext', 'build_py',
+                     'build_clib', 'build_scripts', 'bdist_wheel', 'bdist_rpm',
+                     'bdist_wininst', 'bdist_msi', 'bdist_mpkg',
+                     'build_sphinx')
+
+    for command in good_commands:
+        if command in sys.argv[1:]:
+            return True
+
+    # The following commands are supported, but we need to show more
+    # useful messages to the user
+    if 'install' in sys.argv[1:]:
+        print("""
+            Note: if you need to uninstall you should `pip install scikit-fmm` instead of using `setup.py install`
+            """)
+        return True
+
+
 def setup_package():
-    from numpy.distutils.core import setup
-    setup(
+
+    metadata = dict(
         name             = DISTNAME,
         version          = VERSION,
         maintainer       = MAINTAINER,
@@ -59,7 +99,23 @@ def setup_package():
                             "Intended Audience :: Science/Research",
                             "Programming Language :: C++",
                             "Programming Language :: Python :: 2",
-                            "Programming Language :: Python :: 3"])
+                            "Programming Language :: Python :: 3"]
+    )
+
+    if "--force" in sys.argv:
+        run_build = True
+        sys.argv.remove('--force')
+    else:
+        # Raise errors for unsupported commands, improve help output, etc.
+        run_build = parse_setuppy_commands()
+
+    from setuptools import setup
+
+    if run_build:
+        from numpy.distutils.core import setup
+
+    setup(**metadata)
+
 
 if __name__ == '__main__':
     setup_package()

skfmm/__init__.py

@@ -45,7 +45,7 @@
 
 from __future__ import print_function
 
-__version__ = "0.0.9"
+__version__ = "2019.1.30"
 __docformat__ = 'restructuredtext'
 
 from .pfmm import distance, travel_time, extension_velocities