From 910dfe79b4b80e2b44b80281a136f18b1ff59716 Mon Sep 17 00:00:00 2001
From: Peter Karalekas <peter@rigetti.com>
Date: Fri, 29 Mar 2019 17:00:08 -0400
Subject: [PATCH] Bump version to 2.6.0 (#868)

---
 docs/source/changes.rst | 35 ++++++++++++++++++++++++++++++++---
 pyquil/__init__.py      |  2 +-
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/docs/source/changes.rst b/docs/source/changes.rst
index ac281809d..9ea5dbf72 100644
--- a/docs/source/changes.rst
+++ b/docs/source/changes.rst
@@ -1,8 +1,39 @@
 Changelog
 =========
 
+v2.6 (March 29, 2019)
+---------------------
+
+Improvements and Changes:
+
+- Added a CODEOWNERS file for default reviewers (gh-855).
+
+- Bifurcated the ``QPUCompiler`` endpoint parameter into two -- ``quilc_endpoint`` and
+  ``qpu_compiler_endpoint`` -- to reflect changes in Quantum Cloud Services (gh-856).
+
+- Clarified documentation around the DELAY pragma (gh-862).
+
+- Added information about the ``local_qvm`` context manager to the
+  getting started documentation (gh-851).
+
+Bugfixes:
+
+- Added a non-None default timeout to the ``QVMCompiler`` object (gh-850) and
+  the ``get_benchmarker`` function (gh-854).
+
+- Fixed the docstring for the ``apply_clifford_to_pauli`` function (gh-836).
+
+- Allowed the ``apply_clifford_to_pauli`` function to now work with the Identity
+  as input (gh-849).
+
+- Updated a stale link to the Rigetti Forest Slack workspace (gh-860).
+
+- Fixed a notation typo in the documentation for noise (gh-861).
+
+Special thanks to willzeng for all the contributions this release!
+
 v2.5 (March 6, 2019)
-------------------
+--------------------
 
 Improvements and Changes:
 
@@ -26,8 +57,6 @@ Bugfixes:
 
 - Some stale tests have been brought into the modern era.
 
-
-
 v2.4 (February 14, 2019)
 ------------------------
 
diff --git a/pyquil/__init__.py b/pyquil/__init__.py
index 3b0b03113..b0a07a876 100644
--- a/pyquil/__init__.py
+++ b/pyquil/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "2.5.2"
+__version__ = "2.6.0"
 
 from pyquil.quil import Program
 from pyquil.api import list_quantum_computers, get_qc