[pre-commit.ci] pre-commit autoupdate (#333)

* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.8.6 → v0.9.1](astral-sh/ruff-pre-commit@v0.8.6...v0.9.1)

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: pre-commit-ci[bot]

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ repos:
   # Lint / autoformat: Python code
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: "v0.8.6"
+    rev: "v0.9.1"
     hooks:
       # Run the linter
       - id: ruff

osm_fieldwork/OdkCentral.py

@@ -1139,7 +1139,7 @@ def deleteForm(
                 log.warning(json_data)
                 return False
             except json.decoder.JSONDecodeError:
-                log.error("Could not parse response json during form deletion. " f"status_code={result.status_code}")
+                log.error(f"Could not parse response json during form deletion. status_code={result.status_code}")
             finally:
                 return False
 
@@ -1629,7 +1629,7 @@ def deleteEntity(
 
         if not response.ok:
             if response.status_code == 404:
-                msg = f"Does not exist: project ({projectId}) dataset ({datasetName}) " f"entity ({entityUuid})"
+                msg = f"Does not exist: project ({projectId}) dataset ({datasetName}) entity ({entityUuid})"
                 log.debug(msg)
                 raise requests.exceptions.HTTPError(msg)
             log.debug(f"Failed to delete Entity. Status code: {response.status_code}")
@@ -1701,7 +1701,7 @@ def getEntityData(
     """
     logging.basicConfig(
         level=log_level,
-        format=("%(asctime)s.%(msecs)03d [%(levelname)s] " "%(name)s | %(funcName)s:%(lineno)d | %(message)s"),
+        format=("%(asctime)s.%(msecs)03d [%(levelname)s] %(name)s | %(funcName)s:%(lineno)d | %(message)s"),
         datefmt="%y-%m-%d %H:%M:%S",
         stream=sys.stdout,
     )

osm_fieldwork/OdkCentralAsync.py

@@ -453,7 +453,7 @@ async def getEntity(
         Returns:
             dict: the JSON entity details, for a specific dataset.
         """
-        url = f"{self.base}projects/{projectId}/datasets/{datasetName}" f"/entities/{entityUuid}"
+        url = f"{self.base}projects/{projectId}/datasets/{datasetName}/entities/{entityUuid}"
         try:
             async with self.session.get(url, ssl=self.verify) as response:
                 return await response.json()
@@ -700,7 +700,7 @@ async def deleteEntity(
         url = f"{self.base}projects/{projectId}/datasets/{datasetName}/entities/{entityUuid}"
         log.debug(f"Deleting dataset ({datasetName}) entity UUID ({entityUuid})")
         try:
-            log.info(f"Deleting Entity ({entityUuid}) for ODK project ({projectId}) " f"and dataset ({datasetName})")
+            log.info(f"Deleting Entity ({entityUuid}) for ODK project ({projectId}) and dataset ({datasetName})")
             async with self.session.delete(url, ssl=self.verify) as response:
                 success = (response_msg := await response.json()).get("success", False)
                 if not success:

osm_fieldwork/basemapper.py

@@ -686,9 +686,7 @@ def main():
         "--boundary",
         nargs="*",
         required=True,
-        help=(
-            "The boundary for the area you want. " "Accepts path to geojson file or bbox string. " "Format min_x min_y max_x max_y"
-        ),
+        help=("The boundary for the area you want. Accepts path to geojson file or bbox string. Format min_x min_y max_x max_y"),
     )
     parser.add_argument("-t", "--tms", help="Custom TMS URL")
     parser.add_argument("--xy", action="store_true", help="Swap the X & Y coordinates when using a custom TMS")

osm_fieldwork/make_data_extract.py

@@ -185,7 +185,7 @@ def main():
     if args.verbose is not None:
         logging.basicConfig(
             level=logging.DEBUG,
-            format=("%(asctime)s.%(msecs)03d [%(levelname)s] " "%(name)s | %(funcName)s:%(lineno)d | %(message)s"),
+            format=("%(asctime)s.%(msecs)03d [%(levelname)s] %(name)s | %(funcName)s:%(lineno)d | %(message)s"),
             datefmt="%y-%m-%d %H:%M:%S",
             stream=sys.stdout,
         )

tests/conftest.py

@@ -29,7 +29,7 @@
 
 logging.basicConfig(
     level="DEBUG",
-    format=("%(asctime)s.%(msecs)03d [%(levelname)s] " "%(name)s | %(funcName)s:%(lineno)d | %(message)s"),
+    format=("%(asctime)s.%(msecs)03d [%(levelname)s] %(name)s | %(funcName)s:%(lineno)d | %(message)s"),
     datefmt="%y-%m-%d %H:%M:%S",
     stream=sys.stdout,
 )

tests/test_update_xlsform.py

@@ -106,8 +106,7 @@ def check_survey_sheet(workbook: Workbook) -> None:
 
     expected_calculation = "once('building')"
     assert form_category_calculation == expected_calculation, (
-        f"Expected 'calculation' value for 'form_category' to be '{expected_calculation}', "
-        f"but got '{form_category_calculation}'."
+        f"Expected 'calculation' value for 'form_category' to be '{expected_calculation}', but got '{form_category_calculation}'."
     )
 
     check_for_duplicates(survey_sheet, name_col_index)