From 43dad454c6ec1e47e5337658833eaf4777f6bea9 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Wed, 12 Aug 2020 17:28:27 -0300
Subject: [PATCH] Prepare release 2.0.0

---
 CHANGELOG.rst             | 31 +++++++++++++++++++++++++++++++
 changelog/471.bugfix      |  1 -
 changelog/504.feature.rst |  1 -
 changelog/541.removal.rst |  1 -
 changelog/541.trivial.rst |  1 -
 changelog/553.bugfix.rst  |  1 -
 changelog/569.removal.rst |  1 -
 7 files changed, 31 insertions(+), 6 deletions(-)
 delete mode 100644 changelog/471.bugfix
 delete mode 100644 changelog/504.feature.rst
 delete mode 100644 changelog/541.removal.rst
 delete mode 100644 changelog/541.trivial.rst
 delete mode 100644 changelog/553.bugfix.rst
 delete mode 100644 changelog/569.removal.rst

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f071763..4e5bb7a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,34 @@
+pytest-xdist 2.0.0 (2020-08-12)
+===============================
+
+Deprecations and Removals
+-------------------------
+
+- `#541 <https://github.com/pytest-dev/pytest-xdist/issues/541>`_: Drop backward-compatibility "slave" aliases related to worker nodes.  We deliberately moved away from this terminology years ago, and it seems like the right time to finish the deprecation and removal process.
+
+- `#569 <https://github.com/pytest-dev/pytest-xdist/issues/569>`_: ``pytest-xdist`` no longer supports Python 2.7.
+
+
+Features
+--------
+
+- `#504 <https://github.com/pytest-dev/pytest-xdist/issues/504>`_: New functions ``xdist.is_xdist_worker``, ``xdist.is_xdist_master``, ``xdist.get_xdist_worker_id``, to easily identify the current node.
+
+
+Bug Fixes
+---------
+
+- `#471 <https://github.com/pytest-dev/pytest-xdist/issues/471>`_: Fix issue with Rsync reporting in quiet mode.
+
+- `#553 <https://github.com/pytest-dev/pytest-xdist/issues/553>`_: When using ``-n auto``, count the number of physical CPU cores instead of logical ones.
+
+
+Trivial Changes
+---------------
+
+- `#541 <https://github.com/pytest-dev/pytest-xdist/issues/541>`_: ``pytest-xdist`` now requires ``pytest>=6.0``.
+
+
 pytest-xdist 1.34.0 (2020-07-27)
 ================================
 
diff --git a/changelog/471.bugfix b/changelog/471.bugfix
deleted file mode 100644
index 7fea804..0000000
--- a/changelog/471.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix issue with Rsync reporting in quiet mode.
diff --git a/changelog/504.feature.rst b/changelog/504.feature.rst
deleted file mode 100644
index 2348898..0000000
--- a/changelog/504.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-New functions ``xdist.is_xdist_worker``, ``xdist.is_xdist_master``, ``xdist.get_xdist_worker_id``, to easily identify the current node.
diff --git a/changelog/541.removal.rst b/changelog/541.removal.rst
deleted file mode 100644
index f8f3f44..0000000
--- a/changelog/541.removal.rst
+++ /dev/null
@@ -1 +0,0 @@
-Drop backward-compatibility "slave" aliases related to worker nodes.  We deliberately moved away from this terminology years ago, and it seems like the right time to finish the deprecation and removal process.
diff --git a/changelog/541.trivial.rst b/changelog/541.trivial.rst
deleted file mode 100644
index 5911940..0000000
--- a/changelog/541.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-``pytest-xdist`` now requires ``pytest>=6.0``.
diff --git a/changelog/553.bugfix.rst b/changelog/553.bugfix.rst
deleted file mode 100644
index ee2be32..0000000
--- a/changelog/553.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-When using ``-n auto``, count the number of physical CPU cores instead of logical ones.
diff --git a/changelog/569.removal.rst b/changelog/569.removal.rst
deleted file mode 100644
index 9207182..0000000
--- a/changelog/569.removal.rst
+++ /dev/null
@@ -1 +0,0 @@
-``pytest-xdist`` no longer supports Python 2.7.