From 31c95c10ff8c04c55645da813c5d2df04bdb4ffc Mon Sep 17 00:00:00 2001 From: Pierre Narcisi Date: Thu, 2 Nov 2023 09:40:46 +0100 Subject: [PATCH 1/5] fix warnings --- src/ref_geo/routes.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/ref_geo/routes.py b/src/ref_geo/routes.py index 57b9a2a..c2cb055 100644 --- a/src/ref_geo/routes.py +++ b/src/ref_geo/routes.py @@ -17,10 +17,8 @@ altitude_stmt = sa.select( - [ - sa.column("altitude_min"), - sa.column("altitude_max"), - ] + sa.column("altitude_min"), + sa.column("altitude_max"), ).select_from( func.ref_geo.fct_get_altitude_intersection( func.ST_SetSRID( From aa9b00c484c51989d8b744d0defcdbd7568e4aa1 Mon Sep 17 00:00:00 2001 From: Jacobe2169 Date: Thu, 2 Nov 2023 16:19:01 +0100 Subject: [PATCH 2/5] update sqlAlchemy code for 1.4 --- src/ref_geo/routes.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/ref_geo/routes.py b/src/ref_geo/routes.py index c2cb055..766f733 100644 --- a/src/ref_geo/routes.py +++ b/src/ref_geo/routes.py @@ -16,10 +16,7 @@ routes = Blueprint("ref_geo", __name__) -altitude_stmt = sa.select( - sa.column("altitude_min"), - sa.column("altitude_max"), -).select_from( +altitude_stmt = sa.select(sa.column("altitude_min"), sa.column("altitude_max")).select_from( func.ref_geo.fct_get_altitude_intersection( func.ST_SetSRID( func.ST_GeomFromGeoJSON(sa.bindparam("geojson")), From ce97d830f7f712695bee93fdb2c7659d2fbd94f0 Mon Sep 17 00:00:00 2001 From: Jacobe2169 Date: Wed, 8 Nov 2023 14:19:16 +0100 Subject: [PATCH 3/5] fix warning (text() missing) sqlalchemy 1.4 --- src/ref_geo/utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ref_geo/utils.py b/src/ref_geo/utils.py index ca22786..1a7cca8 100644 --- a/src/ref_geo/utils.py +++ b/src/ref_geo/utils.py @@ -2,10 +2,11 @@ methodes pour ref_geo - recupération du srid local """ +from sqlalchemy import text def get_local_srid(bind): """ permet de récupérer le srid local ( celui de ref_geo.l_areras.geom) """ - return bind.execute("SELECT FIND_SRID('ref_geo', 'l_areas', 'geom')").scalar() + return bind.execute(text("SELECT FIND_SRID('ref_geo', 'l_areas', 'geom')")).scalar() From 4609e1a33ba6575fe8c5320862f5c4dbdc7ae357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lie=20Bouttier?= Date: Fri, 10 Nov 2023 18:26:23 +0100 Subject: [PATCH 4/5] require sqlalchemy>=1.4,<2 --- requirements.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.in b/requirements.in index d26602e..58c4b02 100755 --- a/requirements.in +++ b/requirements.in @@ -2,7 +2,7 @@ alembic flask>=2.1 flask-sqlalchemy python-dotenv -sqlalchemy<2 +sqlalchemy>=1.4,<2 utils-flask-sqlalchemy>=0.3.0 utils-flask-sqlalchemy-geo>=0.2.4 psycopg2 From 6ef43faa424e8052301b059e4d6bbc1d44bbd160 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lie=20Bouttier?= Date: Fri, 10 Nov 2023 18:30:20 +0100 Subject: [PATCH 5/5] ci: add Debian 12, remove Debian 10 --- .github/workflows/pytest.yml | 38 +++++++++--------------------------- 1 file changed, 9 insertions(+), 29 deletions(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 750b800..66b710f 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -17,20 +17,17 @@ jobs: strategy: fail-fast: false matrix: - debian-version: [ '10', '11' ] - sqlalchemy-version: [ '1.3', '1.4' ] - exclude: - - sqlalchemy-version: '1.3' - debian-version: '10' + debian-version: [ '11', '12' ] + sqlalchemy-version: [ '1.4' ] include: - - debian-version: '10' - python-version: '3.7' - postgres-version: '11' - postgis-version: '2.5' - debian-version: '11' python-version: '3.9' postgres-version: '13' postgis-version: '3.2' + - debian-version: '12' + python-version: '3.11' + postgres-version: '15' + postgis-version: '3.3' name: Debian ${{ matrix.debian-version}} - SQLAlchemy ${{ matrix.sqlalchemy-version }} @@ -53,14 +50,9 @@ jobs: --health-retries 5 steps: - - name: Add postgis_raster database extension - if: ${{ matrix.postgis-version >= 3 }} - run: | - psql -h localhost -U geouser -d refgeo -tc 'CREATE EXTENSION "postgis_raster";' - env: - PGPASSWORD: geopasswd - name: Add database extensions run: | + psql -h localhost -U geouser -d refgeo -tc 'CREATE EXTENSION "postgis_raster";' psql -h localhost -U geouser -d refgeo -tc 'CREATE EXTENSION "hstore";' psql -h localhost -U geouser -d refgeo -tc 'CREATE EXTENSION "uuid-ossp";' psql -h localhost -U geouser -d refgeo -tc 'CREATE EXTENSION "pg_trgm";' @@ -80,24 +72,12 @@ jobs: sudo apt update sudo apt install -y libgdal-dev - name: Install dependencies - if: ${{ matrix.sqlalchemy-version == '1.3' }} - run: | - python -m pip install --upgrade pip - python -m pip install \ - -e .[tests] \ - -e dependencies/Utils-Flask-SQLAlchemy \ - -e dependencies/Utils-Flask-SQLAlchemy-Geo \ - 'sqlalchemy>=1.3,<1.4' \ - 'flask-sqlalchemy<3' - - name: Install dependencies - if: ${{ matrix.sqlalchemy-version == '1.4' }} run: | python -m pip install --upgrade pip python -m pip install \ -e .[tests] \ -e dependencies/Utils-Flask-SQLAlchemy \ - -e dependencies/Utils-Flask-SQLAlchemy-Geo \ - 'sqlalchemy>=1.4,<2' + -e dependencies/Utils-Flask-SQLAlchemy-Geo - name: Show database branches and dependencies run: | flask db status --dependencies @@ -113,7 +93,7 @@ jobs: run: | pytest -v --cov --cov-report xml - name: Upload coverage to Codecov - if: ${{ matrix.debian-version == '11' && matrix.sqlalchemy-version == '1.4' }} + if: ${{ matrix.debian-version == '12' && matrix.sqlalchemy-version == '1.4' }} uses: codecov/codecov-action@v3 with: flags: pytest