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)

geonode/base/forms.py

@@ -170,7 +170,6 @@ def render_option_value(self, selected_choices, option_value, option_label, data
         )
 
     def render_options(self, selected_choices):
-
         # Normalize to strings.
         def _region_id_from_choice(choice):
             if isinstance(choice, int) or (isinstance(choice, str) and choice.isdigit()):
@@ -260,7 +259,6 @@ class Meta:
 
 
 class ThesaurusAvailableForm(forms.Form):
-
     # seperator at beginning of thesaurus search result and between
     # results found in local language and alt label
 
@@ -311,7 +309,6 @@ def _define_choicefield(self, item, required, tname, lang):
 
     @staticmethod
     def _get_thesauro_keyword_label(item, lang):
-
         keyword_id_for_given_thesaurus = ThesaurusKeyword.objects.filter(thesaurus_id=item)
 
         # try find results found for given language e.g. (en-us) if no results found remove country code from language to (en) and try again

geonode/base/middleware.py

@@ -47,7 +47,6 @@ def __call__(self, request):
         return self.get_response(request)
 
     def process_view(self, request, view_func, view_args, view_kwargs):
-
         session = request.session
         configuration_session_cache(session)
 
@@ -86,7 +85,6 @@ def __call__(self, request):
         return self.get_response(request)
 
     def process_view(self, request, view_func, view_args, view_kwargs):
-
         session = request.session
         configuration_session_cache(session)
 

geonode/base/tests.py

@@ -514,7 +514,6 @@ def test_read_only_casual_user_privileges(self):
         self.assertEqual(response.status_code, 405, "User is allowed to post to forbidden URL")
 
     def test_maintenance_whitelist(self):
-
         web_client = Client()
 
         # set read-only flag
@@ -713,7 +712,6 @@ def test_converted_html_in_tags_with_with_multiple_tags(self):
 
 
 class TestTagThesaurus(TestCase):
-
     #  loading test thesausurs
     fixtures = ["test_thesaurus.json"]
 
@@ -782,7 +780,6 @@ def __get_last_thesaurus():
 
 @override_settings(THESAURUS_DEFAULT_LANG="en")
 class TestThesaurusAvailableForm(TestCase):
-
     #  loading test thesausurs
     fixtures = ["test_thesaurus.json"]
 
@@ -956,7 +953,6 @@ def test_facets_filter_datasets_returns_correctly(self):
 
 
 class TestGenerateThesaurusReference(TestCase):
-
     fixtures = ["test_thesaurus.json"]
 
     def setUp(self):

geonode/base/views.py

@@ -327,7 +327,6 @@ def get_results(self, context):
 
 class ThesaurusAvailable(autocomplete.Select2QuerySetView):
     def get_queryset(self):
-
         tid = self.request.GET.get("sysid")
         lang = get_language()
         keyword_id_for_given_thesaurus = ThesaurusKeyword.objects.filter(thesaurus_id=tid)

geonode/br/tests/test_restore.py

@@ -40,7 +40,6 @@ def setUp(self):
     # force restore interruption before starting the procedure itself
     @mock.patch("geonode.br.management.commands.utils.utils.confirm", return_value=False)
     def test_with_logs_success(self, fake_confirm):
-
         # create the backup file
         with tempfile.NamedTemporaryFile() as tmp_file:
             with zipfile.ZipFile(tmp_file, "w", zipfile.ZIP_DEFLATED) as archive:
@@ -62,7 +61,6 @@ def test_with_logs_success(self, fake_confirm):
     # force restore interruption before starting the procedure itself
     @mock.patch("geonode.br.management.commands.utils.utils.confirm", return_value=False)
     def test_with_logs_failure(self, fake_confirm):
-
         # create the backup file
         with tempfile.NamedTemporaryFile() as tmp_file:
             with zipfile.ZipFile(tmp_file, "w", zipfile.ZIP_DEFLATED) as archive:
@@ -93,7 +91,6 @@ def test_with_logs_failure(self, fake_confirm):
     # mock geonode.base.models.Configuration save() method
     @mock.patch("geonode.base.models.Configuration.save", return_value=None)
     def test_with_read_only_mode(self, mock_configuration_save, fake_confirm):
-
         # create the backup file
         with tempfile.NamedTemporaryFile() as tmp_file:
             with zipfile.ZipFile(tmp_file, "w", zipfile.ZIP_DEFLATED) as archive:
@@ -117,7 +114,6 @@ def test_with_read_only_mode(self, mock_configuration_save, fake_confirm):
     # mock geonode.base.models.Configuration save() method
     @mock.patch("geonode.base.models.Configuration.save", return_value=None)
     def test_without_read_only_mode(self, mock_configuration_save, fake_confirm):
-
         # create the backup file
         with tempfile.NamedTemporaryFile() as tmp_file:
             with zipfile.ZipFile(tmp_file, "w", zipfile.ZIP_DEFLATED) as archive:
@@ -141,7 +137,6 @@ def test_without_read_only_mode(self, mock_configuration_save, fake_confirm):
     # mock geonode.base.models.Configuration save() method
     @mock.patch("geonode.base.models.Configuration.save", return_value=None)
     def test_config_files(self, mock_configuration_save, fake_confirm):
-
         # create the backup file
         with tempfile.NamedTemporaryFile() as tmp_file:
             with zipfile.ZipFile(tmp_file, "w", zipfile.ZIP_DEFLATED) as archive:

geonode/br/tests/test_restore_helpers.py

@@ -36,7 +36,6 @@ class RestoreCommandHelpersTests(GeoNodeBaseTestSupport):
 
     # validate_backup_file_options() method test
     def test_mandatory_option_failure(self):
-
         options = {}
 
         with self.assertRaises(CommandError) as exc:
@@ -46,7 +45,6 @@ def test_mandatory_option_failure(self):
 
     # validate_backup_file_options() method test
     def test_exclusive_option_failure(self):
-
         options = {"backup_file": "/some/random/path/1.zip", "backup_files_dir": "/some/random/path"}
 
         with self.assertRaises(CommandError) as exc:
@@ -56,7 +54,6 @@ def test_exclusive_option_failure(self):
 
     # validate_backup_file_options() method test
     def test_mandatory_option_backup_file_success(self):
-
         with tempfile.NamedTemporaryFile() as tmp:
             with zipfile.ZipFile(tmp, "w", zipfile.ZIP_DEFLATED) as archive:
                 archive.writestr("something.txt", "Some Content Here")
@@ -66,9 +63,7 @@ def test_mandatory_option_backup_file_success(self):
 
     # validate_backup_file_options() method test
     def test_mandatory_option_backup_file_failure(self):
-
         with tempfile.NamedTemporaryFile() as tmp:
-
             options = {"backup_file": tmp.name}
 
             with self.assertRaises(CommandError) as exc:
@@ -78,16 +73,13 @@ def test_mandatory_option_backup_file_failure(self):
 
     # validate_backup_file_options() method test
     def test_mandatory_option_backup_files_dir_success(self):
-
         with tempfile.TemporaryDirectory() as tmp:
             options = {"backup_files_dir": tmp}
             RestoreCommand().validate_backup_file_options(**options)
 
     # validate_backup_file_options() method test
     def test_mandatory_option_backup_files_dir_failure(self):
-
         with tempfile.NamedTemporaryFile() as tmp:
-
             options = {"backup_files_dir": tmp.name}
 
             with self.assertRaises(CommandError) as exc:
@@ -97,18 +89,14 @@ def test_mandatory_option_backup_files_dir_failure(self):
 
     # parse_backup_files_dir() method test
     def test_backup_files_dir_no_archive(self):
-
         with tempfile.TemporaryDirectory() as tmp:
-
             backup_file = RestoreCommand().parse_backup_files_dir(tmp)
             self.assertIsNone(backup_file, "Expecting backup file to be None")
 
     # parse_backup_files_dir() method test
     def test_backup_files_dir_multiple_archives(self):
-
         # create a backup files directory
         with tempfile.TemporaryDirectory() as tmp_dir:
-
             # create the 1st backup file
             with tempfile.NamedTemporaryFile(dir=tmp_dir) as tmp_file_1:
                 with zipfile.ZipFile(tmp_file_1, "w", zipfile.ZIP_DEFLATED) as archive:
@@ -128,13 +116,11 @@ def test_backup_files_dir_multiple_archives(self):
 
     # parse_backup_files_dir() method test
     def test_backup_files_dir_with_newer_restored_backup(self):
-
         # create an entry in restoration history with a dump created in the future
         RestoredBackupFactory(creation_date=(datetime.datetime.now()) + datetime.timedelta(days=2))
 
         # create a backup files directory
         with tempfile.TemporaryDirectory() as tmp_dir:
-
             # create the backup file
             with tempfile.NamedTemporaryFile(dir=tmp_dir) as tmp_file:
                 with zipfile.ZipFile(tmp_file, "w", zipfile.ZIP_DEFLATED) as archive:
@@ -146,13 +132,11 @@ def test_backup_files_dir_with_newer_restored_backup(self):
 
     # parse_backup_files_dir() method test
     def test_backup_files_dir_with_older_restored_backup(self):
-
         # create an entry in restoration history with a dump created in the past
         RestoredBackupFactory(creation_date=(datetime.datetime.now()) - datetime.timedelta(days=2))
 
         # create a backup files directory
         with tempfile.TemporaryDirectory() as tmp_dir:
-
             # create the backup file
             with tempfile.NamedTemporaryFile(dir=tmp_dir) as tmp_file:
                 with zipfile.ZipFile(tmp_file, "w", zipfile.ZIP_DEFLATED) as archive:
@@ -164,7 +148,6 @@ def test_backup_files_dir_with_older_restored_backup(self):
 
     # validate_backup_file_hash() method test
     def test_backup_hash_no_md5_file(self):
-
         # create the backup file
         with tempfile.NamedTemporaryFile() as tmp_file:
             with zipfile.ZipFile(tmp_file, "w", zipfile.ZIP_DEFLATED) as archive:
@@ -176,7 +159,6 @@ def test_backup_hash_no_md5_file(self):
 
     # validate_backup_file_hash() method test
     def test_backup_hash_failure(self):
-
         # create the backup file
         with tempfile.NamedTemporaryFile() as tmp_file:
             with zipfile.ZipFile(tmp_file, "w", zipfile.ZIP_DEFLATED) as archive:
@@ -203,7 +185,6 @@ def test_backup_hash_failure(self):
 
     # validate_backup_file_hash() method test
     def test_backup_hash_success(self):
-
         # create the backup file
         with tempfile.NamedTemporaryFile() as tmp_file:
             with zipfile.ZipFile(tmp_file, "w", zipfile.ZIP_DEFLATED) as archive:

geonode/client/apps.py

@@ -21,7 +21,6 @@
 
 
 class AppConfig(BaseAppConfig):
-
     name = "geonode.client"
     label = "geonode_client"
     verbose_name = _("GeoNode Client Library")

geonode/client/conf.py

@@ -47,7 +47,6 @@ def is_installed(package):
 
 
 class GeoNodeClientAppConf(AppConf):
-
     LAYER_PREVIEW_LIBRARY = "geonode"
     HOOKSET = "geonode.client.hooksets.BaseHookSet"
 

geonode/client/hooksets.py

@@ -20,7 +20,6 @@
 
 
 class BaseHookSet:
-
     # Layers
     def dataset_list_template(self, context=None):
         return NotImplemented

geonode/documents/api/tests.py

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

geonode/documents/exif/utils.py

@@ -63,7 +63,6 @@ def convertExifLocationToDecimalDegrees(location, direction):
 
 
 def exif_extract_metadata_doc(doc):
-
     if not doc:
         return None
 
@@ -126,7 +125,6 @@ def exif_extract_metadata_doc(doc):
 
 
 def exif_build_abstract(model=None, date=None, lat=None, lon=None):
-
     if model and date and lat and lon:
         return ABSTRACT_TEMPLATE_MODEL_DATE_LATLON.format(model=model, date=date, lat=lat, lon=lon)
     elif model and date:

geonode/documents/forms.py

@@ -84,7 +84,6 @@ def _get_max_size(self):
 
 class DocumentFormMixin:
     def generate_link_choices(self, resources=None):
-
         if resources is None:
             resources = list(Dataset.objects.all())
             resources += list(Map.objects.all())
@@ -122,7 +121,6 @@ def save_many2many(self, links_field="links"):
 
 
 class DocumentForm(ResourceBaseForm, DocumentFormMixin):
-
     title = forms.CharField(required=False)
 
     links = forms.MultipleChoiceField(label=_("Link to"), required=False)