[Git][debian-gis-team/python-pyproj][upstream] New upstream version 2.4~rc1+ds

[Bas Couwenberg]

Bas Couwenberg pushed to branch upstream at Debian GIS Project / python-pyproj


Commits:
fadcc549 by Bas Couwenberg at 2019-09-20T12:48:27Z
New upstream version 2.4~rc1+ds
- - - - -


3 changed files:

- pyproj/__init__.py
- pyproj/_crs.pyx
- test/test__main__.py


Changes:

=====================================
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
=====================================
@@ -1,18 +1,42 @@
+import contextlib
+import os
 import subprocess
+import sys
 
 import pytest
 
 
-def test_main():
-    output = subprocess.check_output(["python", "-m", "pyproj"]).decode("utf-8")
+ at 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



View it on GitLab: https://salsa.debian.org/debian-gis-team/python-pyproj/commit/fadcc5493f6b942ccd7104517fa65a63502bb2df

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/python-pyproj/commit/fadcc5493f6b942ccd7104517fa65a63502bb2df
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20190920/3d6b4ed6/attachment-0001.html>