Fix PULP default solver installation

.github/workflows/testing.yml

@@ -68,7 +68,7 @@ jobs:
           pytest spopt \
           -v \
           -r a \
-          -n logical \
+          -n 1 \
           --color yes \
           --cov spopt \
           --cov-append \

ci/py311_spopt-latest.yaml

@@ -3,6 +3,7 @@ channels:
   - conda-forge
 dependencies:
   - python=3.11
+  - coin-or-cbc
   - fast_hdbscan # for sa3
   - geopandas
   - libpysal
@@ -12,6 +13,7 @@ dependencies:
   - numpy
   - pandas
   - pointpats
+  - pulp
   - scikit-learn
   - scipy
   - shapely
@@ -23,9 +25,4 @@ dependencies:
   - coverage
   - pytest
   - pytest-cov
-  - pytest-xdist
-
-  # with pip
-  - pip
-  - pip:
-    - pulp
+  - pytest-xdist

ci/py311_spopt-oldest.yaml

@@ -3,6 +3,7 @@ channels:
   - conda-forge
 dependencies:
   - python=3.11
+  - coin-or-cbc
   - fast_hdbscan=0.2.2 # for sa3
   - fiona<1.10 # see gh#492
   - geopandas=0.14.0
@@ -13,6 +14,7 @@ dependencies:
   - numpy=1.26.0
   - pandas=2.1.0
   - pointpats=2.4.0
+  - pulp=2.8
   - scikit-learn=1.4.0
   - scipy=1.12.0
   - shapely=2.1.0
@@ -25,8 +27,3 @@ dependencies:
   - pytest
   - pytest-cov
   - pytest-xdist
-
-  # with pip
-  - pip
-  - pip:
-    - pulp==2.8

ci/py312_spopt-latest.yaml

@@ -3,6 +3,7 @@ channels:
   - conda-forge
 dependencies:
   - python=3.12
+  - coin-or-cbc
   - fast_hdbscan # for sa3
   - geopandas
   - libpysal
@@ -12,6 +13,7 @@ dependencies:
   - numpy
   - pandas
   - pointpats
+  - pulp
   - scikit-learn
   - scipy
   - shapely
@@ -24,8 +26,3 @@ dependencies:
   - pytest
   - pytest-cov
   - pytest-xdist
-
-  # with pip
-  - pip
-  - pip:
-    - pulp

ci/py313_spopt-dev.yaml

@@ -3,9 +3,11 @@ channels:
   - conda-forge
 dependencies:
   - python=3.13
+  - coin-or-cbc
   - fast_hdbscan # for sa3
   - folium # for geopandas.explore()
   - matplotlib # for geopandas.explore()
+  - pulp
   - numba # for sa3
   - tqdm
 
@@ -26,7 +28,6 @@ dependencies:
     - networkx
     - numpy
     - pandas
-    - pulp
     - scikit-learn
     - scipy
     - shapely

ci/py313_spopt-latest.yaml

@@ -3,6 +3,7 @@ channels:
   - conda-forge
 dependencies:
   - python=3.13
+  - coin-or-cbc
   - fast_hdbscan # for sa3
   - geopandas
   - libpysal
@@ -12,6 +13,7 @@ dependencies:
   - numpy
   - pandas
   - pointpats
+  - pulp
   - scikit-learn
   - scipy
   - shapely
@@ -32,8 +34,3 @@ dependencies:
   - sphinxcontrib-bibtex
   - sphinx_bootstrap_theme
 
-  # with pip
-  - pip
-  - pip:
-    - pulp
-

environment.yml

@@ -3,6 +3,7 @@ channels:
   - conda-forge
 dependencies:
   - python=3.13
+  - coin-or-cbc
   - fast_hdbscan
   - geopandas
   - jupyterlab
@@ -35,5 +36,4 @@ dependencies:
   - pip:
     - git+https://github.com/pysal/spopt.git@main
     # (notebook/binder specific) having trouble resolving routingpy via conda-forge
-    - routingpy
-    - pulp
+    - routingpy

spopt/tests/test_locate/test_c_p_median.py

@@ -25,7 +25,7 @@ def test_c_p_median_from_cost_matrix(self):
             p_facilities=2,
             facility_capacities=facility_capacity,
         )
-        result = p_median.solve(pulp.PULP_CBC_CMD(msg=False))
+        result = p_median.solve(pulp.COIN_CMD(msg=False))
         assert isinstance(result, PMedian)
 
         known = [[1], [2]]
@@ -48,7 +48,7 @@ def test_c_p_median_with_predefined_facilities_from_cost_matrix(self):
             predefined_facilities_arr=predefine,
             fulfill_predefined_fac=True,
         )
-        result = p_median.solve(pulp.PULP_CBC_CMD(msg=False))
+        result = p_median.solve(pulp.COIN_CMD(msg=False))
         assert isinstance(result, PMedian)
 
         known = [[1], [2]]
@@ -74,7 +74,7 @@ def test_c_p_median_with_predefined_facilities_infeasible(
             fulfill_predefined_fac=True,
         )
         with loc_raises_infeasible:
-            p_median.solve(pulp.PULP_CBC_CMD(msg=False))
+            p_median.solve(pulp.COIN_CMD(msg=False))
 
 
 class TestRealWorldLocate:
@@ -116,15 +116,15 @@ def test_optimality_capacitated_pmedian_with_predefined_facilities(self):
             facility_capacities=self.capacities_arr,
             fulfill_predefined_fac=True,
         )
-        pmedian = pmedian.solve(pulp.PULP_CBC_CMD(msg=False))
+        pmedian = pmedian.solve(pulp.COIN_CMD(msg=False))
         assert pmedian.problem.status == pulp.LpStatusOptimal
 
     def test_infeasibility_capacitated_pmedian(self, loc_raises_infeasible):
         pmedian = PMedian.from_cost_matrix(
             self.cost_matrix, self.demand, 0, facility_capacities=self.capacities_arr
         )
         with loc_raises_infeasible:
-            pmedian.solve(pulp.PULP_CBC_CMD(msg=False))
+            pmedian.solve(pulp.COIN_CMD(msg=False))
 
     def test_mixin_mean_time(self):
         mean_time_expected = 87.2
@@ -136,7 +136,7 @@ def test_mixin_mean_time(self):
             facility_capacities=self.capacities_arr,
             fulfill_predefined_fac=True,
         )
-        pmedian = pmedian.solve(pulp.PULP_CBC_CMD(msg=False))
+        pmedian = pmedian.solve(pulp.COIN_CMD(msg=False))
         assert pmedian.mean_dist == mean_time_expected
 
     def test_infeasibility_predefined_facilities_fulfillment_error(self):

spopt/tests/test_locate/test_clscp-so.py

@@ -26,7 +26,7 @@ def test_clscpso_y1_lt_y2(self):
             facility_capacity_arr=facility_capacity,
             demand_quantity_arr=demand_quantity,
         )
-        result = clscpso.solve(pulp.PULP_CBC_CMD(msg=False))
+        result = clscpso.solve(pulp.COIN_CMD(msg=False))
         assert isinstance(result, LSCP)
 
         known = [[1], [1], [1], [1], [1]]
@@ -47,7 +47,7 @@ def test_clscpso_y1_gt_y2(self):
             facility_capacity_arr=facility_capacity,
             demand_quantity_arr=demand_quantity,
         )
-        result = clscpso.solve(pulp.PULP_CBC_CMD(msg=False))
+        result = clscpso.solve(pulp.COIN_CMD(msg=False))
         assert isinstance(result, LSCP)
 
         known = [[1], [1], [0, 1], [0, 1], [0, 1]]
@@ -68,7 +68,7 @@ def test_clscpso_y1_eq_y2(self):
             facility_capacity_arr=facility_capacity,
             demand_quantity_arr=demand_quantity,
         )
-        result = clscpso.solve(pulp.PULP_CBC_CMD(msg=False))
+        result = clscpso.solve(pulp.COIN_CMD(msg=False))
         assert isinstance(result, LSCP)
 
         known = [[1], [1], [0, 1], [0], [1]]
@@ -104,4 +104,4 @@ def test_clscpso_infease_error(self, loc_raises_infeasible):
             demand_quantity_arr=demand_quantity,
         )
         with loc_raises_infeasible:
-            clscpso.solve(pulp.PULP_CBC_CMD(msg=False))
+            clscpso.solve(pulp.COIN_CMD(msg=False))

spopt/tests/test_locate/test_flow.py

@@ -48,7 +48,7 @@ def test_vehicle_range_percentage(self, setup_simple_network):
         )
 
         assert model.vehicle_range == 30
-        result = model.solve(solver=pulp.PULP_CBC_CMD(msg=0))
+        result = model.solve(solver=pulp.COIN_CMD(msg=0))
         assert result["status"] == "Optimal"
         assert len(model.selected_facilities) == 3
         coverage = model.get_flow_coverage()
@@ -66,7 +66,7 @@ def test_ac_pc_approach(self, setup_grid_network):
         assert model.k is not None
         assert model.a is not None
 
-        result = model.solve(solver=pulp.PULP_CBC_CMD(msg=0))
+        result = model.solve(solver=pulp.COIN_CMD(msg=0))
         assert result["status"] == "Optimal"
 
     def test_combination_approach(self, setup_grid_network):
@@ -79,7 +79,7 @@ def test_combination_approach(self, setup_grid_network):
 
         assert model.path_refueling_combinations is not None
 
-        result = model.solve(solver=pulp.PULP_CBC_CMD(msg=0))
+        result = model.solve(solver=pulp.COIN_CMD(msg=0))
         assert result["status"] == "Optimal"
 
 
@@ -106,7 +106,7 @@ def test_flow_objective(self, setup_network_with_distances):
             vehicle_range=50,
             objective="flow",
         )
-        result = model.solve(solver=pulp.PULP_CBC_CMD(msg=0))
+        result = model.solve(solver=pulp.COIN_CMD(msg=0))
         assert result["status"] == "Optimal"
         coverage = model.get_flow_coverage()
         assert coverage["covered_volume"] == 50
@@ -122,7 +122,7 @@ def test_vmt_objective(self, setup_network_with_distances):
             objective="vmt",
         )
 
-        result = model.solve(solver=pulp.PULP_CBC_CMD(msg=0))
+        result = model.solve(solver=pulp.COIN_CMD(msg=0))
         assert result["status"] == "Optimal"
         vmt_coverage = model.get_vmt_coverage()
         assert "total_vmt" in vmt_coverage
@@ -147,7 +147,7 @@ def test_threshold_basic(self, setup_threshold_network):
             threshold=0.8,
             weight=0.5,
         )
-        result = model.solve(solver=pulp.PULP_CBC_CMD(msg=0))
+        result = model.solve(solver=pulp.COIN_CMD(msg=0))
         assert result["status"] == "Optimal"
         model.calculate_covered_nodes()
         for node in model.covered_nodes:
@@ -173,7 +173,7 @@ def test_threshold_weight_impact(self, setup_threshold_network):
             threshold=0.8,
             weight=0.99,
         )
-        result_high = model_high_weight.solve(solver=pulp.PULP_CBC_CMD(msg=0))
+        result_high = model_high_weight.solve(solver=pulp.COIN_CMD(msg=0))
 
         model_low_weight = FRLM.from_flow_dataframe(
             network=network,
@@ -183,7 +183,7 @@ def test_threshold_weight_impact(self, setup_threshold_network):
             threshold=0.8,
             weight=0.01,
         )
-        result_low = model_low_weight.solve(solver=pulp.PULP_CBC_CMD(msg=0))
+        result_low = model_low_weight.solve(solver=pulp.COIN_CMD(msg=0))
 
         assert result_high["status"] == "Optimal"
         assert result_low["status"] == "Optimal"
@@ -352,7 +352,7 @@ def setup_solved_model(self):
             network=network, flows=simple_flows, p_facilities=2, vehicle_range=25
         )
 
-        model.solve(solver=pulp.PULP_CBC_CMD(msg=0))
+        model.solve(solver=pulp.COIN_CMD(msg=0))
         return model
 
     def test_summary_output(self, setup_solved_model):
@@ -458,7 +458,7 @@ def test_custom_paths_basic(self):
 
         assert model.flow_paths[(0, 15)] == [0, 4, 8, 12, 13, 14, 15]
 
-        result = model.solve(solver=pulp.PULP_CBC_CMD(msg=0))
+        result = model.solve(solver=pulp.COIN_CMD(msg=0))
         assert result["status"] == "Optimal"
 
     def test_invalid_custom_paths(self):

spopt/tests/test_locate/test_knearest_p_median.py

@@ -36,7 +36,7 @@ def setup_method(self) -> None:
             facility_capacity_col="capacity",
             k_array=k,
         )
-        self.solver = pulp.PULP_CBC_CMD(msg=False)
+        self.solver = pulp.COIN_CMD(msg=False)
 
     def test_knearest_p_median_from_geodataframe(self):
         result = self.k_nearest_pmedian.solve(self.solver)