Skip to content
This repository has been archived by the owner on Dec 7, 2021. It is now read-only.

Remove cvxpy cap #1150

Merged
merged 2 commits into from
Jul 30, 2020
Merged

Remove cvxpy cap #1150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb8128b
Remove cvxpy cap
mtreinish Jul 30, 2020
fbdfe48
Merge branch 'master' into uncap-cvxpy
manoelmarques Jul 30, 2020
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
12 changes: 6 additions & 6 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ jobs:
- sudo apt-get -y install hunspell-en-us
- pip install pyenchant
- pip install cplex
- pip install "cvxpy>1.0.0,<1.1.0"
- pip install "cvxpy>1.0.0"
- pip install https://github.com/rpmuller/pyquante2/archive/master.zip --progress-bar off
script:
- pip check
Expand All @@ -148,7 +148,7 @@ jobs:
if: tag IS blank
python: 3.8
install:
- pip install "cvxpy>1.0.0,<1.1.0"
- pip install "cvxpy>1.0.0"
- pip install https://github.com/rpmuller/pyquante2/archive/master.zip --progress-bar off
script:
- make lint
Expand All @@ -174,7 +174,7 @@ jobs:
- aqua137.dep
before_script:
- pip install cplex
- pip install "cvxpy>1.0.0,<1.1.0"
- pip install "cvxpy>1.0.0"
- export PYTHON="coverage3 run --source qiskit/aqua,qiskit/chemistry,qiskit/finance,qiskit/ml,qiskit/optimization --omit */gauopen/* --parallel-mode"
script:
- stestr --test-path test/aqua run --blacklist-file selection.txt 2> >(tee /dev/stderr out.txt > /dev/null)
Expand All @@ -190,7 +190,7 @@ jobs:
paths: aqua138.dep
python: 3.8
before_script:
- pip install "cvxpy>1.0.0,<1.1.0"
- pip install "cvxpy>1.0.0"
script:
- stestr --test-path test/aqua run --blacklist-file selection.txt 2> >(tee /dev/stderr out.txt > /dev/null)
- python tools/extract_deprecation.py -file out.txt -output aqua138.dep
Expand All @@ -205,7 +205,7 @@ jobs:
- aqua237.dep
before_script:
- pip install cplex
- pip install "cvxpy>1.0.0,<1.1.0"
- pip install "cvxpy>1.0.0"
- export PYTHON="coverage3 run --source qiskit/aqua,qiskit/chemistry,qiskit/finance,qiskit/ml,qiskit/optimization --omit */gauopen/* --parallel-mode"
script:
- stestr --test-path test/aqua run --whitelist-file selection.txt 2> >(tee /dev/stderr out.txt > /dev/null)
Expand All @@ -221,7 +221,7 @@ jobs:
paths: aqua238.dep
python: 3.8
before_script:
- pip install "cvxpy>1.0.0,<1.1.0"
- pip install "cvxpy>1.0.0"
script:
- stestr --test-path test/aqua run --whitelist-file selection.txt 2> >(tee /dev/stderr out.txt > /dev/null)
- python tools/extract_deprecation.py -file out.txt -output aqua238.dep
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
extras_require={
'torch': ["torch; sys_platform == 'linux' or (python_version < '3.8' and sys_platform != 'win32')"],
'cplex': ["cplex; python_version >= '3.6' and python_version < '3.8'"],
'cvx': ['cvxpy>1.0.0,<1.1.0'],
'cvx': ['cvxpy>1.0.0,!=1.1.0,!=1.1.1,!=1.1.2'],
'pyscf': ["pyscf; sys_platform != 'win32'"],
},
zip_safe=False
Expand Down