forked from GeoNode/geonode
-
Notifications
You must be signed in to change notification settings - Fork 0
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
Merge upstream #36
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ontact_roles_per_ressource_base_with_multiplicity
…metadata_full.html. refactored
…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
…h_multiplicity
…h_multiplicity
…h_multiplicity
…h_multiplicity
…h_multiplicity
…h_multiplicity
…h_multiplicity
…_ressource_base_with_multiplicity
…h_multiplicity
…se_with_multiplicity' of github.com:mwallschlaeger/geonode into issue#10290_complete_ISO_contact_roles_per_ressource_base_with_multiplicity
…h_multiplicity
…h_multiplicity
…h_multiplicity
…_ressource_base_with_multiplicity
…se_with_multiplicity' of github.com:mwallschlaeger/geonode into issue#10290_complete_ISO_contact_roles_per_ressource_base_with_multiplicity
…h_multiplicity
…h_multiplicity
…h_multiplicity
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
…ith multiplicity
…ith 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
…_ressource_base_with_multiplicity
…_ressource_base_with_multiplicity
…se_with_multiplicity' of github.com:mwallschlaeger/geonode into merge-upstream
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
merge of upstream including ISO contact roles