From 91486c15a79f8546f2f3ebad6fe754d6caa5bd54 Mon Sep 17 00:00:00 2001
From: Akshita <36688304+Akshita07@users.noreply.github.com>
Date: Thu, 27 May 2021 16:56:38 +0200
Subject: [PATCH] Changelog for QCoDeS v0.26.0 Release (#3035)

* Add changelog for v0.26.0

* update changelog with latest merges

* update changelog index toctree with 0.26.0 entry

* update changelog

* Update 0.26.0.rst

Co-authored-by: Dominik Vogel <30660470+Dominik-Vogel@users.noreply.github.com>
---
 docs/changes/0.26.0.rst | 46 +++++++++++++++++++++++++++++++++++++++++
 docs/changes/index.rst  |  1 +
 2 files changed, 47 insertions(+)
 create mode 100644 docs/changes/0.26.0.rst

diff --git a/docs/changes/0.26.0.rst b/docs/changes/0.26.0.rst
new file mode 100644
index 00000000000..7a475818eb4
--- /dev/null
+++ b/docs/changes/0.26.0.rst
@@ -0,0 +1,46 @@
+Changelog for QCoDeS 0.26.0
+===========================
+
+The May 2021 release of QCoDeS.
+
+----
+New:
+----
+
+- DelegateInstrument and InstrumentGroup drivers (#2928, #3031)
+- Introducing merge_yaml function in Station and allow Station to load
+  multiple config yaml files (#2936)
+- Keysight VNA P9374A driver (#3034)
+
+---------
+Improved:
+---------
+
+- Ensure that plot dataset uses axis in the expected order (#3017)
+- Make doNd reset original post_delay values + fix to keyboard interrupt (#2996)
+- [Bug fix] Return parameter data with same type as before applying scale or
+  offset (#2980)
+- Improved plotting of pre-shaped 2d data (#3024)
+- replace the use of Dict with Mapping for input args within instrument
+  module (#3040)
+- Convert input arguments to Mapping in dataset module (#3051)
+- use nan + i*nan as placeholder for complex numbers (#3049)
+- Add information about name keyword argument of Measurement module in
+  relevant docs (#3052)
+
+-----------------
+Improved drivers:
+-----------------
+
+- Make wait times in blocking AMI430 field ramps adjustable (#3032)
+- Keithley 2600: 4 probe current sweep support (#3023)
+
+---------------
+Under the hood:
+---------------
+
+- Add darker to precommit hooks (#2979)
+- tests: cleanup warning handling (#2834)
+- Fix NumpyJSONEncoder docstring (#2994)
+- remove scientific deps job (#3014)
+- upgrade precommit hooks to latest version (#3037)
diff --git a/docs/changes/index.rst b/docs/changes/index.rst
index 047613fdad9..932d9637ead 100644
--- a/docs/changes/index.rst
+++ b/docs/changes/index.rst
@@ -2,6 +2,7 @@ Changelogs
 ==========
 
 .. toctree::
+   0.26.0 <0.26.0>
    0.25.0 <0.25.0>
    0.24.0 <0.24.0>
    0.23.0 <0.23.0>