diff --git a/pulp/__init__.py b/pulp/__init__.py index 801c27e6..627fbb24 100644 --- a/pulp/__init__.py +++ b/pulp/__init__.py @@ -30,6 +30,7 @@ Copyright 2007- Stuart Mitchell (s.mitchell@auckland.ac.nz) """ from .constants import VERSION + from .pulp import * from .apis import * from .utilities import * diff --git a/pulp/tests/test_pulp.py b/pulp/tests/test_pulp.py index ec11fbbe..ffc05eee 100644 --- a/pulp/tests/test_pulp.py +++ b/pulp/tests/test_pulp.py @@ -1208,6 +1208,7 @@ def add_const(prob): @gurobi_test def test_measuring_solving_time(self): + time_limit = 10 solver_settings = dict( PULP_CBC_CMD=30, @@ -1245,6 +1246,7 @@ def test_measuring_solving_time(self): @gurobi_test def test_time_limit_no_solution(self): + time_limit = 1 solver_settings = dict(HiGHS_CMD=60, HiGHS=60, PULP_CBC_CMD=60, COIN_CMD=60) bins = solver_settings.get(self.solver.name)