Support Cython 0.28, and fix failing license headers.

SciTools · Jan 15, 2019 · 51981c0 · 51981c0
1 parent 454a911
commit 51981c0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -5,7 +5,7 @@ environment:
           PACKAGES: "cython numpy matplotlib-base proj4 pykdtree scipy"
         - PYTHON_VERSION: "2.7"
           CONDA_INSTALL_LOCN: "C:\\Miniconda-x64"
-          PACKAGES: "cython=0.17 numpy=1.10.0 matplotlib=1.5.1 nose proj4=4.9.1 scipy=0.16.0 mock msinttypes futures"
+          PACKAGES: "cython numpy=1.10.0 matplotlib=1.5.1 nose proj4=4.9.1 scipy=0.16.0 mock msinttypes futures"
 
 install:
   # Install miniconda

diff --git a/INSTALL b/INSTALL
@@ -56,7 +56,7 @@ The recipes for these can be found at https://github.com/conda-forge/feedstocks.
 **Python** 2.7 or later (https://www.python.org/)
     Cartopy requires Python 2.7 or later.
 
-**Cython** 0.29 or later (https://pypi.python.org/pypi/Cython/)
+**Cython** 0.28 or later (https://pypi.python.org/pypi/Cython/)
 
 **NumPy** 1.10 or later (http://www.numpy.org/)
     Python package for scientific computing including a powerful N-dimensional

diff --git a/lib/cartopy/trace.pyx b/lib/cartopy/trace.pyx
@@ -1,4 +1,4 @@
-# (C) British Crown Copyright 2011 - 2018, Met Office
+# (C) British Crown Copyright 2011 - 2019, Met Office
 #
 # This file is part of cartopy.
 #
@@ -170,7 +170,7 @@ cdef class LineAccumulator:
                                                &geoms[0], geoms.size())
         return geom
 
-    cdef list[Line].size_type size(self):
+    cdef size_t size(self):
         return self.lines.size()
 
 

diff --git a/setup.py b/setup.py
@@ -1,4 +1,4 @@
-# (C) British Crown Copyright 2011 - 2018, Met Office
+# (C) British Crown Copyright 2011 - 2019, Met Office
 #
 # This file is part of cartopy.
 #