From b5d3ab3f2a64020e15fb292d076587f65aed6df0 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 04:03:41 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- LDMP/api.py | 10 ++-------- LDMP/areaofinterest.py | 1 - LDMP/calculate.py | 2 -- LDMP/download.py | 6 +----- LDMP/download_data.py | 2 +- LDMP/jobs/manager.py | 5 ++--- LDMP/jobs/mvc.py | 1 - LDMP/landpks.py | 4 ++-- LDMP/layers.py | 5 +++-- LDMP/lc_setup.py | 2 +- LDMP/maptools.py | 1 - LDMP/region_selector.py | 1 - LDMP/reports/mvc.py | 2 +- LDMP/settings.py | 9 +++++---- docs/source/conf.py | 1 - gee/landpks/src/main.py | 2 -- gee/sdg-15-3-1-error-recode/src/main.py | 2 +- gee/sdg-15-3-1-stats/src/main.py | 3 --- tasks.py | 4 ++-- 19 files changed, 21 insertions(+), 42 deletions(-) diff --git a/LDMP/api.py b/LDMP/api.py index 7e018e7bb..ba4aa83ad 100644 --- a/LDMP/api.py +++ b/LDMP/api.py @@ -12,8 +12,6 @@ """ import io -import sys -import typing from future import standard_library @@ -25,9 +23,7 @@ import requests import backoff -from dateutil import tz from qgis.core import ( - QgsApplication, QgsTask, QgsNetworkAccessManager, QgsApplication, @@ -36,8 +32,6 @@ ) from qgis.PyQt import QtCore, QtWidgets, QtNetwork -from qgis.utils import iface -from qgis.gui import QgsAuthConfigSelect from . import auth, conf from .logger import log @@ -106,7 +100,7 @@ def run(self): # dictionaries that contain nested values of OrderedDict. try: doc = QtCore.QJsonDocument(self.payload) - except TypeError as te: + except TypeError: request_data = bytes(json.dumps(self.payload), encoding="utf-8") request_data = ( @@ -191,7 +185,7 @@ def finished(self, result): ) except requests.exceptions.Timeout: self.error_message = tr_api.tr( - f"Unable to connect to Trends.Earth server." + "Unable to connect to Trends.Earth server." ) if self.resp is not None: diff --git a/LDMP/areaofinterest.py b/LDMP/areaofinterest.py index c1a7de1c6..416400cb4 100644 --- a/LDMP/areaofinterest.py +++ b/LDMP/areaofinterest.py @@ -1,6 +1,5 @@ import functools import json -import traceback import typing from pathlib import Path diff --git a/LDMP/calculate.py b/LDMP/calculate.py index b5e3c93bd..da66cffa8 100644 --- a/LDMP/calculate.py +++ b/LDMP/calculate.py @@ -18,7 +18,6 @@ import typing import uuid from pathlib import Path -from typing import Optional import qgis.core import qgis.gui @@ -39,7 +38,6 @@ from .conf import REMOTE_DATASETS from .conf import Setting from .conf import settings_manager -from .logger import log DlgCalculateUi, _ = uic.loadUiType(str(Path(__file__).parent / "gui/DlgCalculate.ui")) diff --git a/LDMP/download.py b/LDMP/download.py index 934a309cb..ff69654e0 100644 --- a/LDMP/download.py +++ b/LDMP/download.py @@ -21,12 +21,8 @@ from functools import partial from pathlib import Path -import requests -from qgis.core import QgsApplication from qgis.core import QgsFileDownloader from qgis.core import QgsNetworkReplyContent -from qgis.core import QgsSettings -from qgis.core import QgsTask from qgis.PyQt import QtCore from qgis.PyQt import QtNetwork from qgis.PyQt import QtWidgets @@ -392,7 +388,7 @@ def start(self): tr_download.tr("Error"), tr_download.tr("Download failed. Check your internet connection."), ) - except Exception as err: + except Exception: QtWidgets.QMessageBox.critical( None, tr_download.tr("Error"), diff --git a/LDMP/download_data.py b/LDMP/download_data.py index a27bd9fb8..dd753daac 100644 --- a/LDMP/download_data.py +++ b/LDMP/download_data.py @@ -141,7 +141,7 @@ def __init__( max_x = item.get("Max Longitude", None) min_y = item.get("Min Latitude", None) max_y = item.get("Max Latitude", None) - if not None in (min_x, max_x, min_y, max_y): + if None not in (min_x, max_x, min_y, max_y): extent_lat = "{} - {}".format(min_y, max_y) extent_lon = "{} - {}".format(min_x, max_x) item.update({"extent_lat": extent_lat, "extent_lon": extent_lon}) diff --git a/LDMP/jobs/manager.py b/LDMP/jobs/manager.py index 6c0facae7..be449842b 100644 --- a/LDMP/jobs/manager.py +++ b/LDMP/jobs/manager.py @@ -1,4 +1,3 @@ -import datetime import datetime as dt import json import logging @@ -799,7 +798,7 @@ def create_error_recode(self, task_name, lc, soil, prod, sdg): status=jobs.JobStatus.DOWNLOADED, local_context=_get_local_context(), results=VectorResults( - name=f"False positive/negative", + name="False positive/negative", type=ResultType.VECTOR_RESULTS, vector=VectorFalsePositive( uri=None, @@ -1166,7 +1165,7 @@ def _get_local_jobs(self, status: jobs.JobStatus) -> typing.List[Job]: raw_job = json.load(fh) job = Job.Schema().load(raw_job) set_results_extents(job) - except (KeyError, json.decoder.JSONDecodeError) as exc: + except (KeyError, json.decoder.JSONDecodeError): if conf.settings_manager.get_value(conf.Setting.DEBUG): log( f"Unable to decode file {job_metadata_path!r} as valid json" diff --git a/LDMP/jobs/mvc.py b/LDMP/jobs/mvc.py index 4ff6eed31..15bd80d3e 100644 --- a/LDMP/jobs/mvc.py +++ b/LDMP/jobs/mvc.py @@ -25,7 +25,6 @@ from ..conf import settings_manager from ..data_io import DlgDataIOAddLayersToMap from ..datasets_dialog import DatasetDetailsDialogue -from ..logger import log from ..plot import DlgPlotTimeries from ..reports.mvc import DatasetReportHandler from ..select_dataset import DlgSelectDataset diff --git a/LDMP/landpks.py b/LDMP/landpks.py index 8ccd8ac62..a0c9c0194 100644 --- a/LDMP/landpks.py +++ b/LDMP/landpks.py @@ -135,7 +135,7 @@ def __init__( max_x = item.get("Max Longitude", None) min_y = item.get("Min Latitude", None) max_y = item.get("Max Latitude", None) - if not None in (min_x, max_x, min_y, max_y): + if None not in (min_x, max_x, min_y, max_y): extent_lat = "{} - {}".format(min_y, max_y) extent_lon = "{} - {}".format(min_x, max_x) item.update({"extent_lat": extent_lat, "extent_lon": extent_lon}) @@ -241,7 +241,7 @@ def btn_calculate(self): log(f"ret: {ret}") if not ret: return - log(f"continuing...") + log("continuing...") rows = list({index.row() for index in self.data_view.selectedIndexes()}) # Construct unique dataset names as the concatenation of the category diff --git a/LDMP/layers.py b/LDMP/layers.py index 7e5d239f2..336f0ffe0 100644 --- a/LDMP/layers.py +++ b/LDMP/layers.py @@ -628,7 +628,8 @@ def add_layer( ) log( 'No style found for "{}" in {}'.format( - band_info["name"], band_number, layer_path + band_info["name"], + band_number, ) ) @@ -836,7 +837,7 @@ def add_vector_layer(layer_path: str, name: str) -> "QgsVectorLayer": def set_default_stats_value(v_path, band_datas): - log(f"setting default stats value function") + log("setting default stats value function") layer = None for l in QgsProject.instance().mapLayers().values(): if l.source().split("|")[0] == v_path: diff --git a/LDMP/lc_setup.py b/LDMP/lc_setup.py index 2532bb025..ea88ac910 100644 --- a/LDMP/lc_setup.py +++ b/LDMP/lc_setup.py @@ -510,7 +510,7 @@ def _get_default_matrix(): os.path.join( os.path.dirname(os.path.realpath(__file__)), "data", - f"land_cover_transition_matrix_unccd.json", + "land_cover_transition_matrix_unccd.json", ) ) diff --git a/LDMP/maptools.py b/LDMP/maptools.py index 1fa02bcf9..b53825436 100644 --- a/LDMP/maptools.py +++ b/LDMP/maptools.py @@ -11,7 +11,6 @@ from qgis.core import QgsRectangle from qgis.core import QgsUnitTypes from qgis.core import QgsVectorLayerUtils -from qgis.core import QgsWkbTypes from qgis.gui import QgsDoubleSpinBox from qgis.gui import QgsMapCanvas from qgis.gui import QgsMapMouseEvent diff --git a/LDMP/region_selector.py b/LDMP/region_selector.py index 3feb0a984..47db0588d 100644 --- a/LDMP/region_selector.py +++ b/LDMP/region_selector.py @@ -1,7 +1,6 @@ from dataclasses import dataclass from qgis.core import QgsGeometry -from qgis.core import QgsRectangle from qgis.PyQt import QtCore from qgis.PyQt import QtWidgets from qgis.utils import iface diff --git a/LDMP/reports/mvc.py b/LDMP/reports/mvc.py index 6407de3f1..30caa10d0 100644 --- a/LDMP/reports/mvc.py +++ b/LDMP/reports/mvc.py @@ -122,7 +122,7 @@ def update_report_status(self) -> bool: def check_job_report_status(self) -> bool: # Check job status, assert datasets are available and no report has # been generated yet. - if not self._job.status in (JobStatus.DOWNLOADED, JobStatus.GENERATED_LOCALLY): + if self._job.status not in (JobStatus.DOWNLOADED, JobStatus.GENERATED_LOCALLY): return False if not job_has_results(self._job): diff --git a/LDMP/settings.py b/LDMP/settings.py index 48da1da62..f46feb287 100644 --- a/LDMP/settings.py +++ b/LDMP/settings.py @@ -10,6 +10,7 @@ email : trends.earth@conservation.org ***************************************************************************/ """ + import os import typing import zipfile @@ -29,7 +30,6 @@ from qgis.utils import iface from te_schemas.land_cover import LCClass -from . import __version__ from . import api from . import auth from . import binaries_available @@ -1325,8 +1325,9 @@ def binaries_download(self): None, self.tr("Error"), self.tr( - "Unable to write to {}. Try a " - "different folder.".format(out_folder) + "Unable to write to {}. Try a " "different folder.".format( + out_folder + ) ), ) @@ -1385,7 +1386,7 @@ def binaries_download(self): QtWidgets.QMessageBox.critical( None, self.tr("Success"), - self.tr("All binaries up to date.".format(out_folder)), + self.tr("All binaries up to date.".format()), ) def binaries_toggle(self): diff --git a/docs/source/conf.py b/docs/source/conf.py index 89a545ebf..2f41e0d08 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -10,7 +10,6 @@ # All configuration values have a default; values that are commented out # serve to show the default. import os -import sys from datetime import date import sphinx_rtd_theme diff --git a/gee/landpks/src/main.py b/gee/landpks/src/main.py index 31beb4e86..5c9f6fcb5 100644 --- a/gee/landpks/src/main.py +++ b/gee/landpks/src/main.py @@ -7,7 +7,6 @@ import os import pathlib import random -import re import tempfile import threading from concurrent.futures import as_completed @@ -15,7 +14,6 @@ from urllib import request import ee -import matplotlib.colors as colors import matplotlib.gridspec as gridspec import matplotlib.pyplot as plt import numpy as np diff --git a/gee/sdg-15-3-1-error-recode/src/main.py b/gee/sdg-15-3-1-error-recode/src/main.py index 46aeff667..8da8fd913 100644 --- a/gee/sdg-15-3-1-error-recode/src/main.py +++ b/gee/sdg-15-3-1-error-recode/src/main.py @@ -78,7 +78,7 @@ def calculate_error_recode( filters, ) except IndexError: - logger.exception("Failed to load band name %s".format(band_name)) + logger.exception("Failed to load band name %s".format()) recode_params = { "write_tifs": write_tifs, diff --git a/gee/sdg-15-3-1-stats/src/main.py b/gee/sdg-15-3-1-stats/src/main.py index ba5f657cb..e7cf15af8 100644 --- a/gee/sdg-15-3-1-stats/src/main.py +++ b/gee/sdg-15-3-1-stats/src/main.py @@ -8,9 +8,6 @@ from te_algorithms.api import util from te_algorithms.gdal.land_deg.land_deg_stats import calculate_statistics -from te_schemas import algorithms -from te_schemas import jobs -from te_schemas.aoi import AOI from te_schemas.error_recode import ErrorRecodePolygons from te_schemas.productivity import ProductivityMode from te_schemas.results import JsonResults diff --git a/tasks.py b/tasks.py index 4adf103b0..f56dc40dd 100644 --- a/tasks.py +++ b/tasks.py @@ -338,7 +338,7 @@ def set_tag(c, modules=False): ) ret.check_returncode() else: - print("Changes not committed - VERSION TAG NOT SET".format(v)) + print("Changes not committed - VERSION TAG NOT SET".format()) print("Tagging version {} and pushing tag to origin".format(v)) ret = subprocess.run( @@ -1663,7 +1663,7 @@ def _s3_sync(c, bucket, s3_prefix, local_folder, patterns=["*"]): if os.path.isdir(f): continue - if not os.path.basename(f) in s3_object_names: + if os.path.basename(f) not in s3_object_names: print("S3 is missing {} - copying to S3.".format(f)) data = open(f, "rb") client.put_object(