From 8284aae78fe88770a5b18872b42f9233d5224bf8 Mon Sep 17 00:00:00 2001 From: jacquesfize Date: Thu, 18 Jul 2024 09:05:33 +0200 Subject: [PATCH 1/3] update pandas version --- requirements-dev.in | 2 +- requirements.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-dev.in b/requirements-dev.in index d709bf34..38a08807 100644 --- a/requirements-dev.in +++ b/requirements-dev.in @@ -1,5 +1,5 @@ -r dependencies/GeoNature/backend/requirements-common.in -pandas<1.4 # panda 1.4 requires sqlalchemy>=1.4 +pandas pyproj<3;python_version<"3.9" # v3 require PROJ 7.2.0 but Debian 10 provide PROJ 5.2.0 pyproj<3.1;python_version>="3.9" and python_version<"3.10" pyproj;python_version>="3.10" diff --git a/requirements.in b/requirements.in index b9f9cf28..b96a3585 100644 --- a/requirements.in +++ b/requirements.in @@ -1,4 +1,4 @@ -pandas<1.4 # panda 1.4 requires sqlalchemy>=1.4 +pandas pyproj<3;python_version<"3.9" # v3 require PROJ 7.2.0 but Debian 10 provide PROJ 5.2.0 pyproj<3.1;python_version>="3.9" and python_version<"3.10" pyproj;python_version>="3.10" From 5d120d3a28dafce76e6f46b69530c3e8fd3c273c Mon Sep 17 00:00:00 2001 From: jacquesfize Date: Thu, 18 Jul 2024 10:04:28 +0200 Subject: [PATCH 2/3] prepare release 2.3.1 --- VERSION | 2 +- dependencies/GeoNature | 2 +- docs/CHANGELOG.rst | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index cc6612c3..a6254504 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3.0 \ No newline at end of file +2.3.1 \ No newline at end of file diff --git a/dependencies/GeoNature b/dependencies/GeoNature index ec1f1603..2108176e 160000 --- a/dependencies/GeoNature +++ b/dependencies/GeoNature @@ -1 +1 @@ -Subproject commit ec1f160330a211a7debca96545dba67d602ff5ca +Subproject commit 2108176e5a00ad8b904bcb24de3d8786ffbdf4ba diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index e1c8f651..71645d2f 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,16 @@ CHANGELOG ========= + +2.3.1 (2024-07-18) +------------------ + +Nécessite la version 2.14.0 (ou plus) de GeoNature. + +**🚀 Nouveautés** + + - Mise à jour vers pandas>2.0 (#503) + 2.3.0 (2024-02-28) ------------------ From de906404e97c15a213ed5d438ea53294ab80724a Mon Sep 17 00:00:00 2001 From: jacquesfize Date: Thu, 18 Jul 2024 11:09:08 +0200 Subject: [PATCH 3/3] wip --- dependencies/GeoNature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/GeoNature b/dependencies/GeoNature index 2108176e..ec1f1603 160000 --- a/dependencies/GeoNature +++ b/dependencies/GeoNature @@ -1 +1 @@ -Subproject commit 2108176e5a00ad8b904bcb24de3d8786ffbdf4ba +Subproject commit ec1f160330a211a7debca96545dba67d602ff5ca