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

Merge from upsteram #626

Merged
merged 103 commits into from
Jan 20, 2021
Merged

Merge from upsteram #626

merged 103 commits into from
Jan 20, 2021

Conversation

bieganowski
Copy link

Checklist

Reviewing is a process done by project maintainers, mostly on a volunteer basis. We try to keep the overhead as small as possible and appreciate if you help us to do so by completing the following items. Feel free to ask in a comment if you have troubles with any of them.

For all pull requests:

  • Confirm you have read the contribution guidelines
  • You have sent a Contribution Licence Agreement (CLA) as necessary (not required for small changes, e.g., fixing typos in the documentation)
  • Make sure the first PR targets the master branch, eventual backports will be managed later. This can be ignored if the PR is fixing an issue that only happens in a specific branch, but not in newer ones.

The following are required only for core and extension modules (they are welcomed, but not required, for contrib modules):

  • There is a ticket in https://github.com/GeoNode/geonode/issues describing the issue/improvement/feature (a notable exemption is, changes not visible to end-users)
  • The issue connected to the PR must have Labels and Milestone assigned
  • PR for bug fixes and small new features are presented as a single commit
  • Commit message must be in the form "[Fixes #<issue_number>] Title of the Issue"
  • New unit tests have been added covering the changes, unless there is an explanation on why the tests are not necessary/implemented
  • This PR passes all existing unit tests (test results will be reported by travis-ci after opening this PR)
  • This PR passes the QA checks: flake8 geonode
  • Commits changing the settings, UI, existing user workflows, or adding new functionality, need to include documentation updates

Submitting the PR does not require you to check all items, but by the time it gets merged, they should be either satisfied or inapplicable.

afabiani and others added 30 commits November 22, 2020 19:31
- Fix CircleCI Test Cases
c7c71d7
- Fix CircleCI Test Cases
43c03de
Merge branch 'master' of https://github.com/GeoNode/geonode into circ…
4e436f3 
…leci-tests
- Travis/CircleCI tests fixes
04bbdd6
@ricardogsilva
Add git as an additional dependency to spcgeonode django docker image (…
4effb0e 
…GeoNode#6729)

fixes GeoNode#6728
@afabiani
[Hardening] Checking transactions on 'prepare_data' functions for tests
e8cb5a5
@afabiani
Merge branch 'master' of https://github.com/GeoNode/geonode
974e97a
@afabiani
[Performance] Lower down celery tasks default max retries to 3
ad1f2d2
@afabiani
Merge branch 'master' of https://github.com/GeoNode/geonode
998d393
@afabiani
Merge branch 'circleci-tests' of https://github.com/GeoNode/geonode
eb670db
@afabiani
[Hardening] be sure user is not "anonoymous" when joining a groups
365af0c
@afabiani
- Test fixes
f751aa2
@afabiani
- Bump GeoServer to version 2.17.4
f1d96e1
@afabiani
- Test fixes
7ad1eaa
@afabiani
- CircleCI: Test fixes
e92ee35
Update metadata.xsl (GeoNode#6741)
5d6047f 
Fixed a typo in the display names for topic categories
@dependabot
Bump pip from 20.3.1 to 20.3.3 (GeoNode#6739)
893bfb1 
Bumps [pip](https://github.com/pypa/pip) from 20.3.1 to 20.3.3.
- [Release notes](https://github.com/pypa/pip/releases)
- [Changelog](https://github.com/pypa/pip/blob/master/NEWS.rst)
- [Commits](pypa/pip@20.3.1...20.3.3)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump requests from 2.25.0 to 2.25.1 (GeoNode#6737)
0492774 
Bumps [requests](https://github.com/psf/requests) from 2.25.0 to 2.25.1.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/master/HISTORY.md)
- [Commits](psf/requests@v2.25.0...v2.25.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump django-storages from 1.10.1 to 1.11 (GeoNode#6740)
711be3a 
Bumps [django-storages](https://github.com/jschneier/django-storages) from 1.10.1 to 1.11.
- [Release notes](https://github.com/jschneier/django-storages/releases)
- [Changelog](https://github.com/jschneier/django-storages/blob/master/CHANGELOG.rst)
- [Commits](jschneier/django-storages@1.10.1...1.11)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump drf-spectacular from 0.11.1 to 0.12.0 (GeoNode#6734)
b15e3c4 
Bumps [drf-spectacular](https://github.com/tfranzel/drf-spectacular) from 0.11.1 to 0.12.0.
- [Release notes](https://github.com/tfranzel/drf-spectacular/releases)
- [Changelog](https://github.com/tfranzel/drf-spectacular/blob/master/CHANGELOG.rst)
- [Commits](tfranzel/drf-spectacular@0.11.1...0.12.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump psutil from 5.7.3 to 5.8.0 (GeoNode#6730)
b64112a 
Bumps [psutil](https://github.com/giampaolo/psutil) from 5.7.3 to 5.8.0.
- [Release notes](https://github.com/giampaolo/psutil/releases)
- [Changelog](https://github.com/giampaolo/psutil/blob/master/HISTORY.rst)
- [Commits](giampaolo/psutil@release-5.7.3...release-5.8.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump celery from 5.0.4 to 5.0.5 (GeoNode#6731)
2e656f4 
Bumps [celery](https://github.com/celery/celery) from 5.0.4 to 5.0.5.
- [Release notes](https://github.com/celery/celery/releases)
- [Changelog](https://github.com/celery/celery/blob/master/Changelog.rst)
- [Commits](celery/celery@v5.0.4...v5.0.5)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump pyopenssl from 20.0.0 to 20.0.1 (GeoNode#6732)
b54d5ab 
Bumps [pyopenssl](https://github.com/pyca/pyopenssl) from 20.0.0 to 20.0.1.
- [Release notes](https://github.com/pyca/pyopenssl/releases)
- [Changelog](https://github.com/pyca/pyopenssl/blob/master/CHANGELOG.rst)
- [Commits](pyca/pyopenssl@20.0.0...20.0.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump coverage from 5.3 to 5.3.1 (GeoNode#6733)
43af88d 
Bumps [coverage](https://github.com/nedbat/coveragepy) from 5.3 to 5.3.1.
- [Release notes](https://github.com/nedbat/coveragepy/releases)
- [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst)
- [Commits](nedbat/coveragepy@coverage-5.3...coverage-5.3.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump sqlalchemy from 1.3.20 to 1.3.22 (GeoNode#6736)
86556c9 
Bumps [sqlalchemy](https://github.com/sqlalchemy/sqlalchemy) from 1.3.20 to 1.3.22.
- [Release notes](https://github.com/sqlalchemy/sqlalchemy/releases)
- [Changelog](https://github.com/sqlalchemy/sqlalchemy/blob/master/CHANGES)
- [Commits](https://github.com/sqlalchemy/sqlalchemy/commits)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump pytest from 6.2.0 to 6.2.1 (GeoNode#6738)
0127677 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.0 to 6.2.1.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/master/CHANGELOG.rst)
- [Commits](pytest-dev/pytest@6.2.0...6.2.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump boto3 from 1.16.35 to 1.16.41 (GeoNode#6743)
49d72d7 
Bumps [boto3](https://github.com/boto/boto3) from 1.16.35 to 1.16.41.
- [Release notes](https://github.com/boto/boto3/releases)
- [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst)
- [Commits](boto/boto3@1.16.35...1.16.41)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@afabiani
- Aligning setup.cfg to requirements
4fe3a35
@afabiani
- Adding missing "xmlns:gmx" to full_metadata.xml
a0f09cd
@tomkralidis
add gmx namespace declaration (GeoNode#6745)
a669390 
Co-authored-by: Alessio Fabiani <alessio.fabiani@geo-solutions.it>
dependabot bot and others added 27 commits January 8, 2021 11:14
@dependabot
Bump factory-boy from 3.1.0 to 3.2.0 (GeoNode#6767)
5ebd704 
Bumps [factory-boy](https://github.com/FactoryBoy/factory_boy) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/FactoryBoy/factory_boy/releases)
- [Changelog](https://github.com/FactoryBoy/factory_boy/blob/master/docs/changelog.rst)
- [Commits](FactoryBoy/factory_boy@3.1.0...3.2.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
[Revert] Set celery worker default concurrency to 2
9eec64c
[Performance] Avoid double thumbs generation on each upload
072db92
@dependabot
Bump pillow from 8.0.1 to 8.1.0 (GeoNode#6765)
3d1d189 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.0.1 to 8.1.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](python-pillow/Pillow@8.0.1...8.1.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump invoke from 1.4.1 to 1.5.0 (GeoNode#6768)
d7ca024 
Bumps [invoke](https://github.com/bitprophet/alabaster) from 1.4.1 to 1.5.0.
- [Release notes](https://github.com/bitprophet/alabaster/releases)
- [Changelog](https://github.com/bitprophet/alabaster/blob/master/docs/changelog.rst)
- [Commits](https://github.com/bitprophet/alabaster/commits)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@afabiani
[CircleCI] test_bdd task improvs to adapct to circleci
6d63634
@afabiani
Merge branch 'master' of https://github.com/GeoNode/geonode
d8d56e0
@afabiani
[Dependencies] Aligning setup.cfg to requirements.txt
c497d24
@t-book
[Fixes #GeoNode#6772] Remove Open Data Link (GeoNode#6787)
9c84a2d 
Remove the link as the Open Data endpoint does not exist anymore
@afabiani
[Hardening] Simple Celery options to [try] to prevent pre-forked work…
87548b2 
…ers delay and hang-up
@afabiani
[Hardening] - Typo - Simple Celery options to [try] to prevent pre-fo…
d758bc8 
…rked workers delay and hang-up
@afabiani
[Hardening] Make sure 'csw_wkt_geometry' is always set.
d888a6c
@dependabot
Bump setuptools from 51.1.1 to 51.1.2 (GeoNode#6790)
8a28c5c 
Bumps [setuptools](https://github.com/pypa/setuptools) from 51.1.1 to 51.1.2.
- [Release notes](https://github.com/pypa/setuptools/releases)
- [Changelog](https://github.com/pypa/setuptools/blob/main/CHANGES.rst)
- [Commits](pypa/setuptools@v51.1.1...v51.1.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump hyperlink from 20.0.1 to 21.0.0 (GeoNode#6791)
18d680a 
Bumps [hyperlink](https://github.com/python-hyper/hyperlink) from 20.0.1 to 21.0.0.
- [Release notes](https://github.com/python-hyper/hyperlink/releases)
- [Changelog](https://github.com/python-hyper/hyperlink/blob/master/CHANGELOG.md)
- [Commits](python-hyper/hyperlink@v20.0.1...v21.0.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
[Fixes GeoNode#6817] Displaying document 'image/tiff' is broken becau…
9546af7 
…se browsers do not support 'img' src tag (GeoNode#6818)
[Dependencies] Align setup.cfg to requirements.txt
58e6009
[ref. GeoNode/geonode-project@919c32f] Align the check of first start…
a283dd1 
… between geonode-project and geonode
[Fixes GeoNode#6780] uploading a shapefile with paver setup (and spc)…
6aedc9b 
… does n… (GeoNode#6816)

* [Fixes GeoNode#6780] uploading a shapefile with paver setup (and spc) does not work

* [LGTM] Fix Module-level cyclic import issues

* - Fix csw test
@dependabot
Bump deprecated from 1.2.10 to 1.2.11 (GeoNode#6823)
22a2c95 
Bumps [deprecated](https://github.com/tantale/deprecated) from 1.2.10 to 1.2.11.
- [Release notes](https://github.com/tantale/deprecated/releases)
- [Changelog](https://github.com/tantale/deprecated/blob/master/CHANGELOG.rst)
- [Commits](laurent-laporte-pro/deprecated@v1.2.10...v1.2.11)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump drf-spectacular from 0.12.0 to 0.13.0 (GeoNode#6824)
92f6f02 
Bumps [drf-spectacular](https://github.com/tfranzel/drf-spectacular) from 0.12.0 to 0.13.0.
- [Release notes](https://github.com/tfranzel/drf-spectacular/releases)
- [Changelog](https://github.com/tfranzel/drf-spectacular/blob/master/CHANGELOG.rst)
- [Commits](tfranzel/drf-spectacular@0.12.0...0.13.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump django-treebeard from 4.3.1 to 4.4 (GeoNode#6828)
afb3026 
Bumps [django-treebeard](https://github.com/django-treebeard/django-treebeard) from 4.3.1 to 4.4.
- [Release notes](https://github.com/django-treebeard/django-treebeard/releases)
- [Changelog](https://github.com/django-treebeard/django-treebeard/blob/master/CHANGES.md)
- [Commits](django-treebeard/django-treebeard@4.3.1...4.4)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump django-markdownify from 0.8.1 to 0.8.2 (GeoNode#6825)
9bc5c5e 
Bumps [django-markdownify](https://github.com/RRMoelker/django-markdownify) from 0.8.1 to 0.8.2.
- [Release notes](https://github.com/RRMoelker/django-markdownify/releases)
- [Commits](erwinmatijsen/django-markdownify@0.8.1...0.8.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump setuptools from 51.1.2 to 51.3.3 (GeoNode#6826)
cd08dc9 
Bumps [setuptools](https://github.com/pypa/setuptools) from 51.1.2 to 51.3.3.
- [Release notes](https://github.com/pypa/setuptools/releases)
- [Changelog](https://github.com/pypa/setuptools/blob/main/CHANGES.rst)
- [Commits](pypa/setuptools@v51.1.2...v51.3.3)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
[Dependencies] Align setup.cfg with requirements.txt
e19492c
@afabiani
- Bump to version 3.2 unstable
4f780eb
@mtnorthcott
Updated .clabot for Catalyst Academy students (GeoNode#6831)
9dac9fc
[Fixes GeoNode#6714] Fixing typo: 'Pubblication' to 'Publication' (Ge…
79fac3a 
…oNode#6842)
@bieganowski bieganowski requested a review from giohappy January 20, 2021 08:21
@giohappy giohappy merged commit f654111 into master Jan 20, 2021
@afabiani afabiani deleted the merge_from_upsteram branch February 23, 2021 09:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@giohappy giohappy Awaiting requested review from giohappy

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@bieganowski @giohappy @ricardogsilva @afabiani @tomkralidis @t-book @gannebamm @khaledboka @mtnorthcott