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

Update changelog with 0.6.5 release, remove cvxopt from install #863

Merged
manoelmarques merged 2 commits into from
Mar 20, 2020
Merged

Update changelog with 0.6.5 release, remove cvxopt from install #863

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
5297997
Update changelog with 0.6.5 release, remove cvxopt from install
manoelmarques Mar 20, 2020
12205d2
add cvxopt install to travis
manoelmarques Mar 20, 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
6 changes: 6 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,15 @@ jobs:
name: aqua1
paths: aqua1.dat
before_script:
- pip install cvxopt
- 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 && coverage3 combine && mv .coverage aqua1.dat
- name: "Test Aqua 1 Python 3.8"
<<: *stage_test_aqua
if: tag IS blank
python: 3.8
before_script:
- pip install cvxopt
script: stestr --test-path test/aqua run --blacklist-file selection.txt
- name: "Test Aqua 2 Python 3.7"
<<: *stage_test_aqua
Expand All @@ -148,12 +151,15 @@ jobs:
name: aqua2
paths: aqua2.dat
before_script:
- pip install cvxopt
- 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 && coverage3 combine && mv .coverage aqua2.dat
- name: "Test Aqua 2 Python 3.8"
<<: *stage_test_aqua
if: tag IS blank
python: 3.8
before_script:
- pip install cvxopt
script: stestr --test-path test/aqua run --whitelist-file selection.txt
- name: "Test Chemistry Python 3.7"
<<: *stage_dependencies
Expand Down
15 changes: 14 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Changelog](http://keepachangelog.com/en/1.0.0/).
> - **Fixed**: for any bug fixes.
> - **Security**: in case of vulnerabilities.

[UNRELEASED](https://github.com/Qiskit/qiskit-aqua/compare/0.6.4...HEAD)
[UNRELEASED](https://github.com/Qiskit/qiskit-aqua/compare/0.6.5...HEAD)
========================================================================

Changed
Expand All @@ -26,6 +26,19 @@ Changed
- Refactor algorithms (#831)
- Moved to Terra: multi-controlled Toffoli, U1 and Pauli rotation gates (including tests) (#833)

[0.6.5](https://github.com/Qiskit/qiskit-aqua/compare/0.6.4...0.6.5) - 2020-03-16
=================================================================================

Removed
-------

- Removed cvxopt from installation. (#858)

Fixed
-----

- Fixes issue #768. The AQGD optimizer if condition in func converged was ignored. That kept breaking the while loop for training. (#858)

[0.6.4](https://github.com/Qiskit/qiskit-aqua/compare/0.6.3...0.6.4) - 2020-02-06
=================================================================================

Expand Down
1 change: 0 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ sympy>=1.3
numpy>=1.13
psutil>=5
scikit-learn>=0.20.0
cvxopt; python_version < '3.8' or sys_platform != 'win32'
dlx
docplex
fastdtw
Expand Down
1 change: 0 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
"numpy>=1.13",
"psutil>=5",
"scikit-learn>=0.20.0",
"cvxopt; python_version < '3.8' or sys_platform != 'win32'",
"dlx",
"docplex",
"fastdtw",
Expand Down