From 014152ad33f8317441c5b5a50fc9da6f65235348 Mon Sep 17 00:00:00 2001 From: jacquesfize Date: Tue, 28 Apr 2026 10:14:38 +0200 Subject: [PATCH 1/5] update conftest Co-authored-by: Copilot --- src/pypn_habref_api/tests/conftest.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pypn_habref_api/tests/conftest.py b/src/pypn_habref_api/tests/conftest.py index 8b9b49b..ed28f0d 100644 --- a/src/pypn_habref_api/tests/conftest.py +++ b/src/pypn_habref_api/tests/conftest.py @@ -1,10 +1,12 @@ import pytest from flask import request -from utils_flask_sqla.tests.utils import JSONClient +from utils_flask_sqla.tests.utils import JSONClient, TestSession from pypn_habref_api import create_app from pypn_habref_api.env import db +db.session = db._make_scoped_session({"class_": TestSession}) + @pytest.fixture(scope="session") def _app(): From 8876177568ad2a83267caacc404a946466681051 Mon Sep 17 00:00:00 2001 From: jacquesfize Date: Tue, 28 Apr 2026 10:20:06 +0200 Subject: [PATCH 2/5] update CI --- .github/workflows/pytest.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 56ef596..db86b01 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: debian-version: ["12", "13"] - sqlalchemy-version: ["1.4"] + sqlalchemy-version: ["2.0"] include: - debian-version: "12" python-version: "3.11" @@ -27,7 +27,8 @@ jobs: python-version: "3.13" postgres-version: "17-trixie" - name: Debian ${{ matrix.debian-version }} - SQLAlchemy ${{ matrix.sqlalchemy-version }} + name: Debian ${{ matrix.debian-version }} - SQLAlchemy ${{ + matrix.sqlalchemy-version }} services: postgres: @@ -37,9 +38,7 @@ jobs: ports: - 5432:5432 options: >- - --health-cmd pg_isready - --health-interval 10s - --health-timeout 5s + --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 steps: @@ -48,7 +47,7 @@ jobs: psql -h localhost -U postgres -d postgres -tc 'CREATE EXTENSION "pg_trgm";' env: PGPASSWORD: postgres - - uses: actions/checkout@v3 + - uses: actions/checkout@v6 with: submodules: recursive - name: Set up Python ${{ matrix.python-version }} @@ -56,7 +55,6 @@ jobs: with: python-version: ${{ matrix.python-version }} - name: Install dependencies - if: ${{ matrix.sqlalchemy-version == '1.4' }} run: | python -m pip install --upgrade pip python -m pip install -r requirements-dev.txt @@ -73,7 +71,7 @@ jobs: env: HABREF_SETTINGS: test_settings.py - name: Upload coverage to Codecov - if: ${{ matrix.debian-version == '11' && matrix.sqlalchemy-version == '1.4' }} - uses: codecov/codecov-action@v3 + if: ${{ matrix.debian-version == '11'}} + uses: codecov/codecov-action@v7 with: flags: pytest From 893c2a776072fde39facddc50244cb0db67a4964 Mon Sep 17 00:00:00 2001 From: jacquesfize Date: Wed, 10 Jun 2026 16:43:02 +0200 Subject: [PATCH 3/5] fix: update sqlalchemy version --- dependencies/Utils-Flask-SQLAlchemy | 2 +- pyproject.toml | 2 +- requirements-dev.txt | 62 +++++++---------------------- 3 files changed, 17 insertions(+), 49 deletions(-) diff --git a/dependencies/Utils-Flask-SQLAlchemy b/dependencies/Utils-Flask-SQLAlchemy index 48d3c35..119cbdd 160000 --- a/dependencies/Utils-Flask-SQLAlchemy +++ b/dependencies/Utils-Flask-SQLAlchemy @@ -1 +1 @@ -Subproject commit 48d3c354ac980834dc16ac67e1f70675b32b17c6 +Subproject commit 119cbddd46ef32e77bed35a04d0e098ab8fc13c0 diff --git a/pyproject.toml b/pyproject.toml index de993c7..3845a99 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,7 @@ dependencies = [ "flask-sqlalchemy", "flask-marshmallow", "python-dotenv", - "sqlalchemy>=1.4,<2", + "sqlalchemy<3", "utils-flask-sqlalchemy>=0.4.2", "psycopg2", ] diff --git a/requirements-dev.txt b/requirements-dev.txt index c39333f..b38b9e2 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,52 +1,33 @@ # This file was autogenerated by uv via the following command: -# uv pip compile requirements-dev.in pyproject.toml -o requirements-dev.txt +# uv pip compile pyproject.toml requirements-dev.in -o requirements-dev.txt -e file:dependencies/Utils-Flask-SQLAlchemy#egg=utils-flask-sqlalchemy # via # -r requirements-dev.in - # pypn-ref-geo (pyproject.toml) - # utils-flask-sqlalchemy-geo + # pypn-habref-api (pyproject.toml) alembic==1.18.4 # via - # pypn-ref-geo (pyproject.toml) + # pypn-habref-api (pyproject.toml) # flask-migrate -attrs==26.1.0 - # via fiona blinker==1.9.0 # via flask -certifi==2026.5.20 - # via fiona click==8.4.1 - # via - # click-plugins - # cligj - # fiona - # flask -click-plugins==1.1.1.2 - # via fiona -cligj==0.7.2 - # via fiona -fiona==1.10.1 - # via utils-flask-sqlalchemy-geo + # via flask flask==3.1.3 # via - # pypn-ref-geo (pyproject.toml) + # pypn-habref-api (pyproject.toml) # flask-marshmallow # flask-migrate # flask-sqlalchemy # utils-flask-sqlalchemy flask-marshmallow==1.5.0 - # via pypn-ref-geo (pyproject.toml) + # via pypn-habref-api (pyproject.toml) flask-migrate==4.1.0 # via utils-flask-sqlalchemy -flask-sqlalchemy==3.0.5 +flask-sqlalchemy==3.1.1 # via - # pypn-ref-geo (pyproject.toml) + # pypn-habref-api (pyproject.toml) # flask-migrate # utils-flask-sqlalchemy -geoalchemy2==0.20.0 - # via utils-flask-sqlalchemy-geo -geojson==3.3.0 - # via utils-flask-sqlalchemy-geo greenlet==3.5.1 # via sqlalchemy itsdangerous==2.2.0 @@ -64,37 +45,24 @@ markupsafe==3.0.3 marshmallow==4.3.0 # via # flask-marshmallow - # marshmallow-sqlalchemy # utils-flask-sqlalchemy - # utils-flask-sqlalchemy-geo -marshmallow-sqlalchemy==1.5.0 - # via utils-flask-sqlalchemy-geo -numpy==2.4.6 - # via shapely -packaging==26.2 - # via geoalchemy2 psycopg2==2.9.12 - # via pypn-ref-geo (pyproject.toml) + # via pypn-habref-api (pyproject.toml) python-dateutil==2.9.0.post0 # via utils-flask-sqlalchemy python-dotenv==1.2.2 - # via pypn-ref-geo (pyproject.toml) -shapely==2.1.2 - # via utils-flask-sqlalchemy-geo + # via pypn-habref-api (pyproject.toml) six==1.17.0 # via python-dateutil -sqlalchemy==1.4.54 +sqlalchemy==2.0.50 # via - # pypn-ref-geo (pyproject.toml) + # pypn-habref-api (pyproject.toml) # alembic # flask-sqlalchemy - # geoalchemy2 - # marshmallow-sqlalchemy # utils-flask-sqlalchemy - # utils-flask-sqlalchemy-geo typing-extensions==4.15.0 - # via alembic -utils-flask-sqlalchemy-geo==0.3.4 - # via pypn-ref-geo (pyproject.toml) + # via + # alembic + # sqlalchemy werkzeug==3.1.8 # via flask From 6c86da10ac237d21bb38e740581347a8ba3f43c5 Mon Sep 17 00:00:00 2001 From: jacquesfize Date: Thu, 13 Aug 2026 11:00:10 +0200 Subject: [PATCH 4/5] chore: bump UtilsFlaskSQLAlchemy --- dependencies/Utils-Flask-SQLAlchemy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/Utils-Flask-SQLAlchemy b/dependencies/Utils-Flask-SQLAlchemy index 119cbdd..3f4f961 160000 --- a/dependencies/Utils-Flask-SQLAlchemy +++ b/dependencies/Utils-Flask-SQLAlchemy @@ -1 +1 @@ -Subproject commit 119cbddd46ef32e77bed35a04d0e098ab8fc13c0 +Subproject commit 3f4f961547f0c2f4fd51a6aa37ed9633d5d5e72e From fffbe14cd41d54e64268047b185ac3d02aa7fef2 Mon Sep 17 00:00:00 2001 From: jacquesfize Date: Thu, 13 Aug 2026 13:55:14 +0200 Subject: [PATCH 5/5] chore: bump VERSION and CHANGELOG and UFSQLA submodule --- VERSION | 2 +- dependencies/Utils-Flask-SQLAlchemy | 2 +- docs/changelog.md | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index b300caa..8f0916f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.4.4 \ No newline at end of file +0.5.0 diff --git a/dependencies/Utils-Flask-SQLAlchemy b/dependencies/Utils-Flask-SQLAlchemy index 3f4f961..ee4fccc 160000 --- a/dependencies/Utils-Flask-SQLAlchemy +++ b/dependencies/Utils-Flask-SQLAlchemy @@ -1 +1 @@ -Subproject commit 3f4f961547f0c2f4fd51a6aa37ed9633d5d5e72e +Subproject commit ee4fcccc19db8cea019577832cc77ebedd47e439 diff --git a/docs/changelog.md b/docs/changelog.md index 7c5c564..5bce252 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,5 +1,11 @@ # CHANGELOG +## 0.5.0 (unreleased) + +**🚀 Nouveautés** + +- Mise à jour de Utils-Flask-SQLAlchemy en version 0.5.0 (#25 par @jacquesfize) + ## 0.4.4 (2026-02-18) **🚀 Nouveautés** @@ -136,4 +142,4 @@ Première version stabilisée du sous-module Habref. - Recherche dans la table `habref` sur l'ensemble des champs - Interrogation de la table `typo_ref` - Recherche d'informations sur un habitat et ses correspondances - - Interrogation auto-complétée et intelligente sur des listes d'habitats créées au préalable \ No newline at end of file + - Interrogation auto-complétée et intelligente sur des listes d'habitats créées au préalable