Merge pull request #330 from snowman2/stickler

added stickler yaml file

Author: snowman2

.gitignore

@@ -1,17 +1,117 @@
-build/
-nad2bin*
-*.obj
-*.o
-*.pyc
+pyproj/proj_dir/
+pyproj/*.c
+proj-*/
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
 *.so
-*.c*
-!*.css
-.coverage
+
+# Distribution / packaging
+wheelhouse/
+.Python
+env/
+build/
+develop-eggs/
 dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# dotenv
+.env
+
+# virtualenv
+.venv
 venv/
-pyproj.egg-info/
-pyproj/proj_dir/
-pyproj/datadir.py.save
-docs/_build
+ENV/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+
+# pycharm
 .idea/
+
+# pytest
+.pytest_cache/
+
+# vscode
 .vscode/
+

.stickler.yml

@@ -0,0 +1,5 @@
+linters:
+    black:
+    flake8:
+        python: 3
+        max-line-length: 88

test/test.py

@@ -2,6 +2,7 @@
 """Rewrite part of test.py in pyproj in the form of unittests."""
 
 import math
+import re
 import sys
 import unittest
 
@@ -12,20 +13,19 @@
 class BasicTest(unittest.TestCase):
     def testProj4Version(self):
         awips221 = Proj(proj="lcc", R=6371200, lat_1=50, lat_2=50, lon_0=-107)
-        # self.assertEqual(awips221.proj_version, 4.9)
+        assert re.match(r"\d+\.\d+", awips221.proj_version)
 
     def testInitWithBackupString4(self):
         # this fails unless backup of to_string(4) is used
         pj = Proj(
-            "+proj=merc +a=6378137.0 +b=6378137.0 +nadgrids=@null +lon_0=0.0 +x_0=0.0 +y_0=0.0 +units=m +no_defs"
+            "+proj=merc +a=6378137.0 +b=6378137.0 +nadgrids=@null "
+            "+lon_0=0.0 +x_0=0.0 +y_0=0.0 +units=m +no_defs"
         )
         assert pj.crs.is_valid
 
     def testProjAwips221(self):
         # AWIPS is Advanced Weather Interactive Processing System
         params = {"proj": "lcc", "R": 6371200, "lat_1": 50, "lat_2": 50, "lon_0": -107}
-        nx = 349
-        ny = 277
         awips221 = Proj(
             proj=params["proj"],
             R=params["R"],
@@ -73,27 +73,30 @@ def testProjAwips221(self):
 
     def test_from_dict_with_bool(self):
         # issue #183
-        p_d = {'proj': 'omerc',
-               'lat_2': 80.27942,
-               'lat_0': 62.87671,
-               'lat_1': 42.751232,
-               'ellps': 'WGS84',
-               'no_rot': True,
-               'lon_1': 33.793186,
-               'lon_2': -18.374414}
-        p=Proj(p_d)
-        self.assertTrue('+no_rot' in p.srs.split())
-        p_d = {'proj': 'omerc',
-               'lat_2': 80.27942,
-               'lat_0': 62.87671,
-               'lat_1': 42.751232,
-               'ellps': 'WGS84',
-               'no_rot': False,
-               'lon_1': 33.793186,
-               'lon_2': -18.374414}
-        p=Proj(p_d)
-        self.assertFalse('+no_rot' in p.srs.split())
-
+        p_d = {
+            "proj": "omerc",
+            "lat_2": 80.27942,
+            "lat_0": 62.87671,
+            "lat_1": 42.751232,
+            "ellps": "WGS84",
+            "no_rot": True,
+            "lon_1": 33.793186,
+            "lon_2": -18.374414,
+        }
+        p = Proj(p_d)
+        self.assertTrue("+no_rot" in p.srs.split())
+        p_d = {
+            "proj": "omerc",
+            "lat_2": 80.27942,
+            "lat_0": 62.87671,
+            "lat_1": 42.751232,
+            "ellps": "WGS84",
+            "no_rot": False,
+            "lon_1": 33.793186,
+            "lon_2": -18.374414,
+        }
+        p = Proj(p_d)
+        self.assertFalse("+no_rot" in p.srs.split())
 
 
 class InverseHammerTest(unittest.TestCase):
@@ -136,7 +139,8 @@ def test_tranform_none_2nd_parmeter(self):
 
 class Geod_NoDefs_Issue22_Test(unittest.TestCase):
     # Test for Issue #22, Geod with "+no_defs" in initstring
-    # Before PR #23 merged 2015-10-07, having +no_defs in the initstring would result in a ValueError
+    # Before PR #23 merged 2015-10-07, having +no_defs in the
+    # initstring would result in a ValueError
     def test_geod_nodefs(self):
         Geod("+a=6378137 +b=6378137 +no_defs")
 
@@ -151,16 +155,19 @@ def test_latlong_typeerror(self):
         lon, lat = transform(p, p.to_latlong(), 200000, 400000)
 
 
-@unittest.skipIf(sys.version_info < (3, 4), "Python 3.4 or newer required for subTest()")
+@unittest.skipIf(
+    sys.version_info < (3, 4), "Python 3.4 or newer required for subTest()"
+)
 class ForwardInverseTest(unittest.TestCase):
     def test_fwd_inv(self):
         for pj in pj_list.keys():
             with self.subTest(pj=pj):
                 try:
                     p = Proj(proj=pj)
                     x, y = p(-30, 40)
-                    # note, for proj 4.9.2 or before the inverse projection may be missing
-                    # and pyproj 1.9.5.1 or before does not test for this and will
+                    # note, for proj 4.9.2 or before the inverse projection
+                    # may be missing and pyproj 1.9.5.1 or before does not
+                    # test for this and will
                     # give a segmentation fault at this point:
                     lon, lat = p(x, y, inverse=True)
                 except RuntimeError:
@@ -188,7 +195,8 @@ def test_not_shared_memory(self):
         self.assertNotEqual(self.g.initstring, self.mercury.initstring)
 
     def test_distances(self):
-        # note calculated distance was not an issue with #64, but it still a shared memory test
+        # note calculated distance was not an issue with #64,
+        # but it still a shared memory test
         boston_lat = 42.0 + (15.0 / 60.0)
         boston_lon = -71.0 - (7.0 / 60.0)
         portland_lat = 45.0 + (31.0 / 60.0)

test/test_crs.py

@@ -32,6 +32,7 @@ def test_from_proj4__invalid():
     with pytest.raises(CRSError):
         assert CRS.from_proj4(CRS(3857).to_wkt())
 
+
 def test_from_proj4_json():
     json_str = '{"proj": "longlat", "ellps": "WGS84", "datum": "WGS84"}'
     proj = CRS.from_string(json_str)
@@ -773,25 +774,32 @@ def test_crs_init_user_input():
 
 def test_to_string__no_auth():
     proj = CRS("+proj=latlong +ellps=GRS80 +towgs84=-199.87,74.79,246.62")
-    assert proj.to_string() == \
-        "+proj=latlong +ellps=GRS80 +towgs84=-199.87,74.79,246.62 +type=crs"
+    assert (
+        proj.to_string()
+        == "+proj=latlong +ellps=GRS80 +towgs84=-199.87,74.79,246.62 +type=crs"
+    )
 
 
 def test_to_string__auth():
     assert CRS(("IGNF", "ETRS89UTM28")).to_string() == "IGNF:ETRS89UTM28"
 
 
 def test_srs__no_plus():
-    assert CRS("proj=longlat datum=WGS84 no_defs").srs == \
-        "proj=longlat datum=WGS84 type=crs"
+    assert (
+        CRS("proj=longlat datum=WGS84 no_defs").srs
+        == "proj=longlat datum=WGS84 type=crs"
+    )
 
 
-@pytest.mark.parametrize("init_string, expected_srs", [
-    ("+init=epsg:4326 +no_defs=True", "+init=epsg:4326 +type=crs"),
-    ("init=epsg:4326 no_defs=True", "init=epsg:4326 type=crs"),
-    ("+init=epsg:4326 +no_defs", "+init=epsg:4326 +type=crs"),
-    ("init=epsg:4326 no_defs", "init=epsg:4326 type=crs"),
-])
+@pytest.mark.parametrize(
+    "init_string, expected_srs",
+    [
+        ("+init=epsg:4326 +no_defs=True", "+init=epsg:4326 +type=crs"),
+        ("init=epsg:4326 no_defs=True", "init=epsg:4326 type=crs"),
+        ("+init=epsg:4326 +no_defs", "+init=epsg:4326 +type=crs"),
+        ("init=epsg:4326 no_defs", "init=epsg:4326 type=crs"),
+    ],
+)
 def test_removing_nodefs(init_string, expected_srs):
     assert CRS(init_string).srs == expected_srs
 

test/test_transformer.py

@@ -404,20 +404,14 @@ def test_str():
 
 
 def test_repr():
-    assert repr(Transformer.from_crs(7789, 8401)) == \
-        (
-            "<Transformation Transformer: helmert>\n"
-            "ITRF2014 to ETRF2014 (1)"
-        )
+    assert repr(Transformer.from_crs(7789, 8401)) == (
+        "<Transformation Transformer: helmert>\n" "ITRF2014 to ETRF2014 (1)"
+    )
 
-    assert repr(Transformer.from_crs(4326, 3857)) == \
-        (
-            "<Conversion Transformer: pipeline>\n"
-            "Popular Visualisation Pseudo-Mercator"
-        )
+    assert repr(Transformer.from_crs(4326, 3857)) == (
+        "<Conversion Transformer: pipeline>\n" "Popular Visualisation Pseudo-Mercator"
+    )
 
-    assert repr(Transformer.from_crs(4326, 26917)) == \
-        (
-            "<Unknown Transformer: unknown>\n"
-            "unavailable until proj_trans is called"
-        )
+    assert repr(Transformer.from_crs(4326, 26917)) == (
+        "<Unknown Transformer: unknown>\n" "unavailable until proj_trans is called"
+    )