Merge pull request #59 from PnX-SI/develop

1.6.0
PnX-SI · Jan 30, 2024 · b3f628b · b3f628b
2 parents f9102ca + f125890
commit b3f628b
Show file tree

Hide file tree

Showing 21 changed files with 463 additions and 103 deletions.
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -18,28 +18,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        debian-version: [ "10", "11" ]
-        sqlalchemy-version: [ "1.3", "1.4" ]
+        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
-          - sqlalchemy-version: '1.3'
-            sqlalchemy-lt-version: '1.4'
-            flask-sqlalchemy-version: '2'
-            flask-sqlalchemy-lt-version: '3'
-          - sqlalchemy-version: '1.4'
-            sqlalchemy-lt-version: '2'
-            flask-sqlalchemy-version: '3'
-            flask-sqlalchemy-lt-version: '4'
-        exclude:
-          - debian-version: "10"
-            sqlalchemy-version: "1.4"
+            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 }}
 
@@ -59,16 +48,12 @@ jobs:
           --health-retries 5
 
     steps:
-    - name: Add postgis_raster database extension
-      if: ${{ matrix.postgis-version >= 3 }}
-      run: |
-        psql -h localhost -U postgres -d postgres -tc 'CREATE EXTENSION "postgis_raster";'
-      env:
-        PGPASSWORD: postgres
     - name: Add database extensions
       run: |
+        psql -h localhost -U postgres -d postgres -tc 'CREATE EXTENSION "postgis_raster";'
         psql -h localhost -U postgres -d postgres -tc 'CREATE EXTENSION "uuid-ossp";'
         psql -h localhost -U postgres -d postgres -tc 'CREATE EXTENSION "pg_trgm";'
+        psql -h localhost -U postgres -d postgres -tc 'CREATE EXTENSION "unaccent";'
       env:
         PGPASSWORD: postgres
     - uses: actions/checkout@v2
@@ -86,11 +71,10 @@ jobs:
           -e .[tests] \
           -e file:dependencies/Utils-Flask-SQLAlchemy#egg=utils-flask-sqlalchemy \
           -e file:dependencies/TaxHub#egg=taxhub \
-          -e file:dependencies/UsersHub-authentification-module#egg=pypnusershub \
-          "sqlalchemy>=${{ matrix.sqlalchemy-version }},<${{ matrix.sqlalchemy-lt-version }}" \
-          "flask-sqlalchemy>=${{ matrix.flask-sqlalchemy-version }},<${{ matrix.flask-sqlalchemy-lt-version }}"
+          -e file:dependencies/UsersHub-authentification-module#egg=pypnusershub
     - name: Install database
       run: |
+        flask db upgrade taxonomie@head -x local-srid=2154
         flask db upgrade ref_geo@head -x local-srid=2154
         flask db upgrade nomenclatures_taxonomie@head
         flask db autoupgrade
@@ -104,7 +88,7 @@ jobs:
       env:
         NOMENCLATURE_SETTINGS: test_settings.py
     - 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
diff --git a/dependencies/TaxHub b/dependencies/TaxHub
diff --git a/dependencies/UsersHub-authentification-module b/dependencies/UsersHub-authentification-module
diff --git a/dependencies/Utils-Flask-SQLAlchemy b/dependencies/Utils-Flask-SQLAlchemy
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -2,44 +2,56 @@
 CHANGELOG
 =========
 
+1.6.0 (2024-01-30)
+------------------
+
+**🚀 Nouveautés**
+
+- Mise à jour de SQLAlchemy version 1.3 à 1.4 (#52 et #54)
+- Arrêt du support de Debian 10 (#54)
+- Ajout du support de Debian 12 dans les tests automatisés (#54)
+- Ajout de la possibilité d'associer des nomenclatures à des Group3 INPN, en ajoutant le champs ``group3_inpn`` à la table ``cor_taxref_nomenclature`` (#53)
+- Mise à jour des dépendances Python: TaxHub, Utils-Flask-SQLAlchemy, UsersHub-authentification-module 
+
 1.5.4 (2023-03-04)
 ------------------
 
 **🚀 Nouveautés**
 
-* Compatibilité SQLAlchemy 1.4
-* Amélioration de la documentation de ``NomenclaturesMixin``
-* Simplification des modèles et de leur homologue Flask-Admin
-* Mise à jour des dépendances :
+- Compatibilité SQLAlchemy 1.4
+- Amélioration de la documentation de ``NomenclaturesMixin``
+- Simplification des modèles et de leur homologue Flask-Admin
+- Mise à jour des dépendances :
 
-  * TaxHub 1.11.1
-  * UsersHub-authentification-module 1.6.5
-  * Utils-Flask-SQLAlchemy 0.3.2
+  - TaxHub 1.11.1
+  - UsersHub-authentification-module 1.6.5
+  - Utils-Flask-SQLAlchemy 0.3.2
 
 **🐛 Corrections**
 
-* Ajout de shapely<2 aux requirements
+- Ajout de shapely<2 aux requirements
 
 
 1.5.3 (2022-09-01)
 ------------------
 
 **🚀 Nouveautés**
 
-* Ajout du type de nomenclature « Catégorie de liste rouge » et des nomenclatures associées.
-* La branche ``nomenclature_taxonomie_inpn_data`` est renommée en ``nomenclature_taxonomie_data``, et ne dépend plus du référentiel TaxRef qui doit être importé manuellement.
-* Le code est désormais formaté avec Black et une Github Action y veille.
-* Possibilité de filtrer les nomenclatures par code (``cd_nomenclature``).
-* Mise à jour des dépendances :
+- Ajout du type de nomenclature « Catégorie de liste rouge » et des nomenclatures associées.
+- La branche ``nomenclature_taxonomie_inpn_data`` est renommée en ``nomenclature_taxonomie_data``, et ne dépend plus du référentiel TaxRef qui doit être importé manuellement.
+- Le code est désormais formaté avec Black et une Github Action y veille.
+- Possibilité de filtrer les nomenclatures par code (``cd_nomenclature``).
+- Mise à jour des dépendances :
 
-  * Utils-Flask-SQLAlchemy 0.3.0
-  * TaxHub 1.10.0
-  * UsersHub-authentification-module 1.6.0
+  - Utils-Flask-SQLAlchemy 0.3.0
+  - TaxHub 1.10.0
+  - UsersHub-authentification-module 1.6.0
 
 **🐛 Corrections**
 
-* Correction de la définition d’un type de nomenclature
-* Correction des tests unitaires
+- Correction de la définition d’un type de nomenclature
+- Correction des tests unitaires
+
 
 1.5.1 (2022-01-12)
 ------------------

diff --git a/requirements.in b/requirements.in
@@ -6,9 +6,8 @@ flask-migrate
 psycopg2
 flask-marshmallow
 marshmallow-sqlalchemy
-shapely<2
-sqlalchemy>=1.3,<2
+sqlalchemy
 
-utils-flask-sqlalchemy>=0.3.0
-taxhub>=1.10.0
-pypnusershub>=1.6.0
+utils-flask-sqlalchemy>=0.4.1
+taxhub>=1.13.2
+pypnusershub>=2.1.1
diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,213 @@
-Flask-Admin>=1.5.6
-flask-sqlalchemy>=2.3.2
-flask>=1.1.1
-psycopg2>=2.8.5
-sqlalchemy>=1.3.19
-utils-flask-sqlalchemy>=0.1.2
-flask-marshmallow>=0.12.0
+#
+# This file is autogenerated by pip-compile with Python 3.9
+# by the following command:
+#
+#    pip-compile requirements.in
+#
+alembic==1.13.1
+    # via
+    #   flask-migrate
+    #   pypn-ref-geo
+    #   pypnusershub
+attrs==23.2.0
+    # via fiona
+authlib==1.3.0
+    # via pypnusershub
+bcrypt==4.1.2
+    # via pypnusershub
+blinker==1.7.0
+    # via flask
+boto3==1.34.30
+    # via taxhub
+botocore==1.34.30
+    # via
+    #   boto3
+    #   s3transfer
+certifi==2023.11.17
+    # via
+    #   fiona
+    #   requests
+cffi==1.16.0
+    # via cryptography
+charset-normalizer==3.3.2
+    # via requests
+click==8.1.7
+    # via
+    #   click-plugins
+    #   cligj
+    #   fiona
+    #   flask
+    #   taxhub
+click-plugins==1.1.1
+    # via fiona
+cligj==0.7.2
+    # via fiona
+cryptography==42.0.1
+    # via authlib
+fiona==1.9.5
+    # via utils-flask-sqlalchemy-geo
+flask==3.0.1
+    # via
+    #   -r requirements.in
+    #   flask-admin
+    #   flask-cors
+    #   flask-login
+    #   flask-marshmallow
+    #   flask-migrate
+    #   flask-sqlalchemy
+    #   pypn-ref-geo
+    #   pypnusershub
+    #   taxhub
+    #   utils-flask-sqlalchemy
+flask-admin==1.6.1
+    # via -r requirements.in
+flask-cors==4.0.0
+    # via taxhub
+flask-login==0.6.3
+    # via pypnusershub
+flask-marshmallow==1.1.0
+    # via
+    #   -r requirements.in
+    #   pypn-ref-geo
+    #   pypnusershub
+flask-migrate==4.0.5
+    # via
+    #   -r requirements.in
+    #   taxhub
+    #   utils-flask-sqlalchemy
+flask-sqlalchemy==3.0.5
+    # via
+    #   -r requirements.in
+    #   flask-migrate
+    #   pypn-ref-geo
+    #   pypnusershub
+    #   taxhub
+    #   utils-flask-sqlalchemy
+geoalchemy2==0.14.3
+    # via utils-flask-sqlalchemy-geo
+geojson==3.1.0
+    # via utils-flask-sqlalchemy-geo
+greenlet==3.0.3
+    # via sqlalchemy
+gunicorn==21.2.0
+    # via taxhub
+idna==3.6
+    # via requests
+importlib-metadata==7.0.1
+    # via
+    #   fiona
+    #   flask
+itsdangerous==2.1.2
+    # via flask
+jinja2==3.1.3
+    # via flask
+jmespath==1.0.1
+    # via
+    #   boto3
+    #   botocore
+mako==1.3.2
+    # via alembic
+markupsafe==2.1.4
+    # via
+    #   jinja2
+    #   mako
+    #   werkzeug
+    #   wtforms
+marshmallow==3.20.2
+    # via
+    #   flask-marshmallow
+    #   marshmallow-geojson
+    #   marshmallow-sqlalchemy
+    #   utils-flask-sqlalchemy
+marshmallow-geojson==0.5.0
+    # via utils-flask-sqlalchemy-geo
+marshmallow-sqlalchemy==0.30.0
+    # via
+    #   -r requirements.in
+    #   pypnusershub
+    #   taxhub
+    #   utils-flask-sqlalchemy-geo
+numpy==1.26.3
+    # via shapely
+packaging==23.2
+    # via
+    #   geoalchemy2
+    #   gunicorn
+    #   marshmallow
+    #   marshmallow-sqlalchemy
+pillow==10.2.0
+    # via taxhub
+psycopg2==2.9.9
+    # via
+    #   -r requirements.in
+    #   pypn-ref-geo
+    #   pypnusershub
+    #   taxhub
+pycparser==2.21
+    # via cffi
+pypn-ref-geo==1.5.1
+    # via taxhub
+pypnusershub==2.1.1
+    # via
+    #   -r requirements.in
+    #   taxhub
+python-dateutil==2.8.2
+    # via
+    #   botocore
+    #   utils-flask-sqlalchemy
+python-dotenv==1.0.1
+    # via
+    #   -r requirements.in
+    #   pypn-ref-geo
+    #   taxhub
+requests==2.31.0
+    # via pypnusershub
+s3transfer==0.10.0
+    # via boto3
+shapely==2.0.2
+    # via utils-flask-sqlalchemy-geo
+six==1.16.0
+    # via
+    #   fiona
+    #   python-dateutil
+sqlalchemy==1.4.51
+    # via
+    #   -r requirements.in
+    #   alembic
+    #   flask-sqlalchemy
+    #   geoalchemy2
+    #   marshmallow-sqlalchemy
+    #   pypn-ref-geo
+    #   pypnusershub
+    #   taxhub
+    #   utils-flask-sqlalchemy
+    #   utils-flask-sqlalchemy-geo
+taxhub==1.13.2
+    # via -r requirements.in
+typing-extensions==4.9.0
+    # via alembic
+urllib3==1.26.18
+    # via
+    #   botocore
+    #   requests
+    #   taxhub
+utils-flask-sqlalchemy==0.4.1
+    # via
+    #   -r requirements.in
+    #   pypn-ref-geo
+    #   pypnusershub
+    #   taxhub
+    #   utils-flask-sqlalchemy-geo
+utils-flask-sqlalchemy-geo==0.3.1
+    # via pypn-ref-geo
+werkzeug==3.0.1
+    # via
+    #   flask
+    #   flask-login
+wtforms==3.1.2
+    # via flask-admin
+zipp==3.17.0
+    # via importlib-metadata
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools