From 6aceb2c54969ff4e621cf2ef5725a0945480eaec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ionel=20Cristian=20M=C4=83rie=C8=99?= Date: Sat, 28 Mar 2015 01:17:13 +0200 Subject: [PATCH] Add more notes about nose support in readme. Update changelog. Closes #9. Closes #8. --- CHANGELOG.rst | 13 +++++++++++++ README.rst | 6 ++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6c5101ac..21ed8dfe 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,6 +3,19 @@ Changelog Use cookiecutter's ``--checkout`` options to use a specific version. +v1.1 (2015-03-28) +----------------- + +* Added support for `nose `_ test runner. Contributed by Alexander Artemenko, `#8 + `_ `#9 + `_. +* Strip all text roles from ``long_description`` in ``setup.py``. +* Added contributing guide for the template. +* Improved the tests for the template (no more ``.cookiecutterrc`` overriding, other minor perm and path issues). +* The ``setup.py release`` doesn't upload anymore. Added instructions for using `twine + `_. +* Minor glob simplification in ``MANIFEST.in``. + v1.0 (2015-03-24) ----------------- diff --git a/README.rst b/README.rst index cc62118b..df2a40d1 100644 --- a/README.rst +++ b/README.rst @@ -29,7 +29,8 @@ Features This is an "all inclusive" sort of template. * BSD 2-clause license. -* Tox_ and Pytest_ for testing Python 2.6, 2.7, 3.3, PyPy etc. +* Tox_ for managing test environments for Python 2.6, 2.7, 3.3, PyPy etc. +* Pytest_ or Nose_ for testing Python 2.6, 2.7, 3.3, PyPy etc. * *Optional* support for creating a tests matrix out of dependencies and python versions. * Travis-CI_ and AppVeyor_ for continuous testing. * Coveralls_ for coverage tracking (using Tox_). @@ -121,7 +122,7 @@ You will be asked for these fields: - .. code:: python "pytest" - - Select if you want to run tests with ``pytest`` or ``nose``. + - Test runner to use. Available options: ``pytest`` or ``nose``. The testing (``tox.ini`` and ``.travis.yml``) configuration is generated from templates. For your convenience there's an initial bootstrap ``tox.ini``, to get the initial generation going just run:: @@ -232,3 +233,4 @@ If you have criticism or suggestions please open up an Issue or Pull Request. .. _Pytest: http://pytest.org/ .. _AppVeyor: http://www.appveyor.com/ .. _Cookiecutter: https://github.com/audreyr/cookiecutter +.. _Nose: http://nose.readthedocs.org/