Merge branch 'master' into master

Author: t-book

geonode/api/resourcebase_api.py

@@ -403,7 +403,6 @@ def get_search(self, request, **kwargs):
         sqs = self.build_haystack_filters(request.GET)
 
         if not settings.SKIP_PERMS_FILTER:
-
             filter_set = get_objects_for_user(request.user, "base.view_resourcebase")
 
             filter_set = get_visible_resources(

geonode/api/tests.py

@@ -160,7 +160,6 @@ def test_dataset_get_detail_unauth_dataset_not_public(self):
         # with delayed security
         with self.settings(DELAYED_SECURITY_SIGNALS=True, GEOFENCE_SECURITY_ENABLED=True):
             if check_ogc_backend(geoserver.BACKEND_PACKAGE):
-
                 gm = GeoServerResourceManager()
                 gm.set_permissions(layer.uuid, instance=layer, permissions=self.perm_spec)
                 self.assertTrue(layer.dirty_state)
@@ -435,7 +434,6 @@ def test_groups_filters(self):
         """Test groups filtering"""
 
         with self.settings(API_LOCKDOWN=False):
-
             filter_url = self.groups_list_url
 
             resp = self.api_client.get(filter_url)

geonode/api/views.py

@@ -97,7 +97,6 @@ def user_info(request):
 
 @csrf_exempt
 def verify_token(request):
-
     if request.POST and "token" in request.POST:
         token = None
         try:

geonode/apps.py

@@ -28,7 +28,6 @@ def run_setup_hooks(*args, **kwargs):
 
 
 class AppConfig(BaseAppConfig):
-
     name = "geonode"
     label = "geonode"
 

geonode/base/admin.py

@@ -338,7 +338,6 @@ def keyword_id(self, obj):
 
 
 class ResourceBaseAdminForm(autocomplete.FutureModelForm):
-
     keywords = TagField(widget=TaggitSelect2Custom("autocomplete_hierachical_keyword"))
 
     def delete_queryset(self, request, queryset):

geonode/base/api/pagination.py

@@ -26,7 +26,6 @@
 
 
 class GeoNodeApiPagination(PageNumberPagination):
-
     page = DEFAULT_PAGE
     page_size = DEFAULT_PAGE_SIZE
     page_size_query_param = DEFAULT_PAGE_QUERY_PARAM

geonode/base/api/permissions.py

@@ -200,7 +200,6 @@ class ResourceBasePermissionsFilter(BaseFilterBackend):
     """
 
     def filter_queryset(self, request, queryset, view):
-
         try:
             metadata_only = strtobool(request.query_params.get("filter{metadata_only}", "None"))
         except Exception:

geonode/base/api/serializers.py

@@ -254,7 +254,6 @@ class Meta:
         fields = ("pk", "metadata")
 
     def to_representation(self, obj):
-
         if isinstance(obj, QuerySet):
             out = []
             for el in obj:

geonode/base/api/tests.py

@@ -72,7 +72,6 @@
 
 
 class BaseApiTests(APITestCase):
-
     fixtures = ["initial_data.json", "group_test_data.json", "default_oauth_apps.json", "test_thesaurus.json"]
 
     def setUp(self):

geonode/base/api/views.py

@@ -826,7 +826,6 @@ def resource_service_ingest(self, request, resource_type: str = None):
         ):
             return Response(status=status.HTTP_403_FORBIDDEN)
         try:
-
             request_params = self._get_request_params(request)
             uuid = request_params.get("uuid", str(uuid4()))
             resource_filter = ResourceBase.objects.filter(uuid=uuid)