Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -48,15 +47,14 @@ 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 }}
uses: actions/setup-python@v4
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
Expand All @@ -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
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.4.4
0.5.0
8 changes: 7 additions & 1 deletion docs/changelog.md
Original file line number Diff line number Diff line change
@@ -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**
Expand Down Expand Up @@ -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
- Interrogation auto-complétée et intelligente sur des listes d'habitats créées au préalable
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies = [
"flask-sqlalchemy",
"flask-marshmallow",
"python-dotenv",
"sqlalchemy>=1.4,<2",
"sqlalchemy<3",
"utils-flask-sqlalchemy>=0.4.2",
"psycopg2",
]
Expand Down
62 changes: 15 additions & 47 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
4 changes: 3 additions & 1 deletion src/pypn_habref_api/tests/conftest.py
Original file line number Diff line number Diff line change
@@ -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():
Expand Down
Loading