Merge pull request #19 from PnX-SI/develop

Develop > Master / 2.13.2
PnX-SI · Sep 28, 2023 · 6d82f28 · 6d82f28
2 parents 0b6e40d + 7295db3
commit 6d82f28
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 11 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -51,7 +51,7 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          build-args: GEONATURE_BACKEND_IMAGE=ghcr.io/pnx-si/geonature-backend:2.13.1
+          build-args: GEONATURE_BACKEND_IMAGE=ghcr.io/pnx-si/geonature-backend:2.13.2
 
   frontend:
     name: Build geonature frontend docker image
@@ -92,4 +92,4 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          build-args: GEONATURE_FRONTEND_IMAGE=ghcr.io/pnx-si/geonature-frontend:2.13.1
+          build-args: GEONATURE_FRONTEND_IMAGE=ghcr.io/pnx-si/geonature-frontend:2.13.2
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,23 +1,44 @@
 CHANGELOG
 =========
 
+2.13.2 (2023-09-28)
+------------------
+
+**🏷️ Versions**
+
+- GeoNature 2.13.2
+- TaxHub 1.12.1
+- UsersHub 2.3.4
+- GeoNature-dashboard 1.4.0
+- GeoNature-export 1.6.0
+- GeoNature-import 2.2.3
+- GeoNature-monitoring 0.7.0
+
+**✨ Améliorations**
+
+- Mise à jour de Python en version 3.11 dans l'image Docker de GeoNature (#17)
+
+**🐛 Corrections**
+
+- Correction du chargement de la customisation (au niveau de GeoNature)
+
 0.2.0 (2023-09-19)
 ------------------
 
 **🏷️ Versions**
 
-- GeoNature 2.12.3
+- GeoNature 2.13.1
 - TaxHub 1.12.1
 - UsersHub 2.3.4
 - GeoNature-dashboard 1.4.0
-- GeoNature-export1.6.0
+- GeoNature-export 1.6.0
 - GeoNature-import 2.2.2
 - GeoNature-monitoring 0.7.0
 
 **✨ Améliorations**
 
 - Compléments de la documentation (Redirections, version, rebuild des images)
-- Ajout de variables dans le `.env` pour pouvoir intégrer ou non les données initiales (référentiel de sensibilité, BDC statuts, zonages administratifs, mailles et données d"exemple) 
+- Ajout de variables dans le `.env` pour pouvoir intégrer ou non les données initiales (référentiel de sensibilité, BDC statuts, zonages administratifs, mailles et données d'exemple) 
 
 **🐛 Corrections**
 
@@ -26,7 +47,7 @@ CHANGELOG
 
 **⚠️ Notes de version**
 
-Les modifications suivantes ont été apportées au fichier `docker-comopose.yml` :
+Les modifications suivantes ont été apportées au fichier `docker-compose.yml` :
 
 - Ajout de la variable d’environnement `USERSHUB_FILL_MD5_PASS` au service UsersHub :
   ```
@@ -53,6 +74,6 @@ Première version fonctionnelle de GeoNature-Docker-services, permettant de dép
 - TaxHub 1.12.1
 - UsersHub 2.3.4
 - GeoNature-dashboard 1.4.0
-- GeoNature-export1.6.0
+- GeoNature-export 1.6.0
 - GeoNature-import 2.2.1
 - GeoNature-monitoring 0.7.0
diff --git a/sources/GeoNature b/sources/GeoNature
diff --git a/sources/TaxHub b/sources/TaxHub
diff --git a/sources/UsersHub b/sources/UsersHub
diff --git a/sources/gn_module_import b/sources/gn_module_import
+7 −1		.github/workflows/cypress.yml
+7 −1		.github/workflows/pytest.yml
+1 −1		VERSION
+1 −1		backend/Dockerfile
+1 −1		backend/dependencies/UsersHub-authentification-module
+6 −7		backend/geonature/app.py
+1 −0		backend/geonature/celery_app.py
+7 −7		backend/geonature/core/gn_commons/routes.py
+6 −4		backend/geonature/core/gn_meta/models.py
+12 −1		backend/geonature/core/gn_meta/routes.py
+12 −8		backend/geonature/core/gn_meta/schemas.py
+1 −0		backend/geonature/core/gn_synthese/models.py
+1 −0		backend/geonature/core/gn_synthese/routes.py
+5 −4		backend/geonature/core/gn_synthese/utils/query_select_sqla.py
+183 −0		backend/geonature/migrations/versions/446e902a14e7_add_id_module_to_v_synthese_for_web_app.py
+9 −0		backend/geonature/tasks/__init__.py
+70 −19		backend/geonature/tests/fixtures.py
+19 −0		backend/geonature/tests/test_gn_meta.py
+10 −0		backend/geonature/tests/test_reports.py
+37 −3		backend/geonature/tests/test_synthese.py
+2 −0		backend/geonature/utils/config_schema.py
+1 −1		backend/requirements-dependencies.in
+32 −3		docs/CHANGELOG.md
+23 −21		docs/admin-manual.rst
+2 −2		docs/installation.rst
+64 −39		frontend/src/app/GN2CommonModule/form/datalist/datalist.component.html
+1 −0		frontend/src/app/GN2CommonModule/form/datalist/datalist.component.ts
+1 −0		frontend/src/app/GN2CommonModule/form/dynamic-form/dynamic-form.component.html
+15 −0		frontend/src/app/GN2CommonModule/form/synthese-form/dynamicFormConfig.ts
+1 −1		frontend/src/app/metadataModule/datasets/dataset-card.component.html
+4 −0		frontend/src/app/metadataModule/datasets/dataset-card.component.ts
+1 −1		frontend/src/app/shared/alertInfoModule/alert-Info.component.ts
+7 −1		install/03b_populate_db.sh
+0 −16		install/03b_populate_db_for_test.sh
+1 −1		install/install_all/install_all.ini
+1 −1		VERSION
+6 −1		app/api/route_register.py
+6 −4		app/genericRepository.py
+1 −6		app/models.py
+13 −10		app/t_roles/route.py
+1 −1		app/templates/head-appli.html
+3 −3		app/templates/info_user.html
+1 −1		app/templates/login.html
+11 −0		docs/changelog.rst
+1 −1		install_app.sh
+1 −1		install_db.sh
+14 −9		.github/workflows/pytest.yml
+1 −1		VERSION
+19 −7		backend/gn_module_import/checks/dataframe/__init__.py
+30 −31		backend/gn_module_import/checks/sql/__init__.py
+1 −0		backend/gn_module_import/conf_schema_toml.py
+31 −0		backend/gn_module_import/migrations/2896cf965dd6_unique_import_error.py
+50 −0		backend/gn_module_import/migrations/ea67bf7b6888_remove_cd_fk.py
+1 −0		backend/gn_module_import/models.py
+11 −8		backend/gn_module_import/routes/imports.py
+41 −25		backend/gn_module_import/tasks.py
+5 −3		backend/gn_module_import/tests/files/cd_file.csv
+11 −6		backend/gn_module_import/tests/test_imports.py
+10 −4		backend/gn_module_import/utils.py
+1 −1		dependencies/GeoNature
+18 −0		docs/CHANGELOG.rst
+1 −1		frontend/app/components/modal_dataset/import-modal-dataset.component.html
+1 −1		requirements.in