bump version to 3.1.0

SimonSAMPERE · web-flow · commit f32532095020 · 2020-12-17T16:15:24.000+01:00
pre-release 3.1.0 (#334)
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -97,7 +97,7 @@
             "name": "Python: All debug Options",
             "type": "python",
             "request": "launch",
-            "pythonPath": "${command:python.interpreterPath}",
+            "python": "${command:python.interpreterPath}",
             "program": "${file}",
             "module": "module.name",
             "env": {
diff --git a/i18n/isogeo_search_engine_en.ts b/i18n/isogeo_search_engine_en.ts
diff --git a/i18n/isogeo_search_engine_fr.qm b/i18n/isogeo_search_engine_fr.qm
diff --git a/i18n/isogeo_search_engine_fr.ts b/i18n/isogeo_search_engine_fr.ts
diff --git a/isogeo.py b/isogeo.py
@@ -347,19 +347,9 @@ def initGui(self):
     def onClosePlugin(self):
         """Cleanup necessary items here when plugin dockwidget is closed."""
         # save base portal URL in qsettings
-        logger.debug(
-            "*=====* DEBUG URL --> Isogeo : portal base URL value before plugin closing = {}".format(
-                self.form_mng.input_portal_url.text()
-            )
-        )
         qsettings.setValue(
             "isogeo/settings/portal_base_url", self.form_mng.input_portal_url.text()
         )
-        logger.debug(
-            "*=====* DEBUG URL --> Isogeo : 'isogeo/settings/portal_base_url' setting = {}".format(
-                qsettings.value("isogeo/settings/portal_base_url")
-            )
-        )
         # save cache
         self.form_mng.results_mng.cache_mng.dumper()
         # disconnects
@@ -890,19 +880,9 @@ def run(self):
         self.form_mng.btn_credits.pressed.connect(self.credits_dialog.show)
 
         # -- Settings tab - Isogeo Portal settings ------------------------
-        logger.debug(
-            "*=====* DEBUG URL --> Isogeo : 'isogeo/settings/portal_base_url' setting = {}".format(
-                qsettings.value("isogeo/settings/portal_base_url")
-            )
-        )
         self.form_mng.input_portal_url.setText(
             qsettings.value("isogeo/settings/portal_base_url")
         )
-        logger.debug(
-            "*=====* DEBUG URL --> Isogeo : input_portal_url.text() = {}".format(
-                self.form_mng.input_portal_url.text()
-            )
-        )
 
         """ ------- EXECUTED AFTER PLUGIN IS LAUNCHED --------------------- """
         self.form_mng.setWindowTitle("Isogeo - {}".format(self.plg_version))
diff --git a/metadata.txt b/metadata.txt
@@ -11,7 +11,7 @@ name=Isogeo
 qgisMinimumVersion=3.4
 qgisMaximumVersion=3.99
 description=Isogeo search engine within QGIS
-version=3.1.0-beta1
+version=3.1.0
 author=Isogeo
 email=projects+qgis@isogeo.com
 
@@ -24,7 +24,7 @@ repository=https://github.com/isogeo/isogeo-plugin-qgis
 # Recommended items:
 
 # Uncomment the following line and add your changelog:
-changelog=- 3.0.2 : better SSL errors handling<br>- 3.0.1 : better authentication management<br>- 3.0.0 : first stable version compatible with QGIS 3<br>- 2.0.0-alpha1: first version meant to be compatible with QGIS 3
+changelog=- <strong>3.1.0:</strong> see the <a href="https://github.com/isogeo/isogeo-plugin-qgis/milestone/10?closed=1">dedicated milestone</a><br>- <strong>3.0.2:</strong> better SSL errors handling<br>- <strong>3.0.1:</strong> better authentication management<br>- <strong>3.0.0:</strong> first stable version compatible with QGIS 3<br>- <strong>2.0.0-alpha1:</strong> first version meant to be compatible with QGIS 3
 
 # Tags are comma separated with spaces allowed
 tags=REST API,catalog,search,explore,webservices,metadata,open data,INSPIRE
diff --git a/modules/api/auth.py b/modules/api/auth.py
@@ -158,8 +158,7 @@ def manage_api_initialization(self):
 
     # CREDENTIALS LOCATORS ----------------------------------------------------
     def credentials_check_qsettings(self):
-        """Retrieve Isogeo API credentials within QGIS QSettings.
-        """
+        """Retrieve Isogeo API credentials within QGIS QSettings."""
 
         if "isogeo-plugin" in qsettings.childGroups():
             logger.warning(
@@ -286,8 +285,7 @@ def credentials_update(self, credentials_source: str = "QSettings"):
 
     # AUTHENTICATION FORM -----------------------------------------------------
     def display_auth_form(self):
-        """Show authentication form with prefilled fields and connected widgets.
-        """
+        """Show authentication form with prefilled fields and connected widgets."""
         self.informer = UserInformer(message_bar=self.msgbar, trad=self.tr)
         self.auth_sig.connect(self.informer.authentication_slot)
         self.ui_auth_form.chb_isogeo_editor.stateChanged.connect(
diff --git a/modules/api/request.py b/modules/api/request.py
@@ -27,11 +27,11 @@
 
 class ApiRequester(QObject):
     """Basic class to manage direct interactions with Isogeo's API :
-        - Authentication request for tokenl
-        - Request about application's shares
-        - Request about ressources
-        - Building request URLs
-        - Parsing API's answer tags
+    - Authentication request for tokenl
+    - Request about application's shares
+    - Request about ressources
+    - Building request URLs
+    - Parsing API's answer tags
     """
 
     api_sig = pyqtSignal(str)
@@ -130,7 +130,7 @@ def create_request(self, request_type: str):
         return request
 
     def send_request(self, request_type: str = "search"):
-        """ Sends a request to the Isogeo's API using QNetworkRequestManager. That's the
+        """Sends a request to the Isogeo's API using QNetworkRequestManager. That's the
         handle_reply method which get the API's response. See below.
 
         :param str request_type: type of request to send. Options:
@@ -210,6 +210,7 @@ def handle_reply(self, reply: QNetworkReply):
         try:
             parsed_content = json.loads(content)
         except ValueError as e:
+            parsed_content = content
             if "No JSON object could be decoded" in str(e):
                 logger.error("{} --> Internet connection failed".format(str(e)))
                 self.api_sig.emit("internet_issue")
@@ -404,7 +405,7 @@ def build_request_url(self, params: dict):
         return url
 
     def get_tags(self, tags: dict):
-        """ This parse the tags contained in API_answer[tags] and class them so
+        """This parse the tags contained in API_answer[tags] and class them so
         they are more easy to handle in other function such as update_fields()
 
         :param dict tags: a dict of tags as thez are return by the API
diff --git a/modules/layer/add_layer.py b/modules/layer/add_layer.py
@@ -607,7 +607,7 @@ def build_wmts_url(
         try:
             wmts = WebMapTileService(wmts_url_getcap)
         except TypeError as e:
-            logger.error("WMTS - OWSLib mixing str and unicode args", e)
+            logger.error("WMTS - OWSLib mixing str and unicode args :{}".format(e))
         except ServiceException as e:
             logger.error(e)
             return 0, "WMTS - Bad operation: " + wmts_url_getcap, str(e)
diff --git a/modules/layer/limitations_checker.py b/modules/layer/limitations_checker.py
@@ -38,9 +38,7 @@ def __init__(self, layer_adder, tr):
 
     def check(self, data_info: dict):
         logger.debug("Checking data access conditions and limitation")
-        logger.debug("*=====* DEBUG LIM --> data_info : {}".format(data_info))
         limitations = data_info.get("limitations", None)
-        logger.debug("*=====* DEBUG LIM --> limitations : {}".format(limitations))
         # if there are no limits, ok for adding the layer
         if len(limitations) == 0:
             logger.debug("No limitations found, let's add this layer to the canvas !")
diff --git a/modules/layer/metadata_sync.py b/modules/layer/metadata_sync.py
@@ -61,11 +61,6 @@ def filling_field(self, layer, title, abstract, kw_list, url):
         layer.setTitle(title)
         layer.setAbstract(abstract)
         layer.setKeywordList(",".join(kw_list))
-        logger.debug(
-            "*=====* DEBUG URL --> MetadataSynchronizer : portal metadata url = {}".format(
-                url
-            )
-        )
         if url != "":
             layer.setDataUrl(url)
         else:
diff --git a/modules/metadata_display.py b/modules/metadata_display.py
@@ -108,7 +108,9 @@ def show_complete_md(self, md: dict, tags: dict):
             self.complete_md.lbl_title.setText(md.get("name"))
         else:
             self.complete_md.lbl_title.setTextFormat(Qt.TextFormat(1))
-            self.complete_md.lbl_title.setText("<i>{}</i>".format(self.tr("Undefined", context=__class__.__name__)))
+            self.complete_md.lbl_title.setText(
+                "<i>{}</i>".format(self.tr("Undefined", context=__class__.__name__))
+            )
 
         self.complete_md.val_owner.setText(
             md.get("_creator").get("contact").get("name", "NR")
@@ -168,20 +170,17 @@ def show_complete_md(self, md: dict, tags: dict):
             item = ctact.get("contact")
 
             if ctact.get("role", "NR") == "pointOfContact":
-                content = (
-                    "<b>{1}</b> ({2})<br><a href='mailto:{3}' target='_top'>{3}</a><br>{4}"
-                    "<br>{5} {6}<br>{7} {8}<br>{8}<br>{9}".format(
-                        isogeo_tr.tr("roles", ctact.get("role")),
-                        item.get("name", "NR"),
-                        item.get("organization", "NR"),
-                        item.get("email", "NR"),
-                        item.get("phone", "NR"),
-                        item.get("addressLine1", ""),
-                        item.get("addressLine2", ""),
-                        item.get("zipCode", ""),
-                        item.get("city", ""),
-                        item.get("country", ""),
-                    )
+                content = "<b>{1}</b> ({2})<br><a href='mailto:{3}' target='_top'>{3}</a><br>{4}" "<br>{5} {6}<br>{7} {8}<br>{8}<br>{9}".format(
+                    isogeo_tr.tr("roles", ctact.get("role")),
+                    item.get("name", "NR"),
+                    item.get("organization", "NR"),
+                    item.get("email", "NR"),
+                    item.get("phone", "NR"),
+                    item.get("addressLine1", ""),
+                    item.get("addressLine2", ""),
+                    item.get("zipCode", ""),
+                    item.get("city", ""),
+                    item.get("country", ""),
                 )
                 contacts_pt_cct.append(content)
 
@@ -373,9 +372,11 @@ def show_complete_md(self, md: dict, tags: dict):
                 pass
             # INSPIRE precision
             if "directive" in l_in:
-                lim_text += "<br><u>INSPIRE</u><br><ul><li>{}</li><li>{}</li></ul>".format(
-                    l_in.get("directive").get("name"),
-                    l_in.get("directive").get("description"),
+                lim_text += (
+                    "<br><u>INSPIRE</u><br><ul><li>{}</li><li>{}</li></ul>".format(
+                        l_in.get("directive").get("name"),
+                        l_in.get("directive").get("description"),
+                    )
                 )
             else:
                 pass
@@ -430,13 +431,17 @@ def show_complete_md(self, md: dict, tags: dict):
         self.complete_md.show()
         try:
             QgsMessageLog.logMessage(
-                message="Detailed metadata displayed: {}".format(self.complete_md.lbl_title.text()),
+                message="Detailed metadata displayed: {}".format(
+                    self.complete_md.lbl_title.text()
+                ),
                 tag="Isogeo",
                 level=0,
             )
         except UnicodeEncodeError:
             QgsMessageLog.logMessage(
-                message="Detailed metadata displayed: {}".format(self.complete_md.lbl_title.text()),
+                message="Detailed metadata displayed: {}".format(
+                    self.complete_md.lbl_title.text()
+                ),
                 tag="Isogeo",
                 level=0,
             )
diff --git a/modules/quick_search.py b/modules/quick_search.py
@@ -32,11 +32,11 @@
 
 
 class QuickSearchManager:
-    """ A basic class to manage quick searches :
-        - Create a new quick search by giving it a name and writing its parameters in the JSON file
-        (`_user/quicksearches.json`)
-        - Rename a quick search
-        - Delete a quick search
+    """A basic class to manage quick searches :
+    - Create a new quick search by giving it a name and writing its parameters in the JSON file
+    (`_user/quicksearches.json`)
+    - Rename a quick search
+    - Delete a quick search
     """
 
     def __init__(self, search_form_manager: object = None):
diff --git a/modules/results/cache.py b/modules/results/cache.py
@@ -23,8 +23,7 @@
 
 
 class CacheManager:
-    """Basic class to manage the cache system of the layer addition.
-    """
+    """Basic class to manage the cache system of the layer addition."""
 
     def __init__(self):
         # Path to JSON cache file
@@ -55,8 +54,7 @@ def dumper(self):
         logger.debug("Cache has been dumped")
 
     def loader(self):
-        """Load and store ignored elements from the JSON cache file.
-        """
+        """Load and store ignored elements from the JSON cache file."""
         try:
             with open(self.cache_file, "r") as cache:
                 cache_loaded = json.load(cache)
diff --git a/modules/results/display.py b/modules/results/display.py
@@ -168,7 +168,9 @@ def show_results(self, api_results, pg_connections=dict()):
             if title:
                 btn_md_title = QPushButton(plg_tools.format_button_title(title))
             else:
-                btn_md_title = QPushButton(self.tr("Undefined", context=__class__.__name__))
+                btn_md_title = QPushButton(
+                    self.tr("Undefined", context=__class__.__name__)
+                )
                 btn_md_title.setStyleSheet("font: italic")
 
             # Connecting the button to the full metadata popup
@@ -228,46 +230,19 @@ def show_results(self, api_results, pg_connections=dict()):
             lbl_geom.setAlignment(Qt.AlignCenter)
             tbl_result.setCellWidget(count, 2, lbl_geom)
 
-            logger.debug(
-                "*=====* DEBUG LIM --> '{}' md -----------------------------".format(
-                    md._id
-                )
-            )
-            logger.debug("*=====* DEBUG LIM --> lim : {}".format(md.limitations))
-            logger.debug("*=====* DEBUG LIM --> format : {}".format(md.format))
             # COLUMN 4 - Add options
             add_options_dict = {}
 
             # Build metadata portal URL if the setting is checked in "Settings" tab
-            logger.debug(
-                "*=====* DEBUG URL --> ResultsManager : 'isogeo/settings/add_metadata_url_portal' setting value = {}".format(
-                    qsettings.value("isogeo/settings/add_metadata_url_portal", 0)
-                )
-            )
             add_portal_md_url = int(
                 qsettings.value("isogeo/settings/add_metadata_url_portal", 0)
             )
             portal_base_url = self.form_mng.input_portal_url.text()
             portal_md_url = ""
-            logger.debug(
-                "*=====* DEBUG URL --> ResultsManager : add_portal_md_url = {}".format(
-                    add_portal_md_url
-                )
-            )
             if add_portal_md_url and portal_base_url != "":
                 portal_md_url = portal_base_url + md._id
             else:
                 pass
-            logger.debug(
-                "*=====* DEBUG URL --> ResultsManager : input_portal_url.text() = {}".format(
-                    self.form_mng.input_portal_url.text()
-                )
-            )
-            logger.debug(
-                "*=====* DEBUG URL --> ResultsManager : portal_md_url = {}".format(
-                    portal_md_url
-                )
-            )
 
             # Files and PostGIS direct access
             if md.format:
@@ -292,9 +267,6 @@ def show_results(self, api_results, pg_connections=dict()):
                 # Same if the data is a raster
                 elif md.format in li_formats_rastr and md.path:
                     add_path = self._filepath_builder(md.path)
-                    logger.debug(
-                        "*=====* DEBUG ADD FILE --> path : {}".format(add_path)
-                    )
                     if add_path:
                         params = [
                             "raster",
diff --git a/modules/search_form.py b/modules/search_form.py
diff --git a/modules/tools.py b/modules/tools.py
diff --git a/modules/user_inform.py b/modules/user_inform.py
