Merge branch 'master' into feature/bbox-validation

Author: eseglem

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.6.0a0
+current_version = 0.6.1
 commit = True
 tag = True
 tag_name = {new_version}

.flake8

@@ -1,4 +1,9 @@
 repos:
+  - repo: https://github.com/abravalheri/validate-pyproject
+    rev: v0.12.1
+    hooks:
+      - id: validate-pyproject
+
   - repo: https://github.com/psf/black
     rev: 22.12.0
     hooks:
@@ -11,19 +16,11 @@ repos:
       - id: isort
         language_version: python
 
-  - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
+  - repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: v0.0.238
     hooks:
-      - id: flake8
-        language_version: python
-
-  - repo: https://github.com/PyCQA/pydocstyle
-    rev: 6.1.1
-    hooks:
-      - id: pydocstyle
-        language_version: python
-        additional_dependencies:
-          - toml
+      - id: ruff
+        args: ["--fix"]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v0.991
@@ -32,9 +29,5 @@ repos:
         language_version: python
         # No reason to run if only tests have changed. They intentionally break typing.
         exclude: tests/.*
-        # Pass mypy the entire folder because a change in one file can break others. 
-        args: [--config-file=pyproject.toml, geojson_pydantic/]
-        # Don't pass it the individual filenames because it is already doing the whole folder.
-        pass_filenames: false
         additional_dependencies:
-          - pydantic
+        - pydantic

.pre-commit-config.yaml

@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.6.1] - 2023-05-12
+
+### Fixed
+
+* Fix issue with null bbox validation (author @bmschmidt, https://github.com/developmentseed/geojson-pydantic/pull/119)
+
+## [0.6.0] - 2023-05-09
+
+No change since 0.6.0a0
+
 ## [0.6.0a0] - 2023-04-04
 
 ### Added
@@ -268,8 +278,10 @@ Although the type file was added in `0.2.0` it wasn't included in the distribute
 ### Added
 - Initial Release
 
-[unreleased]: https://github.com/developmentseed/geojson-pydantic/compare/0.6.0a...HEAD
-[0.6.0a]: https://github.com/developmentseed/geojson-pydantic/compare/0.5.0...0.6.0a
+[unreleased]: https://github.com/developmentseed/geojson-pydantic/compare/0.6.1...HEAD
+[0.6.1]: https://github.com/developmentseed/geojson-pydantic/compare/0.6.0...0.6.1
+[0.6.0]: https://github.com/developmentseed/geojson-pydantic/compare/0.6.0a0...0.6.0
+[0.6.0a]: https://github.com/developmentseed/geojson-pydantic/compare/0.5.0...0.6.0a0
 [0.5.0]: https://github.com/developmentseed/geojson-pydantic/compare/0.4.3...0.5.0
 [0.4.3]: https://github.com/developmentseed/geojson-pydantic/compare/0.4.2...0.4.3
 [0.4.2]: https://github.com/developmentseed/geojson-pydantic/compare/0.4.1...0.4.2

CHANGELOG.md

@@ -5,7 +5,7 @@ To run the tests, first install the package in a virtual environment:
 ```sh
 virtualenv venv
 source venv/bin/activate
-pip install -e '.[test]'
+python -m pip install -e '.[test]'
 ```
 
 You can then run the tests with the following command:

CONTRIBUTING.md

@@ -20,7 +20,7 @@
       <img src="https://img.shields.io/github/license/developmentseed/geojson-pydantic.svg" alt="License">
   </a>
   <a href="https://anaconda.org/conda-forge/geojson-pydantic" target="_blank">
-      <img src="https://anaconda.org/conda-forge/geojson-pydantic/badges/installer/conda.svg" alt="Conda">
+      <img src="https://anaconda.org/conda-forge/geojson-pydantic/badges/version.svg" alt="Conda">
   </a>
 </p>
 
@@ -31,15 +31,15 @@
 ## Install
 
 ```bash
-$ pip install -U pip
-$ pip install geojson-pydantic
+$ python -m pip install -U pip
+$ python -m pip install geojson-pydantic
 ```
 
 Or install from source:
 
 ```bash
-$ pip install -U pip
-$ pip install git+https://github.com/developmentseed/geojson-pydantic.git
+$ python -m pip install -U pip
+$ python -m pip install git+https://github.com/developmentseed/geojson-pydantic.git
 ```
 
 Install with conda from [`conda-forge`](https://anaconda.org/conda-forge/geojson-pydantic):

README.md

@@ -11,7 +11,7 @@
     Polygon,
 )
 
-__version__ = "0.6.0a0"
+__version__ = "0.6.1"
 
 __all__ = [
     "Feature",

geojson_pydantic/__init__.py

@@ -188,7 +188,7 @@ def __wkt_coordinates__(self, coordinates: Any, force_z: bool) -> str:
     @validator("coordinates")
     def check_closure(cls, coordinates: List) -> List:
         """Validate that Polygon is closed (first and last coordinate are the same)."""
-        if any([ring[-1] != ring[0] for ring in coordinates]):
+        if any(ring[-1] != ring[0] for ring in coordinates):
             raise ValueError("All linear rings have the same start and end coordinates")
 
         return coordinates
@@ -241,7 +241,7 @@ def has_z(self) -> bool:
     @validator("coordinates")
     def check_closure(cls, coordinates: List) -> List:
         """Validate that Polygon is closed (first and last coordinate are the same)."""
-        if any([ring[-1] != ring[0] for polygon in coordinates for ring in polygon]):
+        if any(ring[-1] != ring[0] for polygon in coordinates for ring in polygon):
             raise ValueError("All linear rings have the same start and end coordinates")
 
         return coordinates
@@ -303,7 +303,7 @@ def check_geometries(cls, geometries: List) -> List:
             warnings.warn(
                 "GeometryCollection should not be used for nested GeometryCollections."
             )
-        if len(set(geom.type for geom in geometries)) == 1:
+        if len({geom.type for geom in geometries}) == 1:
             warnings.warn(
                 "GeometryCollection should not be used for homogeneous collections."
             )

geojson_pydantic/geometries.py

@@ -45,27 +45,50 @@ exclude = [
     "CONTRIBUTING.md",
 ]
 
+[tool.coverage.run]
+branch = true
+parallel = true
+
+[tool.coverage.report]
+exclude_lines = [
+  "no cov",
+  "if __name__ == .__main__.:",
+  "if TYPE_CHECKING:",
+]
+
 [tool.isort]
 profile = "black"
 known_first_party = ["geojson_pydantic"]
 known_third_party = ["pydantic"]
 default_section = "THIRDPARTY"
 
 [tool.mypy]
-plugins = [
-  "pydantic.mypy"
-]
+plugins = ["pydantic.mypy"]
 disallow_untyped_calls = true
 disallow_untyped_defs = true
 disallow_incomplete_defs = true
+warn_untyped_fields = true
 warn_redundant_casts = true
 warn_unused_ignores = true
 no_implicit_optional = true
 show_error_codes = true
 
-[tool.pydantic-mypy]
-warn_untyped_fields = true
+[tool.ruff]
+select = [
+    "D1",  # pydocstyle errors
+    "E",  # pycodestyle errors
+    "W",  # pycodestyle warnings
+    "F",  # flake8
+    "C",  # flake8-comprehensions
+    "B",  # flake8-bugbear
+]
+ignore = [
+    "E501",  # line too long, handled by black
+    "B008",  # do not perform function calls in argument defaults
+    "B905",  # ignore zip() without an explicit strict= parameter, only support with python >3.10
+]
 
-[tool.pydocstyle]
-select = "D1"
-match = "(?!test).*.py"
+[tool.ruff.per-file-ignores]
+"tests/test_geometries.py" = ["D1"]
+"tests/test_features.py" = ["D1"]
+"tests/test_package.py" = ["D1"]

pyproject.toml

@@ -213,6 +213,7 @@ def test_bad_feature_id(id):
 def test_feature_validation():
     """Test default."""
     assert Feature(type="Feature", properties=None, geometry=None)
+    assert Feature(type="Feature", properties=None, geometry=None, bbox=None)
 
     with pytest.raises(ValidationError):
         # should be type=Feature
@@ -230,6 +231,13 @@ def test_feature_validation():
         # missing geometry
         Feature(type="Feature", properties=None)
 
+    assert Feature(
+        type="Feature", properties=None, bbox=(0, 0, 100, 100), geometry=None
+    )
+    assert Feature(
+        type="Feature", properties=None, bbox=(0, 0, 0, 100, 100, 100), geometry=None
+    )
+
     with pytest.raises(ValidationError):
         # bad bbox2d
         Feature(type="Feature", properties=None, bbox=(100, 100, 0, 0), geometry=None)