From f336b57ad66739502314eef15dfa0700adda87ce Mon Sep 17 00:00:00 2001
From: Josh Izaac <josh146@gmail.com>
Date: Tue, 18 Aug 2020 16:25:26 +0930
Subject: [PATCH] Increment version number to v0.11 (#102)

* Increment version number to v0.11

* test
---
 .github/workflows/tests.yml       |  2 --
 .github/workflows/upload.yml      | 35 +++++++++++++++++++++++++++++++
 CHANGELOG.md                      | 26 ++++++++++++++++++++---
 pennylane_qiskit/_version.py      |  2 +-
 pennylane_qiskit/qiskit_device.py |  2 +-
 requirements.txt                  |  2 +-
 setup.py                          |  2 +-
 7 files changed, 62 insertions(+), 9 deletions(-)
 create mode 100644 .github/workflows/upload.yml

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a5caf41ac..bde5c0289 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -29,7 +29,6 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install git+https://github.com/PennyLaneAI/pennylane.git
           pip install -r requirements.txt
           pip install wheel pytest pytest-cov pytest-mock --upgrade
 
@@ -65,7 +64,6 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install git+https://github.com/PennyLaneAI/pennylane.git
           pip install -r requirements.txt
           pip install wheel pytest pytest-cov pytest-mock flaky --upgrade
 
diff --git a/.github/workflows/upload.yml b/.github/workflows/upload.yml
new file mode 100644
index 000000000..018e08562
--- /dev/null
+++ b/.github/workflows/upload.yml
@@ -0,0 +1,35 @@
+name: Upload
+on:
+  release:
+    types: [created]
+
+jobs:
+  upload:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+
+      - name: Build and install Plugin
+        run: |
+          python -m pip install --upgrade pip wheel
+          python setup.py bdist_wheel
+          pip install dist/PennyLane*.whl
+
+      - name: Install test dependencies
+        run: |
+          pip install wheel pytest pytest-cov pytest-mock --upgrade
+
+      - name: Run tests
+        run: |
+          python -m pytest tests --tb=native
+
+      - name: Publish
+        uses: pypa/gh-action-pypi-publish@master
+        with:
+          user: __token__
+          password: ${{ secrets.PYPI }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85a32e665..ca39c4e88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,19 +1,39 @@
-# Release 0.10.0-dev
+# Release 0.11.0
 
 ### New features since last release
 
-### Breaking changes
+* Qiskit devices now support custom wire labels.
+  [(#99)](https://github.com/PennyLaneAI/pennylane-qiskit/pull/99)
+  [(#100)](https://github.com/PennyLaneAI/pennylane-qiskit/pull/100)
+
+  One can now specify any string or number as a custom wire label,
+  and use these labels to address subsystems on the device:
+
+  ```python
+  dev = qml.device('qiskit.ibmq', wires=['q1', 'ancilla', 0, 1])
+
+  def circuit():
+    qml.Hadamard(wires='q1')
+    qml.CNOT(wires=[1, 'ancilla'])
+  ```
 
 ### Improvements
 
-### Documentation
+* Adds support for Qiskit v0.20.
+  [(#101)](https://github.com/PennyLaneAI/pennylane-qiskit/pull/101)
 
 ### Bug fixes
 
+* When converting QASM or Qiskit circuit to PennyLane templates, the `CU1` gate
+  is now natively supported and converted to a `QubitUnitary`.
+  [(#101)](https://github.com/PennyLaneAI/pennylane-qiskit/pull/101)
+
 ### Contributors
 
 This release contains contributions from (in alphabetical order):
 
+Maria Schuld, Antal Száva
+
 ---
 
 # Release 0.9.0
diff --git a/pennylane_qiskit/_version.py b/pennylane_qiskit/_version.py
index d5891337e..b8a2a0266 100644
--- a/pennylane_qiskit/_version.py
+++ b/pennylane_qiskit/_version.py
@@ -16,4 +16,4 @@
    Version number (major.minor.patch[-label])
 """
 
-__version__ = "0.10.0-dev"
+__version__ = "0.11.0"
diff --git a/pennylane_qiskit/qiskit_device.py b/pennylane_qiskit/qiskit_device.py
index b0553238f..981496f2d 100644
--- a/pennylane_qiskit/qiskit_device.py
+++ b/pennylane_qiskit/qiskit_device.py
@@ -87,7 +87,7 @@ class QiskitDevice(QubitDevice, abc.ABC):
     """
     name = "Qiskit PennyLane plugin"
     pennylane_requires = ">=0.11.0"
-    version = "0.9.0"
+    version = "0.11.0"
     plugin_version = __version__
     author = "Xanadu"
 
diff --git a/requirements.txt b/requirements.txt
index ad9067728..54e5754d6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 qiskit>=0.20
-pennylane>=0.9.0
+pennylane>=0.11.0
 numpy
 networkx>=2.2;python_version>'3.5'
 networkx>=2.2,<2.4;python_version=='3.5'
diff --git a/setup.py b/setup.py
index 1cdf1ab0d..581404ff2 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@
 
 requirements = [
     "qiskit>=0.20",
-    "pennylane>=0.9.0",
+    "pennylane>=0.11.0",
     "numpy",
     "networkx>=2.2;python_version>'3.5'",
     # Networkx 2.4 is the final version with python 3.5 support.