Version 1.5.1

.github/workflows/run-all-tests.yml

@@ -2,14 +2,14 @@
 # run tests and lint with a variety of Python versions
 ---
 name: Tests
 on: [push, pull_request]
 
 jobs:
   cpython:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13-dev']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14-dev']
 
     steps:
       - uses: actions/checkout@v4
@@ -68,7 +68,7 @@
           --cov=tests --cov=pygeoif --cov-report=xml
           --hypothesis-profile=coverage
       - name: "Upload coverage to Codecov"
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           fail_ci_if_error: true
           verbose: true
@@ -96,8 +96,8 @@
       - name: Linting
         run: |
           flake8 pygeoif
-          black --check pygeoif tests
-          ruff --no-fix pygeoif tests
+          ruff format --check pygeoif tests
+          ruff check --no-fix pygeoif tests
           yamllint .github/workflows/
       - name: Check complexity
         run: |
@@ -124,39 +124,70 @@
         run: |
           pytest tests --ignore=tests/hypothesis
 
-  publish:
-    if: "github.event_name == 'push' && github.repository == 'cleder/pygeoif'"
-    needs: [cpython, static-tests, pypy, hypothesis-tests]
-    name: Build and publish to PyPI and TestPyPI
+  build-and-check-package:
+    name: Build & inspect our package.
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python 3.12
-        uses: actions/setup-python@v5
+      - name: Install uv
+        uses: astral-sh/setup-uv@v3
+      - uses: hynek/build-and-inspect-python-package@v2
+      - uses: actions/setup-python@v5
         with:
-          python-version: 3.12
-      - name: Install pypa/build
-        run: >-
-          python -m
-          pip install
-          build
-          --user
-      - name: Build a binary wheel and a source tarball
-        run: >-
-          python -m
-          build
-          --sdist
-          --wheel
-          --outdir dist/
-      - name: Publish distribution 📦 to Test PyPI for tags
-        if: startsWith(github.ref, 'refs/tags')
-        uses: pypa/gh-action-pypi-publish@master
+          python-version-file: "pyproject.toml"
+      - name: Check with pyroma
+        run: |
+          uv tool run pyroma .
+      - name: Check tag name
+        if: >-
+          github.event_name == 'push' &&
+          startsWith(github.ref, 'refs/tags')
+        run: |
+          uv tool run vercheck $GITHUB_REF_NAME pygeoif/about.py
+
+
+  test-publish:
+    if: >-
+        github.event_name == 'push' &&
+        github.repository == 'cleder/pygeoif' &&
+        startsWith(github.ref, 'refs/tags')
+    needs: [build-and-check-package, pypy, test-coverage, hypothesis-tests, cpython, static-tests]
+    name: Test install on TestPyPI
+    runs-on: ubuntu-latest
+    environment: test-release
+    permissions:
+      id-token: write
+    steps:
+      - name: Download packages built by build-and-check-package
+        uses: actions/download-artifact@v4
         with:
-          password: ${{ secrets.TEST_PYPI_API_TOKEN }}
-          repository_url: https://test.pypi.org/legacy/
-      - name: Publish distribution 📦 to PyPI for push to main
-        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-        uses: pypa/gh-action-pypi-publish@master
+          name: Packages
+          path: dist
+
+      - name: Upload package to Test PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          repository-url: https://test.pypi.org/legacy/
+
+  publish:
+    if: >-
+      github.event_name == 'push' &&
+      github.repository == 'cleder/pygeoif' &&
+      github.ref == 'refs/heads/main'
+    needs: [build-and-check-package, pypy, test-coverage, hypothesis-tests, cpython, static-tests]
+    name: Publish to PyPI
+    runs-on: ubuntu-latest
+    environment: release
+    permissions:
+      id-token: write
+    steps:
+      - name: Download packages built by build-and-check-package
+        uses: actions/download-artifact@v4
         with:
-          password: ${{ secrets.PYPI_API_TOKEN }}
+          name: Packages
+          path: dist
+
+      - name: Publish distribution 📦 to PyPI for push to main
+        uses: pypa/gh-action-pypi-publish@release/v1
+
 ...

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ repos:
     hooks:
       - id: check-useless-excludes
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: check-added-large-files
       - id: check-docstring-first
@@ -35,17 +35,18 @@ repos:
     rev: 5.13.2
     hooks:
       - id: isort
-  - repo: https://github.com/psf/black
-    rev: 24.4.2
-    hooks:
-      - id: black
+#   - repo: https://github.com/PyCQA/docformatter
+#     rev: v1.7.5
+#     hooks:
+#       - id: docformatter
+#         args: [--in-place, --make-summary-multi-line, --close-quotes-on-newline, --wrap-summaries, "88"]
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.4.3'
+    rev: 'v0.8.1'
     hooks:
       - id: ruff
-        args: [--fix, --exit-non-zero-on-fix]
+      - id: ruff-format
   - repo: https://github.com/PyCQA/flake8
-    rev: 7.0.0
+    rev: 7.1.1
     hooks:
       - id: flake8
         additional_dependencies:
@@ -68,7 +69,7 @@ repos:
           - flake8-typing-imports
           - flake8-use-fstring
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.10.0
+    rev: v1.13.0
     hooks:
       - id: mypy
         additional_dependencies:
@@ -78,15 +79,15 @@ repos:
   #   hooks:
   #     - id: rst-linter
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.16
+    rev: v0.23
     hooks:
       - id: validate-pyproject
   - repo: https://github.com/kieran-ryan/pyprojectsort
     rev: v0.3.0
     hooks:
       - id: pyprojectsort
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: "0.28.2"
+    rev: "0.30.0"
     hooks:
       - id: check-github-workflows
       - id: check-github-actions

README.rst

@@ -38,7 +38,7 @@ testing with Hypothesis_.
 
 It was written to provide clean and python only geometries for fastkml_
 
-|doc| |test| |cov| |hypothesis| |black| |mypy| |openhub| |factor| |commit| |py| |implement| |latest| |license| |downloads|
+|doc| |test| |cov| |hypothesis| |black| |mypy| |openhub| |factor| |commit| |py| |implement| |latest| |conda| |license| |downloads|
 
 .. |doc| image:: https://readthedocs.org/projects/pygeoif/badge/?version=latest
     :target: https://pygeoif.readthedocs.io/en/latest/?badge=latest
@@ -79,6 +79,9 @@ It was written to provide clean and python only geometries for fastkml_
 .. |py| image:: https://img.shields.io/pypi/pyversions/pygeoif.svg
     :target: https://pypi.python.org/pypi/pygeoif/
     :alt: Supported Python versions
+.. |conda| image:: https://img.shields.io/conda/vn/conda-forge/pygeoif.svg
+    :target: https://anaconda.org/conda-forge/pygeoif
+    :alt: Conda Version
 
 .. |implement| image:: https://img.shields.io/pypi/implementation/pygeoif.svg
     :target: https://pypi.python.org/pypi/pygeoif/
@@ -93,7 +96,7 @@ It was written to provide clean and python only geometries for fastkml_
     :alt: License
 
 .. |downloads| image:: https://img.shields.io/pypi/dm/pygeoif.svg
-    :target: https://pypi.python.org/pypi/pygeoif/
+    :target: https://www.pepy.tech/projects/pygeoif
     :alt: Downloads
 
 Installation
@@ -215,11 +218,6 @@ exterior : LinearRing
     The ring which bounds the positive space of the polygon.
 interiors : sequence
     A sequence of rings which bound all existing holes.
-maybe_valid: boolean
-    When a polygon has obvious problems such as self crossing
-    lines or holes that are outside the exterior bounds this will
-    return False. Even if this returns True the geometry may still be invalid,
-    but if this returns False you do have a problem.
 
 MultiPoint
 ----------

docs/HISTORY.rst

@@ -1,6 +1,21 @@
 Changelog
 =========
 
+1.6.0 (unreleased)
+------------------
+
+
+1.5.1 (2024/12/05)
+------------------
+
+- expose ``force_2d`` and ``force_3d`` factories in the top-level module.
+- fix WKT parsing for nested GeometryCollections.
+- fix WKT output for MultiPoints.
+- make hypothesis strategy for GeometryCollections recursive, so that it can generate
+  nested collections.
+- add Python 3.14 to test matrix.
+
+
 1.5.0 (2024/05/11)
 ------------------
 

docs/conf.py

@@ -28,6 +28,7 @@
     "sphinx.ext.doctest",
     "sphinx.ext.autodoc",
     "sphinx.ext.autosummary",
+    "sphinx.ext.viewcode",
 ]
 
 templates_path = ["_templates"]
@@ -48,3 +49,11 @@
     pass
 
 autodoc_member_order = "bysource"
+
+html_context = {
+    "display_github": True,  # Integrate GitHub
+    "github_user": "cleder",  # Username
+    "github_repo": "pygeoif",  # Repo name
+    "github_version": "main",  # Version
+    "conf_py_path": "/docs/",  # Path in the checkout to the docs root
+}

pygeoif/__init__.py

@@ -16,7 +16,10 @@
 #   Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 """PyGeoIf provides a GeoJSON-like protocol for geo-spatial (GIS) vector data."""
+
 from pygeoif.about import __version__  # noqa: F401
+from pygeoif.factories import force_2d
+from pygeoif.factories import force_3d
 from pygeoif.factories import from_wkt
 from pygeoif.factories import mapping
 from pygeoif.factories import orient
@@ -43,6 +46,8 @@
     "MultiPolygon",
     "Point",
     "Polygon",
+    "force_2d",
+    "force_3d",
     "from_wkt",
     "mapping",
     "orient",

pygeoif/about.py

@@ -4,4 +4,4 @@
 The only purpose of this module is to provide a version number for the package.
 """
 
-__version__ = "1.5.0"
+__version__ = "1.5.1"