debian/changelog

+python-pyproj (2.4~rc1+ds-1~exp1) experimental; urgency=medium
+
+  * New upstream release candidate.
+  * Drop patches, applied/fixed upstream.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 20 Sep 2019 14:50:23 +0200
+
 python-pyproj (2.4~rc0+ds-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate.

debian/patches/python3.patch

-Description: Use python3 interpreter.
-Author: Bas Couwenberg <sebastic@debian.org>
-Bug: https://github.com/pyproj4/pyproj/issues/451
-Forwarded: https://github.com/pyproj4/pyproj/pull/452
-
---- a/test/test__main__.py
-+++ b/test/test__main__.py
-@@ -4,7 +4,7 @@ import pytest
- 
- 
- def test_main():
--    output = subprocess.check_output(["python", "-m", "pyproj"]).decode("utf-8")
-+    output = subprocess.check_output(["python3", "-m", "pyproj"]).decode("utf-8")
-     assert "pyproj version:" in output
-     assert "PROJ version:" in output
-     assert "-v, --verbose  Show verbose debugging version information." in output
-@@ -12,7 +12,7 @@ def test_main():
- 
- @pytest.mark.parametrize("option", ["-v", "--verbose"])
- def test_main__verbose(option):
--    output = subprocess.check_output(["python", "-m", "pyproj", option]).decode("utf-8")
-+    output = subprocess.check_output(["python3", "-m", "pyproj", option]).decode("utf-8")
-     assert "pyproj:" in output
-     assert "PROJ:" in output
-     assert "data dir" in output

debian/patches/series

-python3.patch
-spelling-errors.patch

debian/patches/spelling-errors.patch

-Description: Fix spelling errors.
- * intialized -> initialized
-Author: Bas Couwenberg <sebastic@debian.org>
-Forwarded: https://github.com/pyproj4/pyproj/pull/453
-Applied-Upstream: https://github.com/pyproj4/pyproj/commit/9785bf81561ebf03446fb88d159613c4e4391f5a
-
---- a/pyproj/_crs.pyx
-+++ b/pyproj/_crs.pyx
-@@ -563,7 +563,7 @@ cdef class Ellipsoid(Base):
- 
-     def __init__(self):
-         raise RuntimeError(
--            "Ellipsoid can only be intialized like 'Ellipsoid.from_*()'."
-+            "Ellipsoid can only be initialized like 'Ellipsoid.from_*()'."
-         )
- 
-     @staticmethod
-@@ -777,7 +777,7 @@ cdef class PrimeMeridian(Base):
- 
-     def __init__(self):
-         raise RuntimeError(
--            "PrimeMeridian can only be intialized like 'PrimeMeridian.from_*()'."
-+            "PrimeMeridian can only be initialized like 'PrimeMeridian.from_*()'."
-         )
- 
-     @staticmethod
-@@ -951,7 +951,7 @@ cdef class Datum(Base):
- 
-     def __init__(self):
-         raise RuntimeError(
--            "Datum can only be intialized like 'Datum.from_*()'."
-+            "Datum can only be initialized like 'Datum.from_*()'."
-         )
- 
-     @staticmethod
-@@ -1368,7 +1368,7 @@ cdef class CoordinateOperation(Base):
- 
-     def __init__(self):
-         raise RuntimeError(
--            "CoordinateOperation can only be intialized like 'CoordinateOperation.from_*()'."
-+            "CoordinateOperation can only be initialized like 'CoordinateOperation.from_*()'."
-         )
- 
-     @staticmethod

pyproj/__init__.py

@@ -47,7 +47,7 @@ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
 LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
 NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. """
-__version__ = "2.4.rc0"
+__version__ = "2.4.rc1"
 __all__ = [
     "Proj",
     "Geod",

pyproj/_crs.pyx

@@ -563,7 +563,7 @@ cdef class Ellipsoid(Base):
 
     def __init__(self):
         raise RuntimeError(
-            "Ellipsoid can only be intialized like 'Ellipsoid.from_*()'."
+            "Ellipsoid can only be initialized like 'Ellipsoid.from_*()'."
         )
 
     @staticmethod
@@ -777,7 +777,7 @@ cdef class PrimeMeridian(Base):
 
     def __init__(self):
         raise RuntimeError(
-            "PrimeMeridian can only be intialized like 'PrimeMeridian.from_*()'."
+            "PrimeMeridian can only be initialized like 'PrimeMeridian.from_*()'."
         )
 
     @staticmethod
@@ -951,7 +951,7 @@ cdef class Datum(Base):
 
     def __init__(self):
         raise RuntimeError(
-            "Datum can only be intialized like 'Datum.from_*()'."
+            "Datum can only be initialized like 'Datum.from_*()'."
         )
 
     @staticmethod
@@ -1368,7 +1368,7 @@ cdef class CoordinateOperation(Base):
 
     def __init__(self):
         raise RuntimeError(
-            "CoordinateOperation can only be intialized like 'CoordinateOperation.from_*()'."
+            "CoordinateOperation can only be initialized like 'CoordinateOperation.from_*()'."
         )
 
     @staticmethod

test/test__main__.py

+import contextlib
+import os
 import subprocess
+import sys
 
 import pytest
 
 
-def test_main():
-    output = subprocess.check_output(["python", "-m", "pyproj"]).decode("utf-8")
+@contextlib.contextmanager
+def tmp_chdir(new_dir):
+    """
+    This temporarily changes directories when running the tests.
+    Useful for when testing wheels in the pyproj directory
+    when pyproj has not been build and prevents conflicts.
+    """
+    curdir = os.getcwd()
+    try:
+        os.chdir(new_dir)
+        yield
+    finally:
+        os.chdir(curdir)
+
+
+def test_main(tmpdir):
+    with tmp_chdir(str(tmpdir)):
+        output = subprocess.check_output(
+            [sys.executable, "-m", "pyproj"], stderr=subprocess.STDOUT
+        ).decode("utf-8")
     assert "pyproj version:" in output
     assert "PROJ version:" in output
     assert "-v, --verbose  Show verbose debugging version information." in output
 
 
 @pytest.mark.parametrize("option", ["-v", "--verbose"])
-def test_main__verbose(option):
-    output = subprocess.check_output(["python", "-m", "pyproj", option]).decode("utf-8")
+def test_main__verbose(option, tmpdir):
+    with tmp_chdir(str(tmpdir)):
+        output = subprocess.check_output(
+            [sys.executable, "-m", "pyproj", option], stderr=subprocess.STDOUT
+        ).decode("utf-8")
     assert "pyproj:" in output
     assert "PROJ:" in output
     assert "data dir" in output