Skip to content

Commit

Permalink
Merge pull request #19 from PnX-SI/develop
Browse files Browse the repository at this point in the history 
Develop > Master / 2.13.2
  • Loading branch information
@camillemonchicourt
camillemonchicourt authored Sep 28, 2023
2 parents 0b6e40d + 7295db3 commit 6d82f28
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
31 changes: 26 additions & 5 deletions docs/changelog.md
View file
Original file line number Diff line number Diff line change
@@ -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**

Expand All @@ -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 :
```
Expand All @@ -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
2 changes: 1 addition & 1 deletion sources/GeoNature
Submodule GeoNature updated 35 files
+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
2 changes: 1 addition & 1 deletion sources/TaxHub
Submodule TaxHub updated 42 files
+7 −1 .github/workflows/pytest.yml
+1 −1 Dockerfile
+1 −1 VERSION
+65 −0 apptax/migrations/versions/23c25552d707_create_bdc_status_table_if_not_exists.py
+54 −0 apptax/migrations/versions/32c5ed42bdbd_add_table_t_meta_taxref.py
+113 −0 apptax/migrations/versions/3bd542b72955_optimize_vm_taxref_for_autocomplete.py
+70 −0 apptax/migrations/versions/6607b25b2d66_taxref_set_null_to_empty_string.py
+10 −1 apptax/taxonomie/commands/migrate_taxref/commands_v15.py
+11 −4 apptax/taxonomie/commands/migrate_taxref/commands_v16.py
+22 −0 apptax/taxonomie/commands/migrate_taxref/data/5_clean_db.sql
+2 −2 apptax/taxonomie/commands/migrate_taxref/data/specific_taxref_v15_v16/3.2_alter_taxref_data.sql
+7 −1 apptax/taxonomie/commands/taxref.py
+4 −1 apptax/taxonomie/commands/taxref_v15_v16.py
+88 −47 apptax/taxonomie/commands/utils.py
+10 −0 apptax/taxonomie/models.py
+22 −1 apptax/taxonomie/routesbiblistes.py
+6 −2 apptax/taxonomie/routesbibnoms.py
+34 −17 apptax/taxonomie/routestaxref.py
+39 −32 apptax/tests/fixtures.py
+25 −0 apptax/tests/test_bib_noms.py
+27 −0 apptax/tests/test_biblistes.py
+1 −1 apptax/tests/test_media.py
+6 −0 apptax/tests/test_taxref.py
+4 −6 apptax/tests/test_taxref_last_version.py
+6 −2 apptax/utils/utilssqlalchemy.py
+1 −1 data/scripts/update_taxref/apply_changes.sh
+1 −1 data/scripts/update_taxref/clean_db.sh
+2 −2 data/scripts/update_taxref/import_taxref_v11_data.sh
+2 −2 data/scripts/update_taxref/import_taxref_v13_data.sh
+1 −1 data/scripts/update_taxref/import_taxref_v14.sh
+1 −1 dependencies/UsersHub-authentification-module
+1 −1 dependencies/Utils-Flask-SQLAlchemy
+1 −1 dependencies/Utils-Flask-SQLAlchemy-Geo
+15 −5 docs/auteurs.rst
+1,232 −0 docs/changelog.md
+0 −862 docs/changelog.rst
+1 −1 install_app.sh
+1 −1 install_db.sh
+1 −1 requirements-dependencies.in
+67 −63 requirements-dev.txt
+61 −57 requirements.txt
+4 −2 setup.py
2 changes: 1 addition & 1 deletion sources/UsersHub
Submodule UsersHub updated 11 files
+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
2 changes: 1 addition & 1 deletion sources/gn_module_import
Submodule gn_module_import updated 17 files
+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

0 comments on commit 6d82f28

Please sign in to comment.