ruff formatting

Author: jensdebruijn

docs/conf.py

@@ -13,7 +13,6 @@
 #
 import os
 import sys
-import sphinx_rtd_theme
 
 sys.path.insert(0, os.path.abspath(".."))
 

examples/agent_agent.py

@@ -55,7 +55,7 @@ def spread_virus_to_neighbors(self):
             maxx=self.model.xmax,
             maxy=self.model.ymax,
             grid="orthogonal",
-            search_ids=np.where(self.infected == True)[0],
+            search_ids=np.where(self.infected)[0],
         ).ravel()
         neighbors = neighbors[neighbors != -1]
         to_infect = neighbors[~self.vaccinated[neighbors]]

examples/agent_environment.py

@@ -39,6 +39,8 @@ def set_locations(self):
     def step(self):
         values_from_array = sample_from_map(MAP, self.locations, MAP_GEOTRANSFORM)
         values_from_GTiff = self.data.sample_coords(self.locations)
+        print(values_from_array)
+        print(values_from_GTiff)
 
 
 class Agents(AgentBaseClass):

honeybees/argparse.py

@@ -9,14 +9,14 @@
     "--GUI",
     dest="GUI",
     action="store_true",
-    help=f"The model can be run with or without a visual interface. The visual interface is useful to display the results in real-time while the model is running and to better understand what is going on. You can simply start or stop the model with the click of a buttion, or advance the model by an `x` number of timesteps. However, the visual interface is much slower than running the model without it.",
+    help="The model can be run with or without a visual interface. The visual interface is useful to display the results in real-time while the model is running and to better understand what is going on. You can simply start or stop the model with the click of a buttion, or advance the model by an `x` number of timesteps. However, the visual interface is much slower than running the model without it.",
 )
 parser.set_defaults(GUI=False)
 parser.add_argument(
     "--no-browser",
     dest="browser",
     action="store_false",
-    help=f"Do not open browser when running the model. This option is, for example, useful when running the model on a server, and you would like to remotely access the model.",
+    help="Do not open browser when running the model. This option is, for example, useful when running the model on a server, and you would like to remotely access the model.",
 )
 parser.set_defaults(browser=True)
 default_port = 8521

honeybees/library/mapIO.py

@@ -30,10 +30,6 @@ def get_source_gt(self) -> None:
         """Get Geotransformation of the source file. Must be implemented in the child class."""
         raise NotImplementedError
 
-    def get_data_array(self) -> None:
-        """Read data array. Must be implemented in child class."""
-        raise NotImplementedError
-
     def set_window_and_gt(self) -> None:
         """This function gets the geotransformation (gt) of the cut map, and the rows to read from the original data (rowslice, colslice)."""
         gt_ds = self.get_source_gt()

honeybees/model.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 from datetime import timedelta
 from dateutil.relativedelta import relativedelta
-from time import time
 import logging
 import yaml
 
@@ -203,13 +202,13 @@ def step(self, step_size=1, report=True):
 
         assert isinstance(n, int) and n > 0
         for _ in range(n):
-            t0 = time()
+            # t0 = time()
             # print('Simulating agent behavior')
             self.agents.step()
-            t1 = time()
+            # t1 = time()
             if report:
                 self.reporter.step()
-            t2 = time()
+            # t2 = time()
             # print('\tstep time', t1- t0)
             # print('\treport time', t2 - t1)
 

honeybees/reporter.py

@@ -23,7 +23,6 @@
 from collections.abc import Iterable
 import os
 import numpy as np
-from pathlib import Path
 
 try:
     import cupy as cp

honeybees/visualization/UserParam.py

@@ -75,7 +75,7 @@ def __init__(
         valid = True
 
         if self.param_type == self.NUMBER:
-            valid = not (self.value is None)
+            valid = self.value is not None
 
         elif self.param_type == self.SLIDER:
             valid = not (

honeybees/visualization/canvas.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 import math
-from typing import Type
 from honeybees.visualization.ModularVisualization import VisualizationElement
 import numpy as np
 from PIL import Image
@@ -175,11 +174,11 @@ def get_static_space_state(self, model):
                     if isinstance(geojsons, (list, tuple)):
                         for geojson in geojsons:
                             assert isinstance(geojson, dict)
-                            if not "properties" in geojson:
+                            if "properties" not in geojson:
                                 raise ValueError(
                                     f"Geojson for {name} has not properties"
                                 )
-                            if not "id" in geojson["properties"]:
+                            if "id" not in geojson["properties"]:
                                 raise ValueError(f"Geojson for {name} has not ID")
                             ID = geojson["properties"]["id"]
                             if ID in used_IDs:

honeybees/visualization/modules/__init__.py

@@ -2,5 +2,3 @@
 """
 Container for all built-in visualization modules.
 """
-
-from honeybees.visualization.modules.ChartVisualization import ChartModule

tests/library/test_neighbors.py

@@ -1,14 +1,10 @@
 # -*- coding: utf-8 -*-
 import numpy as np
-import matplotlib.pyplot as plt
 import pytest
-import os
-import numpy as np
 from numba import njit
 
 import matplotlib.patches as mpatches
 from honeybees.library import geohash
-from honeybees.library.raster import coord_to_pixel
 from honeybees.library.neighbors import find_neighbors