Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

4.2.2 #44

Merged
merged 48 commits into from
Mar 12, 2024
Merged

4.2.2 #44

merged 48 commits into from
Mar 12, 2024

Conversation

mwallschlaeger
Copy link

Upgrade zalf geonode to 4.2.2

This is the merge of the 4.2.2 release (https://github.com/GeoNode/geonode/releases/tag/4.2.2) into the current main branch of zalf-geonode. I suppose this is going the latest major release version we are updating to before release the the repository. All upcoming changes must be applied to this version.

Additionally, to the pure merge of the release 4.2.2. This includes some cherry-picked commites bumping the django module django-allauth to the latest version. Cherry-picked commits from upstream geonode:

This cherry-picks are required to integrate keycloak in latest way, described in https://github.com/pennersr/django-allauth/blob/0.61.1/docs/socialaccount/providers/keycloak.rst .

mattiagiupponi and others added 30 commits October 25, 2023 10:55
@mattiagiupponi
Fixes GeoNode#11578: align geoapp metadata update to other resources (G…
75d8fda 
…eoNode#11624)

* Fixes GeoNode#11578: align geoapp metadata update to other resources

* Fixes GeoNode#11578: align geoapp metadata update to other resources

* Fixes GeoNode#11578: align geoapp metadata update to other resources

* Fixes GeoNode#11578: fix broken tests

* fix black format
@mattiagiupponi
Add missing init for facets module (GeoNode#11638)
ec457bc
@giohappy
thesaurus topics should only return its own keys (GeoNode#11644)
6a8a202
@etj
[Fixes GeoNode#11652] Facets: wrong count on multiple tkeywords filte…
c937f5e 
…ring (GeoNode#11655)

* [Fixes GeoNode#11652] Facets: wrong count on multiple tkeywords filtering - tkeywords

* [Fixes GeoNode#11652] Facets: wrong count on multiple tkeywords filtering - category

* [Fixes GeoNode#11652] Facets: wrong count on multiple tkeywords filtering - region

* [Fixes GeoNode#11652] Facets: wrong count on multiple tkeywords filtering - keywords
@dependabot @afabiani
Bump black from 23.9.1 to 23.10.1 (GeoNode#11648)
96d72df 
* Bump black from 23.9.1 to 23.10.1

Bumps [black](https://github.com/psf/black) from 23.9.1 to 23.10.1.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](psf/black@23.9.1...23.10.1)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Align setup.cfg to requirements.txt

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: afabiani <alessio.fabiani@geosolutionsgroup.com>
@dependabot @afabiani
Bump django from 3.2.22 to 3.2.23 (GeoNode#11654)
cf73b3f 
* Bump django from 3.2.22 to 3.2.23

Bumps [django](https://github.com/django/django) from 3.2.22 to 3.2.23.
- [Commits](django/django@3.2.22...3.2.23)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Align setup.cfg to requirements.txt

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: afabiani <alessio.fabiani@geosolutionsgroup.com>
@afabiani @snyk-bot
fix: requirements.txt to reduce vulnerabilities (GeoNode#11656)
a7e3db3 
The following vulnerabilities are fixed by pinning transitive dependencies:
- https://snyk.io/vuln/SNYK-PYTHON-DJANGO-6041515
- https://snyk.io/vuln/SNYK-PYTHON-PILLOW-6043904

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
@etj @giohappy
[Fixes GeoNode#11447, GeoNode#11668] Various fixes in GeoFence permis…
e7b53a5 
…sions (GeoNode#11669)

* [Fixes GeoNode#11447] Bad role name in creating GeoFence rules

* [Fixes GeoNode#11668] Bad ordering of GeoFence rules

---------

Co-authored-by: Giovanni Allegri <giohappy@gmail.com>
@mattiagiupponi
Update default avatar image (GeoNode#11676)
e705eaf 
* Update default avatar image

* Change to default avatar

* Reduce avatar dim
@dependabot @afabiani
Bump vine from 5.0.0 to 5.1.0 (GeoNode#11662)
ee776ca 
* Bump vine from 5.0.0 to 5.1.0

Bumps [vine](https://github.com/celery/vine) from 5.0.0 to 5.1.0.
- [Release notes](https://github.com/celery/vine/releases)
- [Changelog](https://github.com/celery/vine/blob/master/Changelog)
- [Commits](celery/vine@v5.0.0...v5.1.0)

---
updated-dependencies:
- dependency-name: vine
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* - Align setup.cfg to requirements.txt

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: afabiani <alessio.fabiani@geosolutionsgroup.com>
@dependabot @afabiani
Bump celery from 5.3.4 to 5.3.5 (GeoNode#11690)
3439e27 
* Bump celery from 5.3.4 to 5.3.5

Bumps [celery](https://github.com/celery/celery) from 5.3.4 to 5.3.5.
- [Release notes](https://github.com/celery/celery/releases)
- [Changelog](https://github.com/celery/celery/blob/main/Changelog.rst)
- [Commits](celery/celery@v5.3.4...v5.3.5)

---
updated-dependencies:
- dependency-name: celery
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* - Align setup.cfg to requirements.txt

* - Align setup.cfg to requirements.txt

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: afabiani <alessio.fabiani@geosolutionsgroup.com>
@afabiani @snyk-bot @giohappy
fix: scripts/docker/nginx/Dockerfile to reduce vulnerabilities (GeoNo…
bc45eaf 
…de#11637)

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Giovanni Allegri <giohappy@gmail.com>
@mattiagiupponi
[Fixes#11651] Implement the option to register users without automati…
980e4d2 
…c assignment o… (GeoNode#11695)

* Implement the option to register users without automatic assignment of contributor role GeoNode#11651

* Fixes GeoNode#11651: configuration rename

* Fixes GeoNode#11651: configuration rename
@dependabot @afabiani @giohappy
Bump owslib from 0.29.2 to 0.29.3 (GeoNode#11686)
5eba04a 
* Bump owslib from 0.29.2 to 0.29.3

Bumps [owslib](https://github.com/geopython/OWSLib) from 0.29.2 to 0.29.3.
- [Release notes](https://github.com/geopython/OWSLib/releases)
- [Commits](geopython/OWSLib@0.29.2...0.29.3)

---
updated-dependencies:
- dependency-name: owslib
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* - Align setup.cfg to requirements.txt

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: afabiani <alessio.fabiani@geosolutionsgroup.com>
Co-authored-by: Giovanni Allegri <giohappy@gmail.com>
@dependabot @afabiani
Bump black from 23.10.1 to 23.11.0 (GeoNode#11685)
5abfa5e 
* Bump black from 23.10.1 to 23.11.0

Bumps [black](https://github.com/psf/black) from 23.10.1 to 23.11.0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](psf/black@23.10.1...23.11.0)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Align setup.cfg to requirements.txt

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: afabiani <alessio.fabiani@geosolutionsgroup.com>
@dependabot @afabiani
Bump twisted from 23.8.0 to 23.10.0 (GeoNode#11664)
82eeca1 
* Bump twisted from 23.8.0 to 23.10.0

Bumps [twisted](https://github.com/twisted/twisted) from 23.8.0 to 23.10.0.
- [Release notes](https://github.com/twisted/twisted/releases)
- [Changelog](https://github.com/twisted/twisted/blob/trunk/NEWS.rst)
- [Commits](twisted/twisted@twisted-23.8.0...twisted-23.10.0)

---
updated-dependencies:
- dependency-name: twisted
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Align setup.cfg to requirements.txt

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: afabiani <alessio.fabiani@geosolutionsgroup.com>
@dependabot @afabiani
Bump amqp from 5.1.1 to 5.2.0 (GeoNode#11688)
ae45e10 
* Bump amqp from 5.1.1 to 5.2.0

Bumps [amqp](https://github.com/celery/py-amqp) from 5.1.1 to 5.2.0.
- [Release notes](https://github.com/celery/py-amqp/releases)
- [Changelog](https://github.com/celery/py-amqp/blob/main/Changelog)
- [Commits](celery/py-amqp@v5.1.1...v5.2.0)

---
updated-dependencies:
- dependency-name: amqp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Align setup.cfg to requirements.txt

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: afabiani <alessio.fabiani@geosolutionsgroup.com>
@dependabot @afabiani
Bump jsonschema from 4.19.1 to 4.19.2 (GeoNode#11661)
a76480f 
* Bump jsonschema from 4.19.1 to 4.19.2

Bumps [jsonschema](https://github.com/python-jsonschema/jsonschema) from 4.19.1 to 4.19.2.
- [Release notes](https://github.com/python-jsonschema/jsonschema/releases)
- [Changelog](https://github.com/python-jsonschema/jsonschema/blob/main/CHANGELOG.rst)
- [Commits](python-jsonschema/jsonschema@v4.19.1...v4.19.2)

---
updated-dependencies:
- dependency-name: jsonschema
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* - Align setup.cfg to requirements.txt

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: afabiani <alessio.fabiani@geosolutionsgroup.com>
@mattiagiupponi
Control read only mode with environmental variable GeoNode#11710 (Geo…
a655d8d 
…Node#11711)

* Add env-var to override the readonly mode

* Fix flake8 issue

* Add test coverage

* Add test coverage

* Add test coverage

* Fix broken test
@mattiagiupponi
[Fixes GeoNode#11716] extension for remote document is not saved (Geo…
7cac111 
…Node#11717)

* [Fixes GeoNode#11716] extension for remote document is not saved

* [Fixes GeoNode#11716] fix formatting
@giohappy
Increased doc_url (GeoNode#11748)
f7f0cac
@giohappy
[Fixes GeoNode#11752] Render remote docs with document embed template (…
849265c 
…GeoNode#11753)

* render remote docs with document embed template

* removed unused import

* revert removed unused import

* removed unused import
@mattiagiupponi
Harvester error during keyword creation GeoNode#11755 (GeoNode#11756)
a244908 
* Add test suite

* Fixes GeoNode#11755: Harvester error during keyword creation

* Fixes GeoNode#11755: remove unwanted commit
@mattiagiupponi @giohappy
[Fixes GeoNode#11750] Do not send notifications in Celery tasks if no…
ea71bcf 
…tifications are disabled (GeoNode#11751)

* Add test suite

* [Fixes GeoNode#11750] Do not send notifications in Celery tasks if notifications are disabled

* [Fixes GeoNode#11750] Do not send notifications in Celery tasks if notifications are disabled

* [Fixes GeoNode#11750] Do not send notifications in Celery tasks if notifications are disabled

* [Fixes GeoNode#11750] Do not send notifications in Celery tasks if notifications are disabled

* [Fixes GeoNode#11750] Do not send notifications in Celery tasks if notifications are disabled

* [Fixes GeoNode#11750] Do not send notifications in Celery tasks if notifications are disabled

* [Fixes GeoNode#11750] Do not send notifications in Celery tasks if notifications are disabled

* [Fixes GeoNode#11750] Do not send notifications in Celery tasks if notifications are disabled

---------

Co-authored-by: Giovanni Allegri <giohappy@gmail.com>
@mattiagiupponi
Fix german translation (GeoNode#11760)
a42f9f2 
* Add test suite

* Fix german translation

* Fix german translation
@github-actions @giohappy
Don't quote JAVA_OPTS (GeoNode#11807) (GeoNode#11810)
2039eb7 
(cherry picked from commit 8d2dfbf)

Co-authored-by: Giovanni Allegri <giohappy@gmail.com>
@giohappy
Fix template variable for print base url (GeoNode#11813)
b4e8838
@github-actions @giohappy
[Fixes GeoNode#11817] Drop Nginx and Letsencrypt Dockerfiles (GeoNode…
aadf097 
…#11818) (GeoNode#11820)

* Drop Nginx and Letsencrypt Dockerfiles

* align compose files

* algin compose filew (2)

(cherry picked from commit 535f08c)

Co-authored-by: Giovanni Allegri <giohappy@gmail.com>
@giohappy
Update Docker tags for 4.2.x (GeoNode#11824)
7b99387
@giohappy
Use GeoNode 4.2.x Docker image (GeoNode#11826)
4137c24
giohappy and others added 18 commits January 10, 2024 17:17
@giohappy
Release 4.2.0 (GeoNode#11827)
8e03c53 
* Bump client to 4.2.0 and importer to version 1.0.6

* Bump version to 4.2.0

* fixed docker image tags for test and dev compose files
@giohappy
Bump to dev dependencies
73f6ba9
@github-actions @giohappy
Add long_description_content_type for Markdown (GeoNode#11831) (GeoNo…
b1682db 
…de#11832)

(cherry picked from commit b556709)

Co-authored-by: Giovanni Allegri <giohappy@gmail.com>
@giohappy
Remove docker-compose-dev reference to nginx script (GeoNode#11835)
3e1c326
@giohappy
Local build for development branch
b881499
@giohappy
Fix minimum version for the client (GeoNode#11854)
9f65512 
Since 4.2.0.dev0 is not considered >= 4.2.0
@giohappy
recreated .mo file for italian (GeoNode#11873)
3f03d7c
@giohappy @mattiagiupponi
[Fixes GeoNode#11855] Reduce log level in donwload handler (GeoNode#1…
445c84c 
…1856) (GeoNode#11874)

Co-authored-by: mattiagiupponi <51856725+mattiagiupponi@users.noreply.github.com>
@giohappy
release 4.2.1 (GeoNode#11875)
47fd676
@giohappy
Bump to 4.2.x
cdeb2d9
@github-actions @mattiagiupponi
update version action (GeoNode#11916) (GeoNode#11917)
bf9b500 
(cherry picked from commit 372eb21)

Co-authored-by: mattiagiupponi <51856725+mattiagiupponi@users.noreply.github.com>
@giohappy
Reformatting for latest Black (GeoNode#11915)
5a97c34
@giohappy @etj
[Backport 4.2.x ] [Fixes GeoNode#11912] GWC layers only cache default…
c4c52c1 
… style after B/R restore … (GeoNode#11914)

* [Fixes GeoNode#11912] GWC layers only cache default style after B/R restore (GeoNode#11913)

Co-authored-by: G. Allegri <giohappy@gmail.com>

* Reformatting for latest Black

---------

Co-authored-by: Emanuele Tajariol <etj@geo-solutions.it>
@giohappy
Upgrade Geoserver with fix for oauth2 (GeoNode#11929)
3f382b2 
* Upgrade Geoserver with fix for oauth2

* fixes to black formaating
@giohappy
Prepare release 4.2.2
6128b84
@mwallschlaeger
merged 4.2.2
dd7e486
@dependabot @afabiani @mwallschlaeger
build(deps): bump django-allauth from 0.54.0 to 0.60.1 (GeoNode#11908)
cdea681 
* build(deps): bump django-allauth from 0.54.0 to 0.60.1

Bumps [django-allauth](https://github.com/pennersr/django-allauth) from 0.54.0 to 0.60.1.
- [Changelog](https://github.com/pennersr/django-allauth/blob/main/ChangeLog.rst)
- [Commits](pennersr/django-allauth@0.54.0...0.60.1)

---
updated-dependencies:
- dependency-name: django-allauth
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* - Align setup.cfg to requirements.txt

* - allauth.account.middleware.AccountMiddleware must be added to settings.MIDDLEWARE

* - fix def get_provider(self, request, provider) override issue

* - fix def get_provider(self, request, provider) override issue

* - fix socialaccount testcases

* - fix build

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: afabiani <alessio.fabiani@geosolutionsgroup.com>
@dependabot @afabiani @mwallschlaeger
build(deps): bump django-allauth from 0.60.1 to 0.61.1 (GeoNode#11950)
6f7108b 
* build(deps): bump django-allauth from 0.60.1 to 0.61.1

Bumps [django-allauth](https://github.com/pennersr/django-allauth) from 0.60.1 to 0.61.1.
- [Changelog](https://github.com/pennersr/django-allauth/blob/main/ChangeLog.rst)
- [Commits](pennersr/django-allauth@0.60.1...0.61.1)

---
updated-dependencies:
- dependency-name: django-allauth
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* - Align setup.cfg to requirements.txt

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: afabiani <alessio.fabiani@geosolutionsgroup.com>
@mwallschlaeger mwallschlaeger added documentation Improvements or additions to documentation feature labels Mar 1, 2024
@mwallschlaeger mwallschlaeger added this to the Individual ZALF implementation milestone Mar 1, 2024
@mwallschlaeger mwallschlaeger self-assigned this Mar 1, 2024
@mwallschlaeger mwallschlaeger merged commit 45b27bf into main Mar 12, 2024
2 checks passed
@mwallschlaeger mwallschlaeger deleted the merge_4.2.2 branch March 12, 2024 13:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@mwallschlaeger mwallschlaeger

Labels
documentation Improvements or additions to documentation feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@mwallschlaeger @mattiagiupponi @giohappy @etj @afabiani