Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for docplex 2.20 #22

Merged
merged 1 commit into from
Feb 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion qiskit_optimization/applications/ising/docplex.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
import numpy as np
from docplex.mp.constants import ComparisonType
from docplex.mp.constr import LinearConstraint, QuadraticConstraint
from docplex.mp.linear import Var
from docplex.mp.dvar import Var
from docplex.mp.model import Model
from qiskit.quantum_info import Pauli
from qiskit.opflow import PauliSumOp
Expand Down
2 changes: 1 addition & 1 deletion qiskit_optimization/problems/quadratic_program.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
from docplex.mp.constr import LinearConstraint as DocplexLinearConstraint
from docplex.mp.constr import NotEqualConstraint
from docplex.mp.constr import QuadraticConstraint as DocplexQuadraticConstraint
from docplex.mp.linear import Var
from docplex.mp.dvar import Var
from docplex.mp.model import Model
from docplex.mp.model_reader import ModelReader
from docplex.mp.quad import QuadExpr
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ qiskit-terra>=0.17.0
scipy>=1.4
numpy>=1.17
psutil>=5
docplex<2.20.204
docplex
setuptools>=40.1.0
retworkx>=0.5.0
dataclasses; python_version < '3.7'
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"scipy>=1.4",
"numpy>=1.17",
"psutil>=5",
"docplex<2.20.204",
"docplex",
"setuptools>=40.1.0",
"retworkx>=0.5.0",
"dataclasses; python_version < '3.7'"
Expand Down