Skip to content

Commit

Permalink
Bump djangorestframework to version 3.12.0 (#9975) (#9976)
Browse files Browse the repository at this point in the history
Co-authored-by: Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com>
  • Loading branch information
github-actions[bot] and afabiani committed Sep 7, 2022
1 parent 9571b75 commit 1635a49
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 13 deletions.
14 changes: 7 additions & 7 deletions geonode/base/api/tests.py
Expand Up @@ -1554,8 +1554,8 @@ def test_create_and_delete_favorites(self):
dataset = create_single_dataset(name="test_dataset_for_fav", owner=bobby)
dataset.set_permissions(
{'users': {
"bobby": ['base.add_resourcebase']
}
"bobby": ['base.add_resourcebase']
}
}
)
url = urljoin(f"{reverse('base-resources-list')}/", f"{dataset.pk}/favorite/")
Expand Down Expand Up @@ -1933,9 +1933,9 @@ def test_rating_resource(self):
url = reverse('base-resources-ratings', args=[resource.pk])
resource.set_permissions(
{'users': {
get_anonymous_user().username: ['base.view_resourcebase'],
"bobby": ['base.add_resourcebase']
}
get_anonymous_user().username: ['base.view_resourcebase'],
"bobby": ['base.add_resourcebase']
}
}
)
data = {
Expand Down Expand Up @@ -2445,7 +2445,7 @@ def _assertCloningWithPerms(self, resource):
# bobby cannot copy the resource since he doesnt have all the perms needed
_perms = {
'users': {
"bobby": ['base.add_resourcebase']
"bobby": ['base.add_resourcebase']
},
"groups": {
"anonymous": []
Expand All @@ -2459,7 +2459,7 @@ def _assertCloningWithPerms(self, resource):
# bobby can copy the resource since he has all the perms needed
_perms = {
'users': {
"bobby": ['base.add_resourcebase', 'base.download_resourcebase']
"bobby": ['base.add_resourcebase', 'base.download_resourcebase']
},
"groups": {
"anonymous": ["base.view_resourcebase", "base.download_resourcebae"]
Expand Down
8 changes: 4 additions & 4 deletions geonode/layers/forms.py
Expand Up @@ -296,11 +296,11 @@ class Meta:
fields = ('attribute',)

attribute = forms.ChoiceField(
required=False,
)
required=False,
)
end_attribute = forms.ChoiceField(
required=False,
)
required=False,
)
presentation = forms.ChoiceField(
required=False,
choices=[
Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
Expand Up @@ -48,6 +48,7 @@ django-widget-tweaks==1.4.12
django-sequences==2.7
oauthlib==3.2.0
pyopenssl==22.0.0
pyjwt==2.4.0

# geopython dependencies
pyproj<3.3.0
Expand All @@ -72,7 +73,7 @@ django-invitations<1.9.4
django-recaptcha==3.0.0

# REST
djangorestframework<3.12.0,>=3.8.0
djangorestframework==3.12.0
djangorestframework-gis==1.0
djangorestframework-guardian==0.3.0
drf-extensions==0.7.1
Expand Down
3 changes: 2 additions & 1 deletion setup.cfg
Expand Up @@ -74,6 +74,7 @@ install_requires =
django-sequences==2.7
oauthlib==3.2.0
pyopenssl==22.0.0
pyjwt==2.4.0

# geopython dependencies
pyproj<3.3.0
Expand All @@ -98,7 +99,7 @@ install_requires =
django-recaptcha==3.0.0

# REST
djangorestframework<3.12.0,>=3.8.0
djangorestframework==3.12.0
djangorestframework-gis==1.0
djangorestframework-guardian==0.3.0
drf-extensions==0.7.1
Expand Down

0 comments on commit 1635a49

Please sign in to comment.