diff --git a/.travis.yml b/.travis.yml index aaadae7..b56804c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,7 @@ notifications: deploy: provider: pypi user: ronny + skip_upload_docs: true password: secure: cxmSDho5d+PYKEM4ZCg8ms1P4lzhYkrw6fEOm2HtTcsuCyY6aZMSgImWAnEYbJHSkdzgcxlXK9UKJ9B0YenXmBCkAr7UjdnpNXNmkySr0sYzlH/sfqt/dDATCHFaRKxnkOSOVywaDYhT9n8YudbXI77pXwD12i/CeSSJDbHhsu0JYUfAcb+D6YjRYoA2SEGCnzSzg+gDDfwXZx4ZiODCGLVwieNp1klCg88YROUE1BaYYNuUOONvfXX8+TWowbCF6ChH1WL/bZ49OStEYQNuYxZQZr4yClIqu9VJbchrU8j860K9ott2kkGTgfB/dDrQB/XncBubyIX9ikzCQAmmBXWAI3eyvWLPDk2Jz7kW2l2RT7syct80tCq3JhvQ1qdwr5ap7siocTLgnBW0tF4tkHSTFN3510fkc43npnp6FThebESQpnI24vqpwJ9hI/kW5mYi014Og2E/cpCXnz2XO8iZPDbqAMQpDsqEQoyhfGNgPTGp4K30TxRtwZBI5hHhDKnnR16fXtRgt1gYPvz/peUQvvpOm4JzIzGXPzluuutpnCBy75v5+oiwT3YRrLL/Meims9FtDDXL3qQubAE/ezIOOpm0N5XXV8DxIom8EN71yq5ab1tqhM+tBX7owRjy4FR4If2Q8feBdmTuh26DIQt/y+qSG8VkB9Sw/JCjc7c= on: diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 81a5a35..af183fd 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,22 @@ +pytest-xdist 1.17.1 (2017-06-10) +================================ + +Bug Fixes +--------- + +- Hot fix release reverting the change introduced by #124, unfortunately it + broke a number of test suites so we are reversing this change while we + investigate the problem. (#157) + + +Improved Documentation +---------------------- + +- Introduced ``towncrier`` for ``CHANGELOG`` management. (#154) + +- Added ``HOWTORELEASE`` documentation. (#155) + + .. You should *NOT* be adding new change log entries to this file, this file is managed by towncrier. You *may* edit previous change logs to diff --git a/HOWTORELEASE.rst b/HOWTORELEASE.rst index c991dcb..77fef0a 100644 --- a/HOWTORELEASE.rst +++ b/HOWTORELEASE.rst @@ -22,7 +22,7 @@ Steps To publish a new release ``X.Y.Z``, the steps are as follows: -#. Create a new branch named ``release-X.Y.Z``. +#. Create a new branch named ``release-X.Y.Z`` from the latest ``master``. #. Install ``pytest-xdist`` and dev requirements in a virtualenv:: @@ -30,7 +30,7 @@ To publish a new release ``X.Y.Z``, the steps are as follows: #. Update ``CHANGELOG.rst`` file by running:: - $ towncrier + $ towncrier --version X.Y.Z It might ask for confirmation to remove news fragments; answer yes. diff --git a/changelog/154.doc b/changelog/154.doc deleted file mode 100644 index abc92f1..0000000 --- a/changelog/154.doc +++ /dev/null @@ -1 +0,0 @@ -Introduced ``towncrier`` for ``CHANGELOG`` management. diff --git a/changelog/155.doc b/changelog/155.doc deleted file mode 100644 index 8c75dc1..0000000 --- a/changelog/155.doc +++ /dev/null @@ -1 +0,0 @@ -Added ``HOWTORELEASE`` documentation. diff --git a/changelog/157.bugfix b/changelog/157.bugfix deleted file mode 100644 index 59bfead..0000000 --- a/changelog/157.bugfix +++ /dev/null @@ -1 +0,0 @@ -Hot fix release reverting the change introduced by #124, unfortunately it broke a number of test suites so we are reversing this change while we investigate the problem.