GeoAlchemy2 0.13.1__tar.gz → 0.13.2__tar.gz

{GeoAlchemy2-0.13.1 → GeoAlchemy2-0.13.2}/.github/workflows/test_and_publish.yml

@@ -17,11 +17,22 @@ jobs:
   # This workflow runs the tests
   tests:
 
+    # Set shell to work properly with Mamba
+    defaults:
+      run:
+        shell: bash -l {0}
+
     # Setup test matrix
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "pypy-3.8"]
+        python-version: [
+          {"pkg_name": "python==3.7.*", "flag": "3.7"},
+          {"pkg_name": "python==3.8.*", "flag": "3.8"},
+          {"pkg_name": "python==3.9.*", "flag": "3.9"},
+          {"pkg_name": "python==3.10.*", "flag": "3.10"},
+          {"pkg_name": "pypy3.8", "flag": "pypy3.8"},
+        ]
 
     # The type of runner that the job will run on
     runs-on: ubuntu-22.04
@@ -47,12 +58,18 @@ jobs:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - uses: actions/checkout@v3
 
-    # Setup Python
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+    # Setup Conda for Python and Pypy
+    - name: Install Conda environment with Micromamba
+      uses: mamba-org/provision-with-micromamba@main
       with:
-        python-version: ${{ matrix.python-version }}
-        architecture: x64
+        environment-file: false
+        environment-name: test_${{ matrix.python-version.flag }}
+        channels: conda-forge,defaults
+        cache-downloads: true
+        extra-specs: |
+          ${{ matrix.python-version.pkg_name }}
+          libspatialite
+          pyproj
 
     # Config PostgreSQL
     - name: Configure PostgreSQL
@@ -63,35 +80,30 @@ jobs:
         # Add PostGIS extension to "gis" database
         psql -h localhost -p 5432 -U gis -d gis -c 'CREATE EXTENSION IF NOT EXISTS postgis;'
 
+        # Drop PostGIS Tiger Geocoder extension to "gis" database
+        psql -h localhost -p 5432 -U gis -d gis -c 'DROP EXTENSION IF EXISTS postgis_tiger_geocoder CASCADE;'
+
     # Check python version
     - name: Display Python version
-      run: python -c "import sys; print(sys.version)"
+      run: |
+        /home/runner/micromamba-bin/micromamba info
+        /home/runner/micromamba-bin/micromamba list
+        python -c "import sys; print(sys.version)"
 
     # Install dependencies
     - name: Install dependencies
       run: |
-        sudo apt-get update
-        sudo apt-get install -y autotools-dev \
-                                git \
-                                libexpat1-dev \
-                                libfreexl-dev \
-                                libgeos-dev \
-                                libproj-dev \
-                                libreadline-dev \
-                                libsqlite3-dev \
-                                libsqlite3-mod-spatialite \
-                                libxml2-dev \
-                                zlib1g-dev
-        pip install --upgrade pip setuptools
+        python -m pip install --upgrade pip setuptools
         pip install tox-gh-actions
 
     # Run the test suite
     - name: Run the tests
       env:
-        SPATIALITE_LIBRARY_PATH: /usr/lib/x86_64-linux-gnu/mod_spatialite.so
+        SPATIALITE_LIBRARY_PATH: /home/runner/micromamba-root/envs/test_${{ matrix.python-version.flag }}/lib/mod_spatialite.so
+        PROJ_LIB: /home/runner/micromamba-root/envs/test_${{ matrix.python-version.flag }}/share/proj
         COVERAGE_FILE: .coverage
       run: |
-        # Run the unit test suite with SQLAlchemy=1.1.2 and then with the latest version of SQLAlchemy
+        # Run the unit test suite with SQLAlchemy=1.4.* and then with the latest version of SQLAlchemy
         tox -vv
 
     # Export coverage to Coveralls
@@ -99,7 +111,7 @@ jobs:
       uses: AndreMiras/coveralls-python-action@v20201129
       with:
         parallel: true
-        flag-name: run-${{ matrix.python-version }}
+        flag-name: run-${{ matrix.python-version.flag }}
 
 
   # This workflow aggregates coverages from all jobs and export it to Coveralls

{GeoAlchemy2-0.13.1 → GeoAlchemy2-0.13.2}/.pre-commit-config.yaml

@@ -1,8 +1,8 @@
 default_language_version:
-  python: python3.7
+  python: python3.8
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.4.0
     hooks:
       - id: check-added-large-files
       - id: check-case-conflict
@@ -13,24 +13,24 @@ repos:
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/pycqa/isort
-    rev: 5.10.1
+    rev: 5.12.0
     hooks:
       - id: isort
   - repo: https://github.com/psf/black
-    rev: 22.6.0
+    rev: 23.1.0
     hooks:
       - id: black
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.1.0
+    rev: v2.2.2
     hooks:
       - id: codespell
   - repo: https://github.com/PyCQA/pydocstyle
-    rev: 6.1.1
+    rev: 6.3.0
     hooks:
       - id: pydocstyle
-        additional_dependencies: ["toml"]
+        additional_dependencies: ["tomli"]
         exclude: "tests"
   - repo: https://github.com/PyCQA/flake8
-    rev: 5.0.4
+    rev: 6.0.0
     hooks:
       - id: flake8

{GeoAlchemy2-0.13.1 → GeoAlchemy2-0.13.2}/GeoAlchemy2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GeoAlchemy2
-Version: 0.13.1
+Version: 0.13.2
 Summary: Using SQLAlchemy with Spatial Databases
 Home-page: https://geoalchemy-2.readthedocs.io/en/latest/
 Author: Eric Lemoine

{GeoAlchemy2-0.13.1 → GeoAlchemy2-0.13.2}/GeoAlchemy2.egg-info/SOURCES.txt

@@ -5,10 +5,14 @@
 .pre-commit-config.yaml
 CHANGES.txt
 COPYING.rst
+GeoAlchemy2_dev.yml
+Issues to add in gallery.txt
 MANIFEST.in
 README.rst
 RELEASE.rst
 TEST.rst
+log.txt
+postgis_functions.txt
 pyproject.toml
 requirements-doc.txt
 requirements-rtd.txt

GeoAlchemy2-0.13.2/GeoAlchemy2_dev.yml

@@ -0,0 +1,8 @@
+name: GeoAlchemy2_dev
+channels:
+  - conda-forge
+dependencies:
+  - libspatialite
+  - python=3.7.*
+  - pyproj
+  - psycopg2

GeoAlchemy2-0.13.2/Issues to add in gallery.txt

@@ -0,0 +1,7 @@
+Issues to add in gallery
+251 ok new
+245
+244 ok new
+220 ok old
+219 ok old
+87

{GeoAlchemy2-0.13.1 → GeoAlchemy2-0.13.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GeoAlchemy2
-Version: 0.13.1
+Version: 0.13.2
 Summary: Using SQLAlchemy with Spatial Databases
 Home-page: https://geoalchemy-2.readthedocs.io/en/latest/
 Author: Eric Lemoine

{GeoAlchemy2-0.13.1 → GeoAlchemy2-0.13.2}/TEST.rst

@@ -22,6 +22,8 @@ Install the Python dependencies::
     $ pip install -r requirements.txt
     $ pip install psycopg2
 
+Or you can use the Conda environment provided in the `GeoAlchemy2_dev.yml` file.
+
 Set up the PostGIS database
 ===========================
 

{GeoAlchemy2-0.13.1 → GeoAlchemy2-0.13.2}/geoalchemy2/alembic_helpers.py

@@ -41,11 +41,14 @@ def _monkey_patch_get_indexes_for_sqlite():
     def spatial_behavior(self, connection, table_name, schema=None, **kw):
         indexes = self._get_indexes_normal_behavior(connection, table_name, schema=None, **kw)
 
-        # Check that SpatiaLite was loaded into the DB
-        is_spatial_db = connection.exec_driver_sql(
-            """PRAGMA main.table_info(geometry_columns)"""
-        ).fetchall()
-        if not is_spatial_db:
+        try:
+            # Check that SpatiaLite was loaded into the DB
+            is_spatial_db = connection.exec_driver_sql(
+                """PRAGMA main.table_info(geometry_columns)"""
+            ).fetchall()
+            if not is_spatial_db:
+                return indexes
+        except AttributeError:
             return indexes
 
         # Get spatial indexes

{GeoAlchemy2-0.13.1 → GeoAlchemy2-0.13.2}/geoalchemy2/comparator.py

@@ -77,7 +77,6 @@ class BaseComparator(UserDefinedType.Comparator):
     key = None
 
     def __getattr__(self, name):
-
         # Function names that don't start with "ST_" are rejected.
         # This is not to mess up with SQLAlchemy's use of
         # hasattr/getattr on Column objects.

{GeoAlchemy2-0.13.1 → GeoAlchemy2-0.13.2}/geoalchemy2/dialects/sqlite.py

@@ -2,9 +2,11 @@
 import os
 
 from sqlalchemy import text
+from sqlalchemy.ext.compiler import compiles
 from sqlalchemy.sql import func
 from sqlalchemy.sql import select
 
+from geoalchemy2 import functions
 from geoalchemy2.dialects.common import _check_spatial_type
 from geoalchemy2.dialects.common import _format_select_args
 from geoalchemy2.dialects.common import _spatial_idx_name
@@ -185,8 +187,7 @@ def after_create(table, bind, **kw):
             col.type = col._actual_type
             del col._actual_type
             dimension = get_col_dim(col)
-            args = [table.schema] if table.schema else []
-            args.extend([table.name, col.name, col.type.srid, col.type.geometry_type, dimension])
+            args = [table.name, col.name, col.type.srid, col.type.geometry_type, dimension]
 
             stmt = select(*_format_select_args(func.RecoverGeometryColumn(*args)))
             stmt = stmt.execution_options(autocommit=True)
@@ -211,8 +212,7 @@ def before_drop(table, bind, **kw):
         # Disable spatial indexes if present
         disable_spatial_index(bind, table, col)
 
-        args = [table.schema] if table.schema else []
-        args.extend([table.name, col.name])
+        args = [table.name, col.name]
 
         stmt = select(*_format_select_args(func.DiscardGeometryColumn(*args)))
         stmt = stmt.execution_options(autocommit=True)
@@ -222,3 +222,40 @@ def before_drop(table, bind, **kw):
 def after_drop(table, bind, **kw):
     """Handle spatial indexes during the after_drop event."""
     table.columns = table.info.pop("_saved_columns")
+
+
+# Define compiled versions for functions in SpatiaLite whose names don't have
+# the ST_ prefix.
+_SQLITE_FUNCTIONS = {
+    "ST_GeomFromEWKT": "GeomFromEWKT",
+    "ST_GeomFromEWKB": "GeomFromEWKB",
+    "ST_AsBinary": "AsBinary",
+    "ST_AsEWKB": "AsEWKB",
+    "ST_AsGeoJSON": "AsGeoJSON",
+}
+
+
+def _compiles_sqlite(cls, fn):
+    def _compile_sqlite(element, compiler, **kw):
+        return "{}({})".format(fn, compiler.process(element.clauses, **kw))
+
+    compiles(getattr(functions, cls), "sqlite")(_compile_sqlite)
+
+
+def register_sqlite_mapping(mapping):
+    """Register compilation mappings for the given functions.
+
+    Args:
+        mapping: Should have the following form::
+
+                {
+                    "function_name_1": "sqlite_function_name_1",
+                    "function_name_2": "sqlite_function_name_2",
+                    ...
+                }
+    """
+    for cls, fn in mapping.items():
+        _compiles_sqlite(cls, fn)
+
+
+register_sqlite_mapping(_SQLITE_FUNCTIONS)

{GeoAlchemy2-0.13.1 → GeoAlchemy2-0.13.2}/geoalchemy2/functions.py

@@ -125,7 +125,6 @@ except ImportError:
 
 
 class TableRowElement(ColumnElement):
-
     inherit_cache = False
     """The cache is disabled for this class."""
 
@@ -278,54 +277,3 @@ for name, type_, doc in _FUNCTIONS:
         attributes["__doc__"] = "\n\n".join(docs)
 
     globals()[name] = type(name, (GenericFunction,), attributes)
-
-
-#
-# Define compiled versions for functions in SpatiaLite whose names don't have
-# the ST_ prefix.
-#
-
-
-_SQLITE_FUNCTIONS = {
-    "ST_GeomFromEWKT": "GeomFromEWKT",
-    "ST_GeomFromEWKB": "GeomFromEWKB",
-    "ST_AsBinary": "AsBinary",
-    "ST_AsEWKB": "AsEWKB",
-    "ST_AsGeoJSON": "AsGeoJSON",
-}
-
-
-# Default handlers are required for SQLAlchemy < 1.1
-# See more details in https://github.com/geoalchemy/geoalchemy2/issues/213
-def _compiles_default(cls):
-    def _compile_default(element, compiler, **kw):
-        return "{}({})".format(cls, compiler.process(element.clauses, **kw))
-
-    compiles(globals()[cls])(_compile_default)
-
-
-def _compiles_sqlite(cls, fn):
-    def _compile_sqlite(element, compiler, **kw):
-        return "{}({})".format(fn, compiler.process(element.clauses, **kw))
-
-    compiles(globals()[cls], "sqlite")(_compile_sqlite)
-
-
-def register_sqlite_mapping(mapping):
-    """Register compilation mappings for the given functions.
-
-    Args:
-        mapping: Should have the following form::
-
-                {
-                    "function_name_1": "sqlite_function_name_1",
-                    "function_name_2": "sqlite_function_name_2",
-                    ...
-                }
-    """
-    for cls, fn in mapping.items():
-        _compiles_default(cls)
-        _compiles_sqlite(cls, fn)
-
-
-register_sqlite_mapping(_SQLITE_FUNCTIONS)

GeoAlchemy2-0.13.2/log.txt

@@ -0,0 +1 @@
+2022/08/10 19:27:05 Micro started

GeoAlchemy2-0.13.2/postgis_functions.txt

@@ -0,0 +1,199 @@
+SELECT DISTINCT p.proname AS function_name, t.typname AS return_type
+FROM pg_catalog.pg_extension AS e
+    INNER JOIN pg_catalog.pg_depend AS d ON (d.refobjid = e.oid)
+    INNER JOIN pg_catalog.pg_proc AS p ON (p.oid = d.objid)
+    INNER JOIN pg_type AS t ON (t.oid = p.prorettype)
+WHERE e.extname = 'postgis' AND d.deptype = 'e' AND (t.typname = 'geometry' OR t.typname = 'geography')
+ORDER BY 1, 2;
++----------------------------------+---------------+
+| function_name                    | return_type   |
+|----------------------------------+---------------|
+| _st_concavehull                  | geometry      |
+| _st_expand                       | geography     |
+| _st_geomfromgml                  | geometry      |
+| _st_longestline                  | geometry      |
+| _st_pointoutside                 | geography     |
+| _st_voronoi                      | geometry      |
+| geography                        | geography     |
+| geography_in                     | geography     |
+| geography_recv                   | geography     |
+| geometry                         | geometry      |
+| geometry_in                      | geometry      |
+| geometry_recv                    | geometry      |
+| geomfromewkb                     | geometry      |
+| geomfromewkt                     | geometry      |
+| pgis_geometry_collect_finalfn    | geometry      |
+| pgis_geometry_makeline_finalfn   | geometry      |
+| pgis_geometry_polygonize_finalfn | geometry      |
+| pgis_geometry_union_finalfn      | geometry      |
+| postgis_addbbox                  | geometry      |
+| postgis_dropbbox                 | geometry      |
+| postgis_geos_noop                | geometry      |
+| postgis_noop                     | geometry      |
+| postgis_transform_geometry       | geometry      |
+| st_3dclosestpoint                | geometry      |
+| st_3dlineinterpolatepoint        | geometry      |
+| st_3dlongestline                 | geometry      |
+| st_3dshortestline                | geometry      |
+| st_addmeasure                    | geometry      |
+| st_addpoint                      | geometry      |
+| st_affine                        | geometry      |
+| st_asmvtgeom                     | geometry      |
+| st_bdmpolyfromtext               | geometry      |
+| st_bdpolyfromtext                | geometry      |
+| st_boundary                      | geometry      |
+| st_boundingdiagonal              | geometry      |
+| st_buffer                        | geography     |
+| st_buffer                        | geometry      |
+| st_buildarea                     | geometry      |
+| st_centroid                      | geography     |
+| st_centroid                      | geometry      |
+| st_chaikinsmoothing              | geometry      |
+| st_cleangeometry                 | geometry      |
+| st_clipbybox2d                   | geometry      |
+| st_closestpoint                  | geometry      |
+| st_collect                       | geometry      |
+| st_collectionextract             | geometry      |
+| st_collectionhomogenize          | geometry      |
+| st_concavehull                   | geometry      |
+| st_convexhull                    | geometry      |
+| st_curvetoline                   | geometry      |
+| st_delaunaytriangles             | geometry      |
+| st_difference                    | geometry      |
+| st_endpoint                      | geometry      |
+| st_envelope                      | geometry      |
+| st_expand                        | geometry      |
+| st_exteriorring                  | geometry      |
+| st_filterbym                     | geometry      |
+| st_flipcoordinates               | geometry      |
+| st_force2d                       | geometry      |
+| st_force3d                       | geometry      |
+| st_force3dm                      | geometry      |
+| st_force3dz                      | geometry      |
+| st_force4d                       | geometry      |
+| st_forcecollection               | geometry      |
+| st_forcecurve                    | geometry      |
+| st_forcepolygonccw               | geometry      |
+| st_forcepolygoncw                | geometry      |
+| st_forcerhr                      | geometry      |
+| st_forcesfs                      | geometry      |
+| st_generatepoints                | geometry      |
+| st_geogfromtext                  | geography     |
+| st_geogfromwkb                   | geography     |
+| st_geographyfromtext             | geography     |
+| st_geomcollfromtext              | geometry      |
+| st_geomcollfromwkb               | geometry      |
+| st_geometricmedian               | geometry      |
+| st_geometryfromtext              | geometry      |
+| st_geometryn                     | geometry      |
+| st_geomfromewkb                  | geometry      |
+| st_geomfromewkt                  | geometry      |
+| st_geomfromgeohash               | geometry      |
+| st_geomfromgeojson               | geometry      |
+| st_geomfromgml                   | geometry      |
+| st_geomfromkml                   | geometry      |
+| st_geomfromtext                  | geometry      |
+| st_geomfromtwkb                  | geometry      |
+| st_geomfromwkb                   | geometry      |
+| st_gmltosql                      | geometry      |
+| st_interiorringn                 | geometry      |
+| st_intersection                  | geography     |
+| st_intersection                  | geometry      |
+| st_linefromencodedpolyline       | geometry      |
+| st_linefrommultipoint            | geometry      |
+| st_linefromtext                  | geometry      |
+| st_linefromwkb                   | geometry      |
+| st_lineinterpolatepoint          | geometry      |
+| st_lineinterpolatepoints         | geometry      |
+| st_linemerge                     | geometry      |
+| st_linestringfromwkb             | geometry      |
+| st_linesubstring                 | geometry      |
+| st_linetocurve                   | geometry      |
+| st_locatealong                   | geometry      |
+| st_locatebetween                 | geometry      |
+| st_locatebetweenelevations       | geometry      |
+| st_longestline                   | geometry      |
+| st_makeenvelope                  | geometry      |
+| st_makeline                      | geometry      |
+| st_makepoint                     | geometry      |
+| st_makepointm                    | geometry      |
+| st_makepolygon                   | geometry      |
+| st_makevalid                     | geometry      |
+| st_memcollect                    | geometry      |
+| st_memunion                      | geometry      |
+| st_minimumboundingcircle         | geometry      |
+| st_minimumclearanceline          | geometry      |
+| st_mlinefromtext                 | geometry      |
+| st_mlinefromwkb                  | geometry      |
+| st_mpointfromtext                | geometry      |
+| st_mpointfromwkb                 | geometry      |
+| st_mpolyfromtext                 | geometry      |
+| st_mpolyfromwkb                  | geometry      |
+| st_multi                         | geometry      |
+| st_multilinefromwkb              | geometry      |
+| st_multilinestringfromtext       | geometry      |
+| st_multipointfromtext            | geometry      |
+| st_multipointfromwkb             | geometry      |
+| st_multipolyfromwkb              | geometry      |
+| st_multipolygonfromtext          | geometry      |
+| st_node                          | geometry      |
+| st_normalize                     | geometry      |
+| st_offsetcurve                   | geometry      |
+| st_orientedenvelope              | geometry      |
+| st_patchn                        | geometry      |
+| st_point                         | geometry      |
+| st_pointfromgeohash              | geometry      |
+| st_pointfromtext                 | geometry      |
+| st_pointfromwkb                  | geometry      |
+| st_pointn                        | geometry      |
+| st_pointonsurface                | geometry      |
+| st_points                        | geometry      |
+| st_polyfromtext                  | geometry      |
+| st_polyfromwkb                   | geometry      |
+| st_polygon                       | geometry      |
+| st_polygonfromtext               | geometry      |
+| st_polygonfromwkb                | geometry      |
+| st_polygonize                    | geometry      |
+| st_project                       | geography     |
+| st_quantizecoordinates           | geometry      |
+| st_removepoint                   | geometry      |
+| st_removerepeatedpoints          | geometry      |
+| st_reverse                       | geometry      |
+| st_rotate                        | geometry      |
+| st_rotatex                       | geometry      |
+| st_rotatey                       | geometry      |
+| st_rotatez                       | geometry      |
+| st_scale                         | geometry      |
+| st_segmentize                    | geography     |
+| st_segmentize                    | geometry      |
+| st_seteffectivearea              | geometry      |
+| st_setpoint                      | geometry      |
+| st_setsrid                       | geography     |
+| st_setsrid                       | geometry      |
+| st_sharedpaths                   | geometry      |
+| st_shiftlongitude                | geometry      |
+| st_shortestline                  | geometry      |
+| st_simplify                      | geometry      |
+| st_simplifypreservetopology      | geometry      |
+| st_simplifyvw                    | geometry      |
+| st_snap                          | geometry      |
+| st_snaptogrid                    | geometry      |
+| st_split                         | geometry      |
+| st_startpoint                    | geometry      |
+| st_subdivide                     | geometry      |
+| st_swapordinates                 | geometry      |
+| st_symdifference                 | geometry      |
+| st_symmetricdifference           | geometry      |
+| st_tileenvelope                  | geometry      |
+| st_transform                     | geometry      |
+| st_translate                     | geometry      |
+| st_transscale                    | geometry      |
+| st_unaryunion                    | geometry      |
+| st_union                         | geometry      |
+| st_voronoilines                  | geometry      |
+| st_voronoipolygons               | geometry      |
+| st_wkbtosql                      | geometry      |
+| st_wkttosql                      | geometry      |
+| st_wrapx                         | geometry      |
++----------------------------------+---------------+
+SELECT 187