From 62e036ad6aa3566e4252a72c3ef5a4aee889ba41 Mon Sep 17 00:00:00 2001 From: Dima Kudosh Date: Sat, 9 Jan 2021 20:17:54 +0300 Subject: [PATCH] #203 Fixed pulp dependency --- pydfs_lineup_optimizer/solvers/__init__.py | 3 ++- pydfs_lineup_optimizer/solvers/pulp_solver.py | 8 ++++---- requirements.txt | 2 +- setup.py | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pydfs_lineup_optimizer/solvers/__init__.py b/pydfs_lineup_optimizer/solvers/__init__.py index 891592d..93f366c 100644 --- a/pydfs_lineup_optimizer/solvers/__init__.py +++ b/pydfs_lineup_optimizer/solvers/__init__.py @@ -1,4 +1,5 @@ -from pydfs_lineup_optimizer.solvers.pulp_solver import Solver, PuLPSolver +from pydfs_lineup_optimizer.solvers.base import Solver +from pydfs_lineup_optimizer.solvers.pulp_solver import PuLPSolver from pydfs_lineup_optimizer.solvers.constants import SolverSign from pydfs_lineup_optimizer.solvers.exceptions import SolverException, SolverInfeasibleSolutionException diff --git a/pydfs_lineup_optimizer/solvers/pulp_solver.py b/pydfs_lineup_optimizer/solvers/pulp_solver.py index 2d293c3..b67d54b 100644 --- a/pydfs_lineup_optimizer/solvers/pulp_solver.py +++ b/pydfs_lineup_optimizer/solvers/pulp_solver.py @@ -1,11 +1,11 @@ from pulp import LpProblem, LpMaximize, LpVariable, lpSum, LpStatusOptimal, LpBinary, LpInteger, PULP_CBC_CMD -from .base import Solver -from .constants import SolverSign -from .exceptions import SolverException, SolverInfeasibleSolutionException +from pydfs_lineup_optimizer.solvers.base import Solver +from pydfs_lineup_optimizer.solvers.constants import SolverSign +from pydfs_lineup_optimizer.solvers.exceptions import SolverException, SolverInfeasibleSolutionException class PuLPSolver(Solver): - LP_SOLVER = PULP_CBC_CMD(verbose=False, msg=False) + LP_SOLVER = PULP_CBC_CMD(msg=False) def __init__(self): self.prob = LpProblem('Daily Fantasy Sports', LpMaximize) diff --git a/requirements.txt b/requirements.txt index f94a541..b916282 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -PuLP==2.0 +PuLP==2.4 pytz parameterized \ No newline at end of file diff --git a/setup.py b/setup.py index e69d520..b0c7ce4 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ def read(fname): author_email='dimakudosh@gmail.com', description='Tool for creating optimal lineups for daily fantasy sports', keywords=['dfs', 'fantasy', 'sport', 'lineup', 'optimize', 'optimizer', 'nba', 'nfl', 'nhl', 'mlb'], - install_requires=['PuLP>=2.2', 'pytz'], + install_requires=['PuLP==2.4', 'pytz>=2020.5'], long_description=read('README.md'), long_description_content_type='text/markdown', classifiers=[