From 2983f97f3a0deb07682efb47ea8003becdf52bd3 Mon Sep 17 00:00:00 2001
From: Matthew Treinish <mtreinish@kortar.org>
Date: Thu, 27 Jun 2019 15:06:41 -0400
Subject: [PATCH] Bump aqua version and prepare for release (#351)

This commit bumps the aqua version to pull in the latest release 0.5.2,
which removes the install time requirement of pyeda. It also prepares
the qiskit meta-package version for release.

Fixes #311
---
 CHANGELOG.md           | 12 +++++++++++-
 docs/conf.py           |  2 +-
 docs/release_notes.rst |  7 +++++++
 setup.py               |  4 ++--
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 176329e22bce..7195d6f99db3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,9 +14,19 @@ Changelog](http://keepachangelog.com/en/1.0.0/).
 > -   **Fixed**: for any bug fixes.
 > -   **Security**: in case of vulnerabilities.
 
-[UNRELEASED](https://github.com/Qiskit/qiskit-terra/compare/0.10.4...HEAD)
+[UNRELEASED](https://github.com/Qiskit/qiskit-terra/compare/0.10.5...HEAD)
 ==========================================================================
 
+[0.10.5](https://github.com/Qiskit/qiskit/compare/0.10.4...0.10.5) - 2019-06-27
+===============================================================================
+
+Changed
+-------
+
+- Increased the qiskit-aqua version the latest release 0.5.2, which removes
+  the install dependency on pyeda
+
+
 [0.10.4](https://github.com/Qiskit/qiskit/compare/0.10.3...0.10.4) - 2019-06-17
 ===============================================================================
 
diff --git a/docs/conf.py b/docs/conf.py
index d2d5513be28c..d464d786ba92 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -38,7 +38,7 @@
 # The short X.Y version
 version = ''
 # The full version, including alpha/beta/rc tags
-release = '0.10.4'
+release = '0.10.5'
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/docs/release_notes.rst b/docs/release_notes.rst
index 6763f8fd723e..e8632580403f 100644
--- a/docs/release_notes.rst
+++ b/docs/release_notes.rst
@@ -1212,6 +1212,13 @@ This table tracks the meta-package versions and the version of each Qiskit eleme
      - qiskit-ibmq-provider
      - qiskit-aqua
      - qiskit-chemistry
+   * - 0.10.5
+     - 0.8.2
+     - 0.2.1
+     - 0.1.1
+     - 0.2.2
+     - 0.5.2
+     - 0.5.0
    * - 0.10.4
      - 0.8.2
      - 0.2.1
diff --git a/setup.py b/setup.py
index 244704536e92..a09e0ebbd100 100755
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@
     "qiskit-aer==0.2.1",
     "qiskit-ibmq-provider==0.2.2",
     "qiskit-ignis==0.1.1",
-    "qiskit-aqua==0.5.1",
+    "qiskit-aqua==0.5.2",
     "qiskit-chemistry==0.5.0"
 ]
 
@@ -77,7 +77,7 @@ def run(self):
 
 setup(
     name="qiskit",
-    version="0.10.4",
+    version="0.10.5",
     description="Software for developing quantum computing programs",
     long_description="Qiskit is a software development kit for writing "
                      "quantum computing experiments, programs, and "