Merge pull request #259 from Juanlu001/python-3-8

Add support for Python 3.8

.travis.yml

@@ -6,6 +6,7 @@ python:
   - "3.5"
   - "3.6"
   - "3.7"
+  - "3.8"
   - "nightly"
 
 branches:
@@ -17,9 +18,12 @@ matrix:
   - python: "nightly"
 
 before_install:
-  - pip install pycodestyle mypy==0.670 # See https://github.com/python/mypy/issues/6564
+  - pip install pycodestyle
   - pycodestyle . --count
-  - mypy --ignore-missing-imports --check-untyped-defs telluric/
+  - if [[ $TRAVIS_PYTHON_VERSION != "3.4" ]]; then
+      pip install mypy;
+      mypy --ignore-missing-imports --check-untyped-defs telluric/;
+    fi
 
 install:
   - pip install numpy  # Required

telluric/collections.py

@@ -173,7 +173,7 @@ def key(feature):
                 return feature[by]
 
         sorted_features = sorted(list(self), reverse=desc, key=key)
-        return self.__class__(sorted_features)
+        return FeatureCollection(sorted_features)
 
     def groupby(self, by):
         # type: (Union[str, Callable[[GeoFeature], str]]) -> _CollectionGroupBy

telluric/context.py

@@ -4,13 +4,12 @@
 """
 import logging
 import threading
-from typing import Optional
 
 
 class ThreadContext(threading.local):
     def __init__(self):
         # Initializes in each thread
-        self._options = None  # type: Optional[dict]
+        self._options = {}
 
     def get(self, key, default=None):
         return self._options.get(key, default)
@@ -104,7 +103,7 @@ def from_defaults(cls, **kwargs):
     def __enter__(self):
         log.debug("Entering env context: %r", self)
         # No parent TelluricContext exists.
-        if local_context._options is None:
+        if not local_context._options:
             log.debug("Starting outermost env")
             self._has_parent_env = False
 
@@ -157,4 +156,4 @@ def del_context():
     """Delete options in the existing context."""
     if not local_context._options:
         raise TelluricContextError("TelluricContext context not exists")
-    local_context._options = None
+    local_context._options.clear()

telluric/plotting.py

@@ -148,8 +148,10 @@ def plot(feature, mp=None, style_function=None, **map_kwargs):
 
 class NotebookPlottingMixin:
     def _run_in_tileserver(self, capture):
-        TileServer.run_tileserver(self, self.envelope)
-        mp = TileServer.folium_client(self, self.envelope, capture=capture)
+        # Variable annotation syntax is only available in Python >= 3.6,
+        # so we cannot declare an envelope property here
+        TileServer.run_tileserver(self, self.envelope)  # type: ignore
+        mp = TileServer.folium_client(self, self.envelope, capture=capture)  # type: ignore
         return mp._repr_html_()
 
     def _repr_html_(self):

telluric/vectors.py

@@ -463,7 +463,8 @@ def get_bounds(self, crs):
 
     def get_bounding_box(self, crs):
         """Gets bounding box as GeoVector in a specified CRS."""
-        return self.from_bounds(*self.get_bounds(crs), crs=crs)
+        # https://github.com/python/mypy/issues/6799
+        return self.from_bounds(*self.get_bounds(crs), crs=crs)  # type: ignore
 
     def _repr_svg_(self):
         return self._shape._repr_svg_()

tests/test_telluric_context.py

@@ -7,7 +7,7 @@ def test_context_in_one_level():
         assert local_context.get('b') == 2
         assert local_context.get('c') == 'stam'
         assert local_context.get('d') == {'a': 'a', 'b': 'b'}
-    assert local_context._options is None
+    assert local_context._options == {}
 
 
 def test_context_in_two_level():
@@ -23,7 +23,7 @@ def test_context_in_two_level():
         assert local_context.get('b') == 2
         assert local_context.get('c') == 'stam'
         assert local_context.get('d') == {'a': 'a', 'b': 'b'}
-    assert local_context._options is None
+    assert local_context._options == {}
 
 
 def test_different_context_on_different_threads():
@@ -39,7 +39,7 @@ def thread_test_1():
             assert local_context.get('d') == {'a': 'a', 'b': 'b'}
             assert local_context.get('x') is None
             assert local_context.get('y') is None
-        assert local_context._options is None
+        assert local_context._options == {}
 
     def thread_test_2():
         with TelluricContext(a=4, b=5, x='something', y=13):
@@ -50,13 +50,13 @@ def thread_test_2():
             assert local_context.get('c') is None
             assert local_context.get('d') is None
             sleep(0.1)
-        assert local_context._options is None
+        assert local_context._options == {}
 
     t1 = threading.Thread(target=thread_test_1)
     t2 = threading.Thread(target=thread_test_2)
     t1.start()
     t2.start()
-    assert local_context._options is None
+    assert local_context._options == {}
     t1.join()
     t2.join()
-    assert local_context._options is None
+    assert local_context._options == {}