Merge pull request #17 from DahnJ/feature/dj-separate-tests-general-update

Separate tests + General update

Author: DahnJ

Diff for: .pre-commit-config.yaml

@@ -1,11 +1,11 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 21.6b0
+    rev: 23.1.0
     hooks:
       - id: black
         language_version: python3
 
-  - repo: https://gitlab.com/pycqa/flake8
+  - repo: https://github.com/PyCQA/flake8
     rev: 3.9.2
     hooks:
       - id: flake8

Diff for: environment-dev.yml

@@ -0,0 +1,6 @@
+channels:
+  - conda-forge
+dependencies:
+  # Test
+  - pytest
+  - pytest-cov

Diff for: environment.yml

@@ -3,15 +3,15 @@ channels:
   - conda-forge
 dependencies:
   # Required
-  - python=3.9
+  - python>=3.9
   - shapely
-  - h3-py=3.7.*
   - geopandas>=0.9.*
   - pandas
-  # For Python <3.8
-  # - typing_extensions
-  # Test
-  - pytest
-  - pytest-cov
   # Notebooks
   - matplotlib
+  # Pip
+  - pip
+  - pip:
+    # Installing through pip to avoid segfault on Apple Silicon
+    # https://github.com/uber/h3-py/issues/313
+    - h3==3.7.6

Diff for: tests/__init__.py

@@ -1,4 +1,4 @@
-from . import h3pandas  # noqa: F401
+from h3pandas import h3pandas  # noqa: F401
 from h3 import h3
 import pytest
 from shapely.geometry import Polygon, box
@@ -546,7 +546,7 @@ def test_polyfill_resample(h3_geodataframe_with_values):
 
 
 def test_polyfill_resample_uncovered_rows(basic_geodataframe_polygons):
-    basic_geodataframe_polygons.loc[2] = box(0, 0, 3, 3)
+    basic_geodataframe_polygons.iloc[1] = box(0, 0, 3, 3)
     with pytest.warns(UserWarning):
         result = basic_geodataframe_polygons.h3.polyfill_resample(2)
 

Diff for: h3pandas/test_h3pandas.py renamed to tests/test_h3pandas.py

@@ -1,7 +1,7 @@
 from h3 import h3
 import pytest
 
-from .decorator import catch_invalid_h3_address
+from h3pandas.util.decorator import catch_invalid_h3_address
 
 
 def test_catch_invalid_h3_address():

Diff for: tests/util/__init__.py

@@ -1,6 +1,6 @@
 from shapely.geometry import Polygon, MultiPolygon, LineString
 import pytest
-from .shapely import polyfill
+from h3pandas.util.shapely import polyfill
 
 
 @pytest.fixture