Skip to content

Commit

Permalink
Update six requirement from <1.11.0 to <1.14.0
Browse files Browse the repository at this point in the history
Updates the requirements on [six](https://github.com/benjaminp/six) to permit the latest version.
- [Release notes](https://github.com/benjaminp/six/releases)
- [Changelog](https://github.com/benjaminp/six/blob/master/CHANGES)
- [Commits](benjaminp/six@1.0.0b1...1.13.0)

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

 - Fix build
  • Loading branch information
dependabot-preview[bot] authored and afabiani committed Nov 7, 2019
1 parent fc129fb commit 9b36abf
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
1 change: 1 addition & 0 deletions geonode/geoserver/signals.py
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@ def fetch_gs_resource(values, tries):

if not settings.FREETEXT_KEYWORDS_READONLY:
try:
# AF: Warning - this won't allow people to have empty keywords on GeoNode
if len(instance.keyword_list()) == 0 and gs_resource.keywords:
for keyword in gs_resource.keywords:
if keyword not in instance.keyword_list():
Expand Down
6 changes: 4 additions & 2 deletions geonode/layers/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -1101,9 +1101,11 @@ def layer_metadata(
new_regions = [x.strip() for x in layer_form.cleaned_data['regions']]

layer.keywords.clear()
layer.keywords.add(*new_keywords)
if new_keywords:
layer.keywords.add(*new_keywords)
layer.regions.clear()
layer.regions.add(*new_regions)
if new_regions:
layer.regions.add(*new_regions)
layer.category = new_category
layer.save()

Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ psycopg2==2.8.4
Django==1.11.26

# Other
amqp==2.5.2
amqp==2.5.1
pyyaml>=4.2b1
beautifulsoup4==4.8.1
httplib2<0.14.1
Expand All @@ -19,7 +19,7 @@ decorator==4.4.1
celery==4.2.1
kombu==4.6.5
boto<=2.49.0
six<1.11.0 # https://github.com/benjaminp/six/issues/210
six<1.14.0
tqdm==4.37.0
Deprecated==1.2.6
wrapt==1.11.2
Expand Down Expand Up @@ -63,7 +63,7 @@ django-celery-beat==1.5.0
django-floppyforms<1.9.0
django-forms-bootstrap<=3.1.0
django-activity-stream==0.8.0
django-autocomplete-light==2.3.3 # pinned because >=2.3.4 throw an exception on startup
django-autocomplete-light<3.0.0
django-basic-authentication-decorator==0.9
django-leaflet==0.25.0
django-invitations<=1.9.2
Expand Down

0 comments on commit 9b36abf

Please sign in to comment.