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

pre-commit-ci[bot] · web-flow · commit ed33f2000f83 · 2023-02-07T09:38:21.000-05:00
* [pre-commit.ci] pre-commit autoupdate updates: - [github.com/psf/black: 22.12.0 → 23.1.0](psf/black@22.12.0...23.1.0) * [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>
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
 -   repo: https://github.com/psf/black
-    rev: 22.12.0
+    rev: 23.1.0
     hooks:
     - id: black
       language_version: python3
diff --git a/setup.py b/setup.py
@@ -20,7 +20,6 @@ def _get_requirements_from_files(groups_files):
 
 
 def setup_package():
-
     _groups_files = {
         "base": "requirements.txt",  # basic requirements
         "docs": "requirements_docs.txt",  # requirements for building docs
diff --git a/spopt/locate/coverage.py b/spopt/locate/coverage.py
@@ -247,7 +247,6 @@ def from_cost_matrix(
             )
 
         if demand_quantity_arr is not None:
-
             sum_demand = demand_quantity_arr.sum()
             sum_capacity = facility_capacity_arr.sum()
             if sum_demand > sum_capacity:
diff --git a/spopt/locate/util.py b/spopt/locate/util.py
@@ -85,7 +85,6 @@ def simulated_geo_points(
     numpy.random.seed(seed)
 
     while not simulated_points_all:
-
         # generate (x,y) coordinates within bounding box of ``geom``
         x = numpy.random.uniform(xmin, xmax, 1)
         y = numpy.random.uniform(ymin, ymax, 1)
diff --git a/spopt/region/azp.py b/spopt/region/azp.py
@@ -131,7 +131,6 @@ def __init__(
         initial_labels=None,
         objective_func=ObjectiveFunctionPairwise(),
     ):
-
         self.gdf = gdf
         self.w = w
         self.attrs_name = attrs_name
@@ -862,7 +861,6 @@ def fit_from_scipy_sparse_matrix(
                 initial_labels = self.azp.labels_
 
                 if old_sol is not None:
-
                     if (old_sol == initial_labels).all():
                         break
             # added termination condition (not in Openshaw & Rao (1995))
@@ -1096,7 +1094,6 @@ def _azp_connected_component(self, adj, initial_clustering, attr):
                     if self.allow_move_strategy(
                         aspiration_move.area, aspiration_move.new_region, labels
                     ):
-
                         self._make_move(
                             aspiration_move.area,
                             aspiration_move.new_region,
diff --git a/spopt/region/azp_util.py b/spopt/region/azp_util.py
@@ -64,7 +64,6 @@ def __call__(self, moving_area, new_region, labels):
             self.objective_val += diff
             return True
         else:
-
             return False
 
 
@@ -86,7 +85,6 @@ def __call__(self, moving_area, new_region, labels):
             self.notify_move_made()
             return True
         else:
-
             prob = math.exp(-diff / self.t)
             move_allowed = random.random() < prob
             if move_allowed:
diff --git a/spopt/region/maxp.py b/spopt/region/maxp.py
@@ -310,7 +310,6 @@ def growClusterForPoly(
     i = 0
 
     while i < len(NeighborPolys):
-
         if spatialAttrTotal >= spatialThre:
             break
         Pn = NeighborPolys[i]
@@ -802,7 +801,6 @@ def __init__(
         verbose=False,
         policy="single",
     ):
-
         self.gdf = gdf
         self.w = w
         self.attrs_name = attrs_name
diff --git a/spopt/region/random_region.py b/spopt/region/random_region.py
@@ -141,7 +141,6 @@ def __init__(
         max_swaps=1000000,
         permutations=99,
     ):
-
         solutions = []
         for i in range(permutations):
             solutions.append(
@@ -280,7 +279,6 @@ def __init__(
         compact=False,
         max_swaps=1000000,
     ):
-
         self.n = len(area_ids)
         ids = copy.copy(area_ids)
         self.ids = list(np.random.permutation(ids))
@@ -439,7 +437,6 @@ def build_contig_regions(
             grow_region = self.grow_free
         iter = 0
         while iter < maxiter:
-
             # regionalization setup
             regions = []
             size_pre = 0
@@ -461,7 +458,6 @@ def build_contig_regions(
                     size_pre = len(regions)
                 # test if swapping is needed
                 if counter == len(candidates):
-
                     # start swapping
                     # -- swapping simply changes the candidate list
                     swap_in = None  # area to become new candidate
diff --git a/spopt/region/ward.py b/spopt/region/ward.py
@@ -69,7 +69,6 @@ class WardSpatial(BaseSpOptHeuristicSolver):
     """
 
     def __init__(self, gdf, w, attrs_name, n_clusters=5, clustering_kwds=dict()):
-
         self.gdf = gdf
         self.w = w
         self.attrs_name = attrs_name
diff --git a/spopt/tests/test_azp.py b/spopt/tests/test_azp.py
@@ -16,7 +16,6 @@
 
 class TestAZP:
     def setup_method(self):
-
         self.mexico = MEXICO.copy()
 
         # labels for from_w:
diff --git a/spopt/tests/test_locate_util.py b/spopt/tests/test_locate_util.py
@@ -5,7 +5,6 @@
 
 class TestSimulatedGeoPoints:
     def setup_method(self) -> None:
-
         lattice = spaghetti.regular_lattice((0, 0, 10, 10), 9, exterior=True)
         ntw = spaghetti.Network(in_data=lattice)
         gdf = spaghetti.element_as_gdf(ntw, arcs=True)
diff --git a/spopt/tests/test_lscp.py b/spopt/tests/test_lscp.py
@@ -250,7 +250,6 @@ def test_infeasibility_lscp_from_geodataframe(self):
 
 class TestErrorsWarnings:
     def setup_method(self) -> None:
-
         pol1 = Polygon([(0, 0), (1, 0), (1, 1)])
         pol2 = Polygon([(0, 0), (1, 0), (1, 1), (0, 1)])
         pol3 = Polygon([(2, 0), (3, 0), (3, 1), (2, 1)])
diff --git a/spopt/tests/test_lscpb.py b/spopt/tests/test_lscpb.py
@@ -282,7 +282,6 @@ def test_infeasibility_lscpb_from_geodataframe(self):
 
 class TestErrorsWarnings:
     def setup_method(self) -> None:
-
         pol1 = Polygon([(0, 0), (1, 0), (1, 1)])
         pol2 = Polygon([(0, 0), (1, 0), (1, 1), (0, 1)])
         pol3 = Polygon([(2, 0), (3, 0), (3, 1), (2, 1)])
diff --git a/spopt/tests/test_maxp.py b/spopt/tests/test_maxp.py
@@ -15,7 +15,6 @@
 
 class TestMaxPHeuristic:
     def setup_method(self):
-
         self.mexico = MEXICO.copy()
         self.mexico["count"] = 1
         self.w = libpysal.weights.Queen.from_dataframe(self.mexico)
diff --git a/spopt/tests/test_mclp.py b/spopt/tests/test_mclp.py
@@ -127,7 +127,6 @@ def test_mclp_client_facility_array_from_cost_matrix(self):
         )
 
     def test_mclp_from_geodataframe(self):
-
         mclp = MCLP.from_geodataframe(
             self.clients_snapped,
             self.facilities_snapped,
@@ -394,7 +393,6 @@ def test_attribute_error_percentage_MCLP_facility_client_array(self):
 
 class TestErrorsWarnings:
     def setup_method(self) -> None:
-
         pol1 = Polygon([(0, 0), (1, 0), (1, 1)])
         pol2 = Polygon([(0, 0), (1, 0), (1, 1), (0, 1)])
         pol3 = Polygon([(2, 0), (3, 0), (3, 1), (2, 1)])
diff --git a/spopt/tests/test_p_center.py b/spopt/tests/test_p_center.py
@@ -148,7 +148,6 @@ def test_pcenter_client_facility_array_from_geodataframe(self):
         )
 
     def test_pcenter_preselected_facility_client_array_from_geodataframe(self):
-
         known_objval = 6.2520432
         known_solution_set = ["y_2_", "y_3_", "y_4_"]
 
@@ -255,7 +254,6 @@ def test_infeasibility_pcenter_from_geodataframe(self):
 
 class TestErrorsWarnings:
     def setup_method(self) -> None:
-
         pol1 = Polygon([(0, 0), (1, 0), (1, 1)])
         pol2 = Polygon([(0, 0), (1, 0), (1, 1), (0, 1)])
         pol3 = Polygon([(2, 0), (3, 0), (3, 1), (2, 1)])
diff --git a/spopt/tests/test_p_dispersion.py b/spopt/tests/test_p_dispersion.py
@@ -79,7 +79,6 @@ def test_p_dispersion_from_geodataframe(self):
         assert isinstance(result, PDispersion)
 
     def test_p_dispersion_preselected_facility_array_from_geodataframe(self):
-
         known_objval = 4.213464
         known_solution_set = ["y_1_", "y_3_", "y_4_"]
 
@@ -180,7 +179,6 @@ def test_infeasibility_p_dispersion_from_geodataframe(self):
 
 class TestErrorsWarnings:
     def setup_method(self) -> None:
-
         pol1 = Polygon([(0, 0), (1, 0), (1, 1)])
         pol2 = Polygon([(0, 0), (1, 0), (1, 1), (0, 1)])
         pol3 = Polygon([(2, 0), (3, 0), (3, 1), (2, 1)])
diff --git a/spopt/tests/test_p_median.py b/spopt/tests/test_p_median.py
@@ -157,7 +157,6 @@ def test_pmedian_client_facility_array_from_geodataframe(self):
         )
 
     def test_pmedian_preselected_facility_client_array_from_geodataframe(self):
-
         known_objval = 1872.5093264630818
         known_mean = 3.0299503664451164
         known_solution_set = ["y_1_", "y_3_", "y_4_"]
@@ -278,7 +277,6 @@ def test_infeasibility_pmedian_from_geodataframe(self):
 
 class TestErrorsWarnings:
     def setup_method(self) -> None:
-
         pol1 = Polygon([(0, 0), (1, 0), (1, 1)])
         pol2 = Polygon([(0, 0), (1, 0), (1, 1), (0, 1)])
         pol3 = Polygon([(2, 0), (3, 0), (3, 1), (2, 1)])
diff --git a/spopt/tests/test_random_regions.py b/spopt/tests/test_random_regions.py
@@ -21,7 +21,6 @@
 # Empirical tests ------------------------------------------------------------------------
 class TestRandomRegionEmpirical:
     def setup_method(self):
-
         self.mexico = MEXICO.copy()
         self.cards = self.mexico.groupby(by="HANSON03").count().NAME.values.tolist()
         self.ids = self.mexico.index.values.tolist()
@@ -71,7 +70,6 @@ def test_random_region_6_card_contig_compact(self):
 
 class TestRandomRegionsEmpirical:
     def setup_method(self):
-
         self.mexico = MEXICO.copy()
         self.cards = self.mexico.groupby(by="HANSON03").count().NAME.values.tolist()
         self.ids = self.mexico.index.values.tolist()
@@ -98,7 +96,6 @@ def test_random_regions_6_card(self):
 # Synthetic tests ------------------------------------------------------------------------
 class TestRandomRegionSynthetic:
     def setup_method(self):
-
         self.nregs = N_REGIONS
         self.cards = SYNTH_CARDS
         self.w = SYNTH_W
@@ -183,7 +180,6 @@ def test_random_regions_error_nregs(self):
 
 class TestRandomRegionsSynthetic:
     def setup_method(self):
-
         self.nregs = N_REGIONS
         self.cards = SYNTH_CARDS
         self.w = SYNTH_W
diff --git a/spopt/tests/test_region_k_means.py b/spopt/tests/test_region_k_means.py
@@ -12,7 +12,6 @@
 
 class TestRegionKMeansHeuristic:
     def setup_method(self):
-
         # small 3 x 3 example w/ 3 regions
         dim_small = 3
         self.w_small = libpysal.weights.lat2W(dim_small, dim_small)
diff --git a/spopt/tests/test_skater.py b/spopt/tests/test_skater.py
@@ -20,7 +20,6 @@
 
 class TestSkater:
     def setup_method(self):
-
         # Mexico
         self.mexico = MEXICO.copy()
         self.w_mexico = libpysal.weights.Queen.from_dataframe(self.mexico)
diff --git a/spopt/tests/test_spenc.py b/spopt/tests/test_spenc.py
@@ -15,7 +15,6 @@
 
 class TestSpenc:
     def setup_method(self):
-
         # Mexico
         self.mexico = MEXICO.copy()
         self.w_mexico = libpysal.weights.Queen.from_dataframe(self.mexico)
diff --git a/spopt/tests/test_ward.py b/spopt/tests/test_ward.py
@@ -14,7 +14,6 @@
 
 class TestWard:
     def setup_method(self):
-
         self.mexico = MEXICO.copy()
         self.mexico["count"] = 1
         self.attrs_name = [f"PCGDP{year}" for year in range(1950, 2010, 10)]

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,6 @@ def from_cost_matrix(`
`247`	`247`	`)`
`248`	`248`
`249`	`249`	`if demand_quantity_arr is not None:`
`250`		`-`
`251`	`250`	`sum_demand = demand_quantity_arr.sum()`
`252`	`251`	`sum_capacity = facility_capacity_arr.sum()`
`253`	`252`	`if sum_demand > sum_capacity:`