From 86bf3cb8b3bff46b2df5767accebbc6d67047ae4 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Wed, 12 Dec 2018 15:24:02 -0200
Subject: [PATCH] Release 1.25.0

---
 CHANGELOG.rst             | 31 +++++++++++++++++++++++++++++++
 changelog/332.bugfix.rst  |  1 -
 changelog/372.removal.rst |  1 -
 changelog/373.feature.rst |  1 -
 changelog/378.bugfix.rst  |  1 -
 changelog/384.bugfix.rst  |  1 -
 changelog/388.feature.rst |  3 ---
 changelog/390.bugfix.rst  |  1 -
 8 files changed, 31 insertions(+), 9 deletions(-)
 delete mode 100644 changelog/332.bugfix.rst
 delete mode 100644 changelog/372.removal.rst
 delete mode 100644 changelog/373.feature.rst
 delete mode 100644 changelog/378.bugfix.rst
 delete mode 100644 changelog/384.bugfix.rst
 delete mode 100644 changelog/388.feature.rst
 delete mode 100644 changelog/390.bugfix.rst

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 915fc1c..a375432 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,34 @@
+pytest-xdist 1.25.0 (2018-12-12)
+================================
+
+Deprecations and Removals
+-------------------------
+
+- `#372 <https://github.com/pytest-dev/pytest-xdist/issues/372>`_: Pytest versions older than 3.6 are no longer supported.
+
+
+Features
+--------
+
+- `#373 <https://github.com/pytest-dev/pytest-xdist/issues/373>`_: Node setup information is hidden when pytest is run in quiet mode to reduce noise on many-core machines.
+
+- `#388 <https://github.com/pytest-dev/pytest-xdist/issues/388>`_: ``mainargv`` is made available in ``workerinput`` from the host's ``sys.argv``.
+
+  This can be used via ``request.config.workerinput["mainargv"]``.
+
+
+Bug Fixes
+---------
+
+- `#332 <https://github.com/pytest-dev/pytest-xdist/issues/332>`_: Fix report of module-level skips (``pytest.skip(reason, allow_module_level=True)``).
+
+- `#378 <https://github.com/pytest-dev/pytest-xdist/issues/378>`_: Fix support for gevent monkeypatching
+
+- `#384 <https://github.com/pytest-dev/pytest-xdist/issues/384>`_: pytest 4.1 support: ``ExceptionInfo`` API changes.
+
+- `#390 <https://github.com/pytest-dev/pytest-xdist/issues/390>`_: pytest 4.1 support: ``pytest_logwarning`` hook removed.
+
+
 pytest-xdist 1.24.1 (2018-11-09)
 ================================
 
diff --git a/changelog/332.bugfix.rst b/changelog/332.bugfix.rst
deleted file mode 100644
index 467c0e5..0000000
--- a/changelog/332.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix report of module-level skips (``pytest.skip(reason, allow_module_level=True)``).
diff --git a/changelog/372.removal.rst b/changelog/372.removal.rst
deleted file mode 100644
index ea14c5b..0000000
--- a/changelog/372.removal.rst
+++ /dev/null
@@ -1 +0,0 @@
-Pytest versions older than 3.6 are no longer supported.
diff --git a/changelog/373.feature.rst b/changelog/373.feature.rst
deleted file mode 100644
index 5a11da4..0000000
--- a/changelog/373.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Node setup information is hidden when pytest is run in quiet mode to reduce noise on many-core machines.
diff --git a/changelog/378.bugfix.rst b/changelog/378.bugfix.rst
deleted file mode 100644
index ceb0af8..0000000
--- a/changelog/378.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix support for gevent monkeypatching
diff --git a/changelog/384.bugfix.rst b/changelog/384.bugfix.rst
deleted file mode 100644
index 0dd2f03..0000000
--- a/changelog/384.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-pytest 4.1 support: ``ExceptionInfo`` API changes.
diff --git a/changelog/388.feature.rst b/changelog/388.feature.rst
deleted file mode 100644
index 57f5943..0000000
--- a/changelog/388.feature.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-``mainargv`` is made available in ``workerinput`` from the host's ``sys.argv``.
-
-This can be used via ``request.config.workerinput["mainargv"]``.
diff --git a/changelog/390.bugfix.rst b/changelog/390.bugfix.rst
deleted file mode 100644
index a4ea70f..0000000
--- a/changelog/390.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-pytest 4.1 support: ``pytest_logwarning`` hook removed.