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.

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

Merge upstream #36

Merged
merged 151 commits into from
Oct 18, 2023
Merged

Merge upstream #36

merged 151 commits into from
Oct 18, 2023

Conversation

mwallschlaeger
Copy link

merge of upstream including ISO contact roles

mwallschlaeger and others added 30 commits November 24, 2022 09:45
…ontact_roles_per_ressource_base_with_multiplicity
…tact_roles_per_ressource_base_with_multiplicity

Issue#10290 complete iso contact roles per ressource base with multiplicity
…#10290_complete_ISO_contact_roles_per_ressource_base_with_multiplicity
…se_with_multiplicity' of github.com:mwallschlaeger/geonode into issue#10290_complete_ISO_contact_roles_per_ressource_base_with_multiplicity
…se_with_multiplicity' of github.com:mwallschlaeger/geonode into issue#10290_complete_ISO_contact_roles_per_ressource_base_with_multiplicity
dependabot bot and others added 26 commits October 5, 2023 14:14
Bumps [ipython](https://github.com/ipython/ipython) from 8.15.0 to 8.16.1.
- [Release notes](https://github.com/ipython/ipython/releases)
- [Commits](https://github.com/ipython/ipython/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [psycopg2](https://github.com/psycopg/psycopg2) from 2.9.7 to 2.9.9.
- [Changelog](https://github.com/psycopg/psycopg2/blob/master/NEWS)
- [Commits](psycopg/psycopg2@2.9.7...2.9.9)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Giovanni Allegri <giohappy@gmail.com>
The following vulnerabilities are fixed by pinning transitive dependencies:
- https://snyk.io/vuln/SNYK-PYTHON-URLLIB3-5926907

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Giovanni Allegri <giohappy@gmail.com>
* fix: requirements.txt to reduce vulnerabilities


The following vulnerabilities are fixed by pinning transitive dependencies:
- https://snyk.io/vuln/SNYK-PYTHON-DJANGO-5932095

* - Align setup.cfg to requirements.txt

* upgrade spsycopg2 etup.cfg

* - Align setup.cfg to requirements.txt

---------

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Giovanni Allegri <giohappy@gmail.com>
Co-authored-by: Giovanni Allegri <giohappy@gmail.com>
* Fix requires bucket name for AWS tests

* Fix requires bucket name for AWS tests

---------

Co-authored-by: afabiani <alessio.fabiani@geosolutionsgroup.com>
…#10290_complete_ISO_contact_roles_per_ressource_base_with_multiplicity
…#10290_complete_ISO_contact_roles_per_ressource_base_with_multiplicity
…11565)

* [Fixes GeoNode#11494] Implement relations between resources

* [Fixes GeoNode#11494] Implement relations between resources - tests and improvs

* [Fixes GeoNode#11494] Implement relations between resources - fix formatting

* [Fixes GeoNode#11494] Implement relations between resources - fix flake

* [Fixes GeoNode#11494] Implement relations between resources

* [Fixes GeoNode#11494] Implement relations between resources - fix formatting

* [Fixes GeoNode#11494] Implement relations between resources - fix flake

* [Fixes GeoNode#11494] Implement relations between resources - more tests and fixes

* [Fixes GeoNode#11494] Implement relations between resources - test fixings

* [Fixes GeoNode#11494] Implement relations between resources - test fixings

* [Fixes GeoNode#11494] Implement relations between resources - test fixings

* [Fixes GeoNode#11494] Implement relations between resources - minor fix
* [Fixes GeoNode#11574] Fix CircleCI black tests

* [Fixes GeoNode#11574] Fix CircleCI black tests

* [Fixes GeoNode#11574] Fix CircleCI black tests

* [Fixes GeoNode#11574] Fix CircleCI black tests

* Adding black

* Try some failing changes

* Try some failing changes

* Try some failing changes

* Fix forced error

* Update api.py

* Run flake action on master and any 4.x branch

---------

Co-authored-by: Giovanni Allegri <giohappy@gmail.com>
* Keep all uploaded zip content accessible

iterdir() is platform dependent, that is the order of the returned items
may be different on different platforms. In cases where a zip file
contains multiple base_file candidates it will be overridden by the last
one found (which varies on different platforms).

Also, different files with the same extension (file1.csv, file2.csv) will not
be accessible from file_paths as they get overridden, too.

The fix enumerates all files to make them accessible from file_paths.

* Sorts files during unzip

Ensures that unpacked content is sorted before getting handled

* Resolve minor issues

* Ensure index on extensions found multiple times
* make thumbs bagrounds run

* Fix thumbs backgrounds tests
…se_with_multiplicity' of github.com:mwallschlaeger/geonode into merge-upstream
@mwallschlaeger mwallschlaeger added the enhancement New feature or request label Oct 18, 2023
@mwallschlaeger mwallschlaeger self-assigned this Oct 18, 2023
@mwallschlaeger mwallschlaeger merged commit d73e9bf into main Oct 18, 2023
1 check passed
@mwallschlaeger mwallschlaeger deleted the merge-upstream branch June 10, 2024 09:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.