Merge pull request #281 from nicoddemus/release-1.22.1

Release 1.22.1
pytest-dev · Feb 19, 2018 · 63b329c · 63b329c
2 parents 11e3599 + de993e1
commit 63b329c
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,3 +1,22 @@
+pytest-xdist 1.22.1 (2018-02-19)
+================================
+
+Bug Fixes
+---------
+
+- Fix issue when using ``loadscope`` or ``loadfile`` where tests would fail to
+  start if the first scope had only one test. (`#257
+  <https://github.com/pytest-dev/pytest-xdist/issues/257>`_)
+
+
+Trivial Changes
+---------------
+
+- Change terminology used by ``pytest-xdist`` to *master* and *worker* in
+  arguments and messages (for example ``--max-worker-reset``). (`#234
+  <https://github.com/pytest-dev/pytest-xdist/issues/234>`_)
+
+
 pytest-xdist 1.22.0 (2018-01-11)
 ================================
 

diff --git a/HOWTORELEASE.rst b/HOWTORELEASE.rst
@@ -26,13 +26,11 @@ To publish a new release ``X.Y.Z``, the steps are as follows:
 
 #. Install ``pytest-xdist`` and dev requirements in a virtualenv::
 
-    $ pip install -e . -r dev-requirements.txt
+    $ pip install -e . -U -r dev-requirements.txt
 
 #. Update ``CHANGELOG.rst`` file by running::
 
-    $ towncrier --version X.Y.Z
-
-   It might ask for confirmation to remove news fragments; answer yes.
+    $ towncrier --version X.Y.Z --yes
 
 #. Commit and push the branch for review.
 

diff --git a/changelog/234.trivial b/changelog/234.trivial
diff --git a/changelog/257.bugfix b/changelog/257.bugfix
diff --git a/pyproject.toml b/pyproject.toml
@@ -33,4 +33,4 @@ template = "changelog/_template.rst"
   [[tool.towncrier.type]]
   directory = "trivial"
   name = "Trivial Changes"
-  showcontent = false
+  showcontent = true