ci: apply ruff autofix

Author: wang-boyu

examples/geo_schelling/server.py

@@ -28,7 +28,7 @@ def schelling_draw(agent):
     """
     Portrayal Method for canvas
     """
-    portrayal = dict()
+    portrayal = {}
     if agent.atype is None:
         portrayal["color"] = "Grey"
     elif agent.atype == 0:

examples/geo_schelling_points/geo_schelling_points/model.py

@@ -49,9 +49,8 @@ def __init__(self, red_percentage=0.5, similarity_threshold=0.5):
     def unhappy(self):
         num_unhappy = 0
         for agent in self.space.agents:
-            if isinstance(agent, PersonAgent):
-                if agent.is_unhappy:
-                    num_unhappy += 1
+            if isinstance(agent, PersonAgent) and agent.is_unhappy:
+                num_unhappy += 1
         return num_unhappy
 
     @property

examples/geo_schelling_points/geo_schelling_points/server.py

@@ -25,7 +25,7 @@ def render(self, model):
 
 
 def schelling_draw(agent):
-    portrayal = dict()
+    portrayal = {}
     if isinstance(agent, RegionAgent):
         if agent.red_cnt > agent.blue_cnt:
             portrayal["color"] = "Red"

examples/geo_sir/server.py

@@ -32,7 +32,7 @@ def infected_draw(agent):
     """
     Portrayal Method for canvas
     """
-    portrayal = dict()
+    portrayal = {}
     if isinstance(agent, PersonAgent):
         portrayal["radius"] = "2"
     if agent.atype in ["hotspot", "infected"]:

examples/rainfall/rainfall/model.py

@@ -52,7 +52,7 @@ def step(self):
                 ),
                 key=lambda cell: cell.elevation + cell.water_level,
             ).pos
-            if not lowest_pos == self.pos:
+            if lowest_pos != self.pos:
                 self.model.space.move_raindrop(self, lowest_pos)
 
 

examples/urban_growth/urban_growth/space.py

@@ -97,18 +97,17 @@ def load_datasets(
             "land_use": land_use_data,
         }
         for attribute_name, data_file in data.items():
-            with gzip.open(data_file, "rb") as f:
-                with rio.open(f, "r") as dataset:
-                    values = dataset.read()
+            with gzip.open(data_file, "rb") as f, rio.open(f, "r") as dataset:
+                values = dataset.read()
             self.raster_layer.apply_raster(values, attr_name=attribute_name)
 
         for cell in self.raster_layer:
-            cell.urban = True if cell.urban == 2 else False
+            cell.urban = cell.urban == 2
             cell.old_urbanized = cell.urban
 
     def check_road(self):
         for cell in self.raster_layer:
-            cell.road = True if cell.road_1 > 0 else False
+            cell.road = cell.road_1 > 0
 
     @property
     def raster_layer(self):

mesa_geo/geoagent.py

@@ -73,8 +73,6 @@ def step(self):
         Advance one step.
         """
 
-        pass
-
     def __geo_interface__(self):
         """
         Return a GeoJSON Feature. Removes geometry from attributes.
@@ -191,14 +189,14 @@ def from_GeoDataFrame(self, gdf, unique_id="index", set_attributes=True):
                     f"{self.__class__.__name__} and {gdf.__class__.__name__}."
                 )
 
-        agents = list()
+        agents = []
         for index, row in gdf.iterrows():
             geometry = row[gdf.geometry.name]
             new_agent = self.create_agent(geometry=geometry, unique_id=index)
 
             if set_attributes:
                 for col in row.index:
-                    if not col == gdf.geometry.name:
+                    if col != gdf.geometry.name:
                         setattr(new_agent, col, row[col])
             agents.append(new_agent)
 
@@ -230,10 +228,7 @@ def from_GeoJSON(self, GeoJSON, unique_id="index", set_attributes=True):
         :param set_attributes: Set agent attributes from GeoDataFrame columns. Default True.
         """
 
-        if type(GeoJSON) is str:
-            gj = json.loads(GeoJSON)
-        else:
-            gj = GeoJSON
+        gj = json.loads(GeoJSON) if type(GeoJSON) is str else GeoJSON
 
         gdf = gpd.GeoDataFrame.from_features(gj)
         # epsg:4326 is the CRS for all GeoJSON: https://datatracker.ietf.org/doc/html/rfc7946#section-4