Merge 7f6f487 into f8cbcc6

.travis.yml

@@ -17,6 +17,7 @@ matrix:
   - env: export PYTHON=3.6; FAIL_ON_EXTERNAL_DEPRECATION='False'; MINIMAL_ENV='True'
   - env: export PYTHON=3.6; FAIL_ON_EXTERNAL_DEPRECATION='False'; MINIMAL_ENV='False'
     os: osx
+  - env: export PYTHON=3.7; FAIL_ON_EXTERNAL_DEPRECATION='False'; MINIMAL_ENV='False'
     language: generic
   allow_failures:
   - env: export PYTHON=3.6; FAIL_ON_EXTERNAL_DEPRECATION='True'; MINIMAL_ENV='False'

hyperspy/Release.py

@@ -25,7 +25,7 @@
 # When running setup.py the ".dev" string will be replaced (if possible)
 # by the output of "git describe" if git is available or the git
 # hash if .git is present.
-version = "1.4.1.dev"
+version = "1.4.1"
 description = "Multidimensional data analysis toolbox"
 license = 'GPL v3'
 

hyperspy/conftest.py

@@ -26,7 +26,7 @@ def add_np(doctest_namespace):
 def setup_module(mod):
     if pytest.config.getoption("--pdb"):
         import dask
-        dask.set_options(get=dask.async.get_sync)
+        dask.set_options(get=dask.local.get_sync)
 
 
 @pytest.fixture

hyperspy/misc/test_utils.py

@@ -16,6 +16,7 @@
 # along with  HyperSpy.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
+import sys
 from contextlib import contextmanager
 import warnings
 import re
@@ -34,6 +35,14 @@ def ignore_warning(message="", category=None):
             warnings.filterwarnings('ignore', message)
         yield
 
+# In Python 3.7, the private re._pattern_type is removed.
+# Python 3.5+ have typing.re.Pattern
+# Solution adapted from Pandas
+if sys.version_info >= (3, 5):
+    import typing
+    Pattern = typing.re.Pattern
+else:
+    Pattern = type(re.compile(''))
 
 # TODO: Remove _all_warnings when moved to Python > 3.4,
 # ref http://bugs.python.org/issue4180
@@ -148,7 +157,7 @@ def assert_warns(message=None, category=None):
     If you use the "|" operator in a pattern, you can catch one of several warnings.
     Finally, you can use "|\A\Z" in a pattern to signify it as optional.
     """
-    if isinstance(message, (str, re._pattern_type)):
+    if isinstance(message, (str, Pattern)):
         message = [message]
     elif message is None:
         message = tuple()