Skip to content

Commit

Permalink
remove whitespace cruft from merge
Browse files Browse the repository at this point in the history
  • Loading branch information
frrad committed Oct 22, 2024
1 parent f81e41c commit a30216f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions pulp/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
Copyright 2007- Stuart Mitchell ([email protected])
"""
from .constants import VERSION

from .pulp import *
from .apis import *
from .utilities import *
Expand Down
2 changes: 2 additions & 0 deletions pulp/tests/test_pulp.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit a30216f

Please sign in to comment.