From c233830666bed98493a616862d7968efa9ccd9d4 Mon Sep 17 00:00:00 2001 From: Florian Hoedt Date: Wed, 24 Aug 2022 10:53:25 +0200 Subject: [PATCH 01/20] [Fixes #9839] db healthcheck fails with 'FATAL: role "root" does not exist' (#9855) Co-authored-by: mattiagiupponi <51856725+mattiagiupponi@users.noreply.github.com> --- docker-compose-test.yml | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose-test.yml b/docker-compose-test.yml index 09b03c05946..1137d5e00d0 100644 --- a/docker-compose-test.yml +++ b/docker-compose-test.yml @@ -135,7 +135,7 @@ services: - dbbackups:/pg_backups restart: on-failure healthcheck: - test: "pg_isready -d gis" + test: "pg_isready -d postgres -U postgres" # uncomment to enable remote connections to postgres #ports: # - "5432:5432" diff --git a/docker-compose.yml b/docker-compose.yml index b131d16ddc4..f72dc557c68 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -135,7 +135,7 @@ services: - dbbackups:/pg_backups restart: on-failure healthcheck: - test: "pg_isready -d gis" + test: "pg_isready -d postgres -U postgres" # uncomment to enable remote connections to postgres #ports: # - "5432:5432" From e7c0121b2f88ce7c64c28a44362538cf5c6a6949 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Aug 2022 11:06:07 +0200 Subject: [PATCH 02/20] Bump pip from 22.2.1 to 22.2.2 (#9827) Bumps [pip](https://github.com/pypa/pip) from 22.2.1 to 22.2.2. - [Release notes](https://github.com/pypa/pip/releases) - [Changelog](https://github.com/pypa/pip/blob/main/NEWS.rst) - [Commits](https://github.com/pypa/pip/compare/22.2.1...22.2.2) --- updated-dependencies: - dependency-name: pip dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 241be299e3d..d0dfa9c0777 100644 --- a/requirements.txt +++ b/requirements.txt @@ -155,7 +155,7 @@ splinter==0.18.1 pytest-splinter==3.3.1 pytest-django==4.5.2 setuptools>=59.1.1,<63.3.0 -pip==22.2.1 +pip==22.2.2 Twisted==22.4.0 pixelmatch==0.3.0 factory-boy==3.2.1 From e6878d5e3e9a7c7d4e9244159aabf57e04461ebb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Aug 2022 11:06:28 +0200 Subject: [PATCH 03/20] Bump boto3 from 1.24.42 to 1.24.56 (#9877) Bumps [boto3](https://github.com/boto/boto3) from 1.24.42 to 1.24.56. - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/boto3/compare/1.24.42...1.24.56) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d0dfa9c0777..ffda8738af9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -109,7 +109,7 @@ django-storages==1.12.3 dropbox==11.33.0 google-cloud-storage==2.4.0 google-cloud-core==2.3.2 -boto3==1.24.42 +boto3==1.24.56 # Django Caches python-memcached<=1.59 From f8a7932fa14b9cb98a4baf3169d390cadb406672 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Aug 2022 11:06:40 +0200 Subject: [PATCH 04/20] Bump coverage from 6.4.2 to 6.4.4 (#9876) Bumps [coverage](https://github.com/nedbat/coveragepy) from 6.4.2 to 6.4.4. - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/6.4.2...6.4.4) --- updated-dependencies: - dependency-name: coverage dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ffda8738af9..9c277d49411 100644 --- a/requirements.txt +++ b/requirements.txt @@ -146,7 +146,7 @@ docker==5.0.3 invoke==1.7.1 # tests -coverage==6.4.2 +coverage==6.4.4 requests-toolbelt==0.9.1 flake8==5.0.1 pytest==7.1.2 From ceee05faf0a448f775873044179af988da7925e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Aug 2022 11:07:08 +0200 Subject: [PATCH 05/20] Bump geoserver-restconfig from 2.0.7 to 2.0.8 (#9832) Bumps [geoserver-restconfig](https://github.com/GeoNode/geoserver-restconfig) from 2.0.7 to 2.0.8. - [Release notes](https://github.com/GeoNode/geoserver-restconfig/releases) - [Changelog](https://github.com/GeoNode/geoserver-restconfig/blob/master/CHANGELOG.md) - [Commits](https://github.com/GeoNode/geoserver-restconfig/compare/2.0.7...2.0.8) --- updated-dependencies: - dependency-name: geoserver-restconfig dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9c277d49411..791056677ef 100644 --- a/requirements.txt +++ b/requirements.txt @@ -93,7 +93,7 @@ geonode-user-messages==2.0.2 geonode-announcements==2.0.2 geonode-django-activity-stream==0.10.0 gn-arcrest==10.5.5 -geoserver-restconfig==2.0.7 +geoserver-restconfig==2.0.8 gn-gsimporter==2.0.4 gisdata==0.5.4 From ea485cd0f862ea7e6baf78c6ab0f851eeaf833dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Aug 2022 11:37:11 +0200 Subject: [PATCH 06/20] Update setuptools requirement from <63.3.0,>=59.1.1 to >=59.1.1,<65.3.0 (#9871) Updates the requirements on [setuptools](https://github.com/pypa/setuptools) to permit the latest version. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/CHANGES.rst) - [Commits](https://github.com/pypa/setuptools/compare/v59.1.1...v65.2.0) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:production ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 791056677ef..e3b5a2a456e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -154,7 +154,7 @@ pytest-bdd==6.0.1 splinter==0.18.1 pytest-splinter==3.3.1 pytest-django==4.5.2 -setuptools>=59.1.1,<63.3.0 +setuptools>=59.1.1,<65.3.0 pip==22.2.2 Twisted==22.4.0 pixelmatch==0.3.0 From 8a9855ce16a398d4eb5beae3a9991985afe15763 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Aug 2022 12:37:28 +0200 Subject: [PATCH 07/20] Bump flake8 from 5.0.1 to 5.0.4 (#9828) Bumps [flake8](https://github.com/pycqa/flake8) from 5.0.1 to 5.0.4. - [Release notes](https://github.com/pycqa/flake8/releases) - [Commits](https://github.com/pycqa/flake8/compare/5.0.1...5.0.4) --- updated-dependencies: - dependency-name: flake8 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e3b5a2a456e..d3fdb07564b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -148,7 +148,7 @@ invoke==1.7.1 # tests coverage==6.4.4 requests-toolbelt==0.9.1 -flake8==5.0.1 +flake8==5.0.4 pytest==7.1.2 pytest-bdd==6.0.1 splinter==0.18.1 From 4e8fdfd6e1e98d8b18243e9c4bd8cacf7a61346f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Aug 2022 12:37:50 +0200 Subject: [PATCH 08/20] Bump pylibmc from 1.6.1 to 1.6.2 (#9829) Bumps [pylibmc](https://github.com/lericson/pylibmc) from 1.6.1 to 1.6.2. - [Release notes](https://github.com/lericson/pylibmc/releases) - [Changelog](https://github.com/lericson/pylibmc/blob/master/docs/changelog.rst) - [Commits](https://github.com/lericson/pylibmc/compare/1.6.1...1.6.2) --- updated-dependencies: - dependency-name: pylibmc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d3fdb07564b..84ad6c4c9b9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -125,7 +125,7 @@ python-dateutil==2.8.2 pytz==2022.1 requests==2.28.1 timeout-decorator==0.5.0 -pylibmc==1.6.1 +pylibmc==1.6.2 sherlock==0.3.2 # required by monitoring From d2a6fa268a9e89b33b29147970c67549b886968c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Aug 2022 12:38:22 +0200 Subject: [PATCH 09/20] Bump django-storages from 1.12.3 to 1.13.1 (#9833) Bumps [django-storages](https://github.com/jschneier/django-storages) from 1.12.3 to 1.13.1. - [Release notes](https://github.com/jschneier/django-storages/releases) - [Changelog](https://github.com/jschneier/django-storages/blob/master/CHANGELOG.rst) - [Commits](https://github.com/jschneier/django-storages/compare/1.12.3...1.13.1) --- updated-dependencies: - dependency-name: django-storages dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 84ad6c4c9b9..166d169ea58 100644 --- a/requirements.txt +++ b/requirements.txt @@ -105,7 +105,7 @@ elasticsearch>=2.0.0,<9.0.0 django-bootstrap3-datetimepicker-2==2.8.2 # storage manager dependencies -django-storages==1.12.3 +django-storages==1.13.1 dropbox==11.33.0 google-cloud-storage==2.4.0 google-cloud-core==2.3.2 From 0d5bdbdb68bed6e98b91598042c824d756b73ccd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Aug 2022 12:38:52 +0200 Subject: [PATCH 10/20] Bump google-cloud-storage from 2.4.0 to 2.5.0 (#9835) Bumps [google-cloud-storage](https://github.com/googleapis/python-storage) from 2.4.0 to 2.5.0. - [Release notes](https://github.com/googleapis/python-storage/releases) - [Changelog](https://github.com/googleapis/python-storage/blob/main/CHANGELOG.md) - [Commits](https://github.com/googleapis/python-storage/compare/v2.4.0...v2.5.0) --- updated-dependencies: - dependency-name: google-cloud-storage dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 166d169ea58..5e154893c8d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -107,7 +107,7 @@ django-bootstrap3-datetimepicker-2==2.8.2 # storage manager dependencies django-storages==1.13.1 dropbox==11.33.0 -google-cloud-storage==2.4.0 +google-cloud-storage==2.5.0 google-cloud-core==2.3.2 boto3==1.24.56 From ee23597730f9295c6af9d7d7b471e40d770952c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Aug 2022 12:39:30 +0200 Subject: [PATCH 11/20] Bump django-bootstrap3-datetimepicker-2 from 2.8.2 to 2.8.3 (#9849) Bumps [django-bootstrap3-datetimepicker-2](https://github.com/samuelcolvin/django-bootstrap3-datetimepicker) from 2.8.2 to 2.8.3. - [Release notes](https://github.com/samuelcolvin/django-bootstrap3-datetimepicker/releases) - [Commits](https://github.com/samuelcolvin/django-bootstrap3-datetimepicker/compare/2.8.2...2.8.3) --- updated-dependencies: - dependency-name: django-bootstrap3-datetimepicker-2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5e154893c8d..ef71fc2e0e7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -102,7 +102,7 @@ django-haystack==3.2.1 elasticsearch>=2.0.0,<9.0.0 # datetimepicker widget -django-bootstrap3-datetimepicker-2==2.8.2 +django-bootstrap3-datetimepicker-2==2.8.3 # storage manager dependencies django-storages==1.13.1 From 55ae702a172f217644c0210a92e85b51ac88e7a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Aug 2022 12:40:00 +0200 Subject: [PATCH 12/20] Bump sqlalchemy from 1.4.39 to 1.4.40 (#9850) Bumps [sqlalchemy](https://github.com/sqlalchemy/sqlalchemy) from 1.4.39 to 1.4.40. - [Release notes](https://github.com/sqlalchemy/sqlalchemy/releases) - [Changelog](https://github.com/sqlalchemy/sqlalchemy/blob/main/CHANGES.rst) - [Commits](https://github.com/sqlalchemy/sqlalchemy/commits) --- updated-dependencies: - dependency-name: sqlalchemy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ef71fc2e0e7..58555970b96 100644 --- a/requirements.txt +++ b/requirements.txt @@ -53,7 +53,7 @@ pyopenssl==22.0.0 pyproj<3.3.0 OWSLib==0.26.0 pycsw==2.6.1 -SQLAlchemy==1.4.39 # required by PyCSW +SQLAlchemy==1.4.40 # required by PyCSW Shapely==1.8.2 mercantile==1.2.1 geoip2==4.6.0 From d8d5992b92490dca08c3fd0f3dfce85fb28f6a57 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Aug 2022 12:41:30 +0200 Subject: [PATCH 13/20] Bump drf-writable-nested from 0.6.4 to 0.7.0 (#9852) Bumps [drf-writable-nested](https://github.com/beda-software/drf-writable-nested) from 0.6.4 to 0.7.0. - [Release notes](https://github.com/beda-software/drf-writable-nested/releases) - [Changelog](https://github.com/beda-software/drf-writable-nested/blob/master/CHANGELOG.md) - [Commits](https://github.com/beda-software/drf-writable-nested/compare/v0.6.4...v0.7.0) --- updated-dependencies: - dependency-name: drf-writable-nested dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 58555970b96..62eff20e079 100644 --- a/requirements.txt +++ b/requirements.txt @@ -76,7 +76,7 @@ djangorestframework<3.12.0,>=3.8.0 djangorestframework-gis==1.0 djangorestframework-guardian==0.3.0 drf-extensions==0.7.1 -drf-writable-nested==0.6.4 +drf-writable-nested==0.7.0 drf-spectacular==0.23.1 dynamic-rest==2.1.2 Markdown==3.4.1 From 3a5e19fa078a340791fe4c1d8e805b1f5c21076f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Aug 2022 12:41:46 +0200 Subject: [PATCH 14/20] Bump pytz from 2022.1 to 2022.2.1 (#9853) Bumps [pytz](https://github.com/stub42/pytz) from 2022.1 to 2022.2.1. - [Release notes](https://github.com/stub42/pytz/releases) - [Commits](https://github.com/stub42/pytz/compare/release_2022.1...release_2022.2.1) --- updated-dependencies: - dependency-name: pytz dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 62eff20e079..cbcda9c35ee 100644 --- a/requirements.txt +++ b/requirements.txt @@ -122,7 +122,7 @@ inflection>=0.4.0 jdcal==1.4.1 mock<5.0.0 python-dateutil==2.8.2 -pytz==2022.1 +pytz==2022.2.1 requests==2.28.1 timeout-decorator==0.5.0 pylibmc==1.6.2 From 86027d6a99fd2aeecd3c9775c4751977fea4f5e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Aug 2022 12:41:59 +0200 Subject: [PATCH 15/20] Bump smart-open from 6.0.0 to 6.1.0 (#9872) Bumps [smart-open](https://github.com/piskvorky/smart_open) from 6.0.0 to 6.1.0. - [Release notes](https://github.com/piskvorky/smart_open/releases) - [Changelog](https://github.com/RaRe-Technologies/smart_open/blob/develop/CHANGELOG.md) - [Commits](https://github.com/piskvorky/smart_open/compare/v6.0.0...v6.1.0) --- updated-dependencies: - dependency-name: smart-open dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index cbcda9c35ee..460b778aab2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -24,7 +24,7 @@ jsonschema==4.9.0 zipstream-new==1.1.8 schema==0.7.5 rdflib==6.2.0 -smart_open==6.0.0 +smart_open==6.1.0 # Django Apps django-allauth==0.51.0 From 66b2255b786660aef3c3ae7a7ff4858a14e581af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Aug 2022 12:42:21 +0200 Subject: [PATCH 16/20] Bump jsonschema from 4.9.0 to 4.14.0 (#9873) Bumps [jsonschema](https://github.com/python-jsonschema/jsonschema) from 4.9.0 to 4.14.0. - [Release notes](https://github.com/python-jsonschema/jsonschema/releases) - [Changelog](https://github.com/python-jsonschema/jsonschema/blob/main/CHANGELOG.rst) - [Commits](https://github.com/python-jsonschema/jsonschema/compare/v4.9.0...v4.14.0) --- updated-dependencies: - dependency-name: jsonschema dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 460b778aab2..7aee35ecb98 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,7 @@ vine==5.0.0 tqdm==4.64.0 Deprecated==1.2.13 wrapt==1.14.1 -jsonschema==4.9.0 +jsonschema==4.14.0 zipstream-new==1.1.8 schema==0.7.5 rdflib==6.2.0 From ac02d7e17bb1b750770d1f3a2c5448f95721261d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Aug 2022 12:42:37 +0200 Subject: [PATCH 17/20] Bump shapely from 1.8.2 to 1.8.4 (#9875) Bumps [shapely](https://github.com/shapely/shapely) from 1.8.2 to 1.8.4. - [Release notes](https://github.com/shapely/shapely/releases) - [Changelog](https://github.com/shapely/shapely/blob/1.8.4/CHANGES.txt) - [Commits](https://github.com/shapely/shapely/compare/1.8.2...1.8.4) --- updated-dependencies: - dependency-name: shapely dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7aee35ecb98..3e567c210da 100644 --- a/requirements.txt +++ b/requirements.txt @@ -54,7 +54,7 @@ pyproj<3.3.0 OWSLib==0.26.0 pycsw==2.6.1 SQLAlchemy==1.4.40 # required by PyCSW -Shapely==1.8.2 +Shapely==1.8.4 mercantile==1.2.1 geoip2==4.6.0 numpy==1.23.* From 3b7f1a600a26300171a6b74278d7347e0b49d7e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Aug 2022 12:42:50 +0200 Subject: [PATCH 18/20] Bump docker from 5.0.3 to 6.0.0 (#9874) Bumps [docker](https://github.com/docker/docker-py) from 5.0.3 to 6.0.0. - [Release notes](https://github.com/docker/docker-py/releases) - [Commits](https://github.com/docker/docker-py/compare/5.0.3...6.0.0) --- updated-dependencies: - dependency-name: docker dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3e567c210da..6d1bd41c435 100644 --- a/requirements.txt +++ b/requirements.txt @@ -142,7 +142,7 @@ pycountry uWSGI==2.0.20 gunicorn==20.1.0 ipython==8.4.0 -docker==5.0.3 +docker==6.0.0 invoke==1.7.1 # tests From 3068872747e3adb16e23359cb98e92708d6f2259 Mon Sep 17 00:00:00 2001 From: Alessio Fabiani Date: Wed, 24 Aug 2022 15:17:16 +0200 Subject: [PATCH 19/20] [Dependencies] align setup.cfg to requirements.txt (#9900) --- setup.cfg | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/setup.cfg b/setup.cfg index db93981832a..0d616aaefb7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -46,11 +46,11 @@ install_requires = tqdm==4.64.0 Deprecated==1.2.13 wrapt==1.14.1 - jsonschema==4.9.0 + jsonschema==4.14.0 zipstream-new==1.1.8 schema==0.7.5 rdflib==6.2.0 - smart_open==6.0.0 + smart_open==6.1.0 # Django Apps django-allauth==0.51.0 @@ -79,8 +79,8 @@ install_requires = pyproj<3.3.0 OWSLib==0.26.0 pycsw==2.6.1 - SQLAlchemy==1.4.39 # required by PyCSW - Shapely==1.8.2 + SQLAlchemy==1.4.40 # required by PyCSW + Shapely==1.8.4 mercantile==1.2.1 geoip2==4.6.0 numpy==1.23.* @@ -102,7 +102,7 @@ install_requires = djangorestframework-gis==1.0 djangorestframework-guardian==0.3.0 drf-extensions==0.7.1 - drf-writable-nested==0.6.4 + drf-writable-nested==0.7.0 drf-spectacular==0.23.1 dynamic-rest==2.1.2 Markdown==3.4.1 @@ -118,7 +118,7 @@ install_requires = geonode-announcements==2.0.2 geonode-django-activity-stream==0.10.0 gn-arcrest==10.5.5 - geoserver-restconfig==2.0.7 + geoserver-restconfig==2.0.8 gn-gsimporter==2.0.4 gisdata==0.5.4 @@ -127,14 +127,14 @@ install_requires = elasticsearch>=2.0.0,<9.0.0 # datetimepicker widget - django-bootstrap3-datetimepicker-2==2.8.2 + django-bootstrap3-datetimepicker-2==2.8.3 # storage manager dependencies - django-storages==1.12.3 + django-storages==1.13.1 dropbox==11.33.0 - google-cloud-storage==2.4.0 + google-cloud-storage==2.5.0 google-cloud-core==2.3.2 - boto3==1.24.42 + boto3==1.24.56 # Django Caches python-memcached<=1.59 @@ -147,10 +147,10 @@ install_requires = jdcal==1.4.1 mock<5.0.0 python-dateutil==2.8.2 - pytz==2022.1 + pytz==2022.2.1 requests==2.28.1 timeout-decorator==0.5.0 - pylibmc==1.6.1 + pylibmc==1.6.2 sherlock==0.3.2 # required by monitoring @@ -167,20 +167,20 @@ install_requires = uWSGI==2.0.20 gunicorn==20.1.0 ipython==8.4.0 - docker==5.0.3 + docker==6.0.0 invoke==1.7.1 # tests - coverage==6.4.2 + coverage==6.4.4 requests-toolbelt==0.9.1 - flake8==5.0.1 + flake8==5.0.4 pytest==7.1.2 pytest-bdd==6.0.1 splinter==0.18.1 pytest-splinter==3.3.1 pytest-django==4.5.2 - setuptools>=59.1.1,<63.3.0 - pip==22.2.1 + setuptools>=59.1.1,<65.3.0 + pip==22.2.2 Twisted==22.4.0 pixelmatch==0.3.0 factory-boy==3.2.1 From e51d8455c9d9b45e1210b97863f3cf7f3af7c05c Mon Sep 17 00:00:00 2001 From: mattiagiupponi <51856725+mattiagiupponi@users.noreply.github.com> Date: Wed, 24 Aug 2022 15:17:33 +0200 Subject: [PATCH 20/20] [Fixes #9887]Data retriever wrongly assign base_file value (#9888) Co-authored-by: Alessio Fabiani --- geonode/storage/data_retriever.py | 7 +++++- geonode/storage/tests.py | 30 ++++++++++++++++++++++++- geonode/storage/tests/data/example.zip | Bin 0 -> 140 bytes 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 geonode/storage/tests/data/example.zip diff --git a/geonode/storage/data_retriever.py b/geonode/storage/data_retriever.py index 52100787009..fa20b8a7d51 100644 --- a/geonode/storage/data_retriever.py +++ b/geonode/storage/data_retriever.py @@ -191,6 +191,8 @@ def items(self): return self.data_items.items() def _unzip(self, zip_name: str) -> Mapping: + from geonode.utils import get_allowed_extensions + ''' Function to unzip the file. If is a shp or a tiff is assigned as base_file otherwise will create the expected payloads @@ -199,8 +201,11 @@ def _unzip(self, zip_name: str) -> Mapping: zip_file = self.file_paths['base_file'] the_zip = zipfile.ZipFile(zip_file, allowZip64=True) the_zip.extractall(self.temporary_folder) + available_choices = get_allowed_extensions() + not_main_files = ['xml', 'sld', 'zip'] + base_file_choices = [x for x in available_choices if x not in not_main_files] for _file in Path(self.temporary_folder).iterdir(): - if _file.name.endswith('.shp') or _file.name.endswith('.tif'): + if any([_file.name.endswith(_ext) for _ext in base_file_choices]): self.file_paths['base_file'] = Path(str(_file)) elif not zipfile.is_zipfile(str(_file)): ext = _file.name.split(".")[-1] diff --git a/geonode/storage/tests.py b/geonode/storage/tests.py index a44ac0f7eed..68ce413b4bb 100644 --- a/geonode/storage/tests.py +++ b/geonode/storage/tests.py @@ -18,8 +18,8 @@ ######################################################################### import io import os +import shutil import gisdata - from unittest.mock import patch from django.test.testcases import SimpleTestCase, TestCase @@ -401,6 +401,11 @@ def test_storage_manager_replace_single_file(self, path, strg): class TestDataRetriever(TestCase): + @classmethod + def setUpClass(cls) -> None: + super().setUpClass() + cls.project_root = os.path.abspath(os.path.dirname(__file__)) + def setUp(self): self.sut = StorageManager self.local_files_paths = { @@ -569,3 +574,26 @@ def test_storage_manager_rmtree(self): self.sut().rmtree(_tmpdir) self.assertFalse(os.path.exists(_tmpdir)) + + def test_zip_file_should_correctly_recognize_main_extension_with_csv(self): + # reinitiate the storage manager with the zip file + storage_manager = self.sut(remote_files={"base_file": os.path.join(f"{self.project_root}", "tests/data/example.zip")}) + storage_manager.clone_remote_files() + + self.assertIsNotNone(storage_manager.data_retriever.temporary_folder) + _files = storage_manager.get_retrieved_paths() + self.assertTrue("example.csv" in _files.get("base_file")) + + def test_zip_file_should_correctly_recognize_main_extension_with_shp(self): + # zipping files + storage_manager = self.sut(remote_files=self.local_files_paths) + storage_manager.clone_remote_files() + storage_manager.data_retriever.temporary_folder + output = shutil.make_archive(f"{storage_manager.data_retriever.temporary_folder}/output", 'zip', storage_manager.data_retriever.temporary_folder) + # reinitiate the storage manager with the zip file + storage_manager = self.sut(remote_files={"base_file": output}) + storage_manager.clone_remote_files() + + self.assertIsNotNone(storage_manager.data_retriever.temporary_folder) + _files = storage_manager.get_retrieved_paths() + self.assertTrue("single_point.shp" in _files.get("base_file")) diff --git a/geonode/storage/tests/data/example.zip b/geonode/storage/tests/data/example.zip new file mode 100644 index 0000000000000000000000000000000000000000..099888b8ef30952a98553b0ffe978c41fdd87b58 GIT binary patch literal 140 zcmWIWW@Zs#U|`^22#J>neK-5V1Q1UYh`E6{wIVUMASYEXxw!1Khp&&}mU9e~++tEY rE!(a+9O7UI@MdHZVZf~&XaWNxhyVj5!vefn*+629Kxhf1ZNUlv5U3nd literal 0 HcmV?d00001