Revert "Updated readme files"

This reverts commit 6f6308c.

README.rst

@@ -32,16 +32,11 @@ Configuration & Packaging
 
 All configuration can be done in ``setup.cfg`` like changing the description,
 url, classifiers and even console scripts of your project. That means in most
-cases it is not necessary to tamper with ``setup.py``. The syntax of
-``setup.cfg`` is pretty much self-explanatory and well commented.
+cases it is not necessary to tamper with ``setup.py``.
 
-In order to build a source, binary or wheel distribution, just run
-``python setup.py sdist``, ``python setup.py bdist`` or
-``python setup.py bdist_wheel``.
-
-.. rubric:: Namespace package
-
-Optionally, `namespace packages <http://pythonhosted.org/setuptools/setuptools.html#namespace-packages>`_
+Run ``python setup.py sdist``, ``python setup.py bdist`` or
+``python setup.py bdist_wheel`` to build a source, binary or wheel
+distribution. Optionally, `namespace packages <http://pythonhosted.org/setuptools/setuptools.html#namespace-packages>`_
 can be used, if you are planning to distribute a larger package as a collection
 of smaller ones. For example, use::
 
@@ -98,48 +93,17 @@ Unittest & Coverage
 ===================
 
 Run ``python setup.py test`` to run all unittests defined in the subfolder
-``tests`` with the help of `py.test <http://pytest.org/>`_ and
-`pytest-runner <https://pypi.python.org/pypi/pytest-runner>`_. Some sane
-default flags for py.test are already defined in the ``[pytest]`` section of
-``setup.cfg``. The py.test plugin
+``tests`` with the help of `py.test <http://pytest.org/>`_. The py.test plugin
 `pytest-cov <https://github.com/schlamar/pytest-cov>`_ is used to automatically
-generate a coverage report. It is also possible to provide additional
-parameters and flags on the commandline, e.g., type::
-
-    python setup.py test --addopts -h
-
-to show the help of py.test.
-
-.. rubric:: JUnit and Coverage HTML/XML
-
-For usage with a continuous integration software JUnit and Coverage XML output
-can be activated in ``setup.cfg``. Use the flag ``--with-travis`` to generate
-templates of the `Travis <https://travis-ci.org/>`_ configuration files
-``.travis.yml`` and ``tests/travis_install.sh`` which even features the
-coverage and stats system `Coveralls <https://coveralls.io/>`_.
+generate a coverage report. For usage with a continuous integration software
+JUnit and Coverage XML output can be activated in ``setup.cfg``.
+Use the flag ``--with-travis`` to generate templates of the
+`Travis <https://travis-ci.org/>`_ configuration files ``.travis.yml`` and
+``tests/travis_install.sh`` which even features the coverage and stats system
+`Coveralls <https://coveralls.io/>`_.
 In order to use the virtualenv management and test tool `Tox
 <https://tox.readthedocs.org/>`_ the flag ``--with-tox`` can be specified.
 
-.. rubric:: Managing test environments with tox
-
-Run ``tox`` to generate test virtual environments for various python
-environments defined in the generated :file:`tox.ini`. Testing and building
-*sdists* for python 2.7 and python 3.4 is just as simple with tox as::
-
-        tox -e py27,py34
-
-Environments for tests with the the static code analyzers pyflakes and pep8
-which are bundled in `flake8 <http://flake8.readthedocs.org/>`_ are included
-as well. Run it explicitly with::
-
-        tox -e flake8
-
-With tox, you can use the ``--recreate`` flag to force tox to create new
-environments. By default, PyScaffold's tox configuration will execute tests for
-a variety of python versions. If an environment is not available on the system
-the tests are skipped gracefully. You can relay on the `tox documentation
-<http://tox.readthedocs.org/en/latest/>`_ for detailed configuration options.
-
 
 Requirements Management
 =======================

pyscaffold/data/readme.template

@@ -9,16 +9,11 @@ Configuration & Packaging
 
 All configuration can be done in ``setup.cfg`` like changing the description,
 url, classifiers and even console scripts of your project. That means in most
-cases it is not necessary to tamper with ``setup.py``. The syntax of
-``setup.cfg`` is pretty much self-explanatory and well commented.
+cases it is not necessary to tamper with ``setup.py``.
 
-In order to build a source, binary or wheel distribution, just run
-``python setup.py sdist``, ``python setup.py bdist`` or
-``python setup.py bdist_wheel``.
-
-.. rubric:: Namespace package
-
-Optionally, `namespace packages <http://pythonhosted.org/setuptools/setuptools.html#namespace-packages>`_
+Run ``python setup.py sdist``, ``python setup.py bdist`` or
+``python setup.py bdist_wheel`` to build a source, binary or wheel
+distribution. Optionally, `namespace packages <http://pythonhosted.org/setuptools/setuptools.html#namespace-packages>`_
 can be used, if you are planning to distribute a larger package as a collection
 of smaller ones. For example, use::
 
@@ -75,48 +70,17 @@ Unittest & Coverage
 ===================
 
 Run ``python setup.py test`` to run all unittests defined in the subfolder
-``tests`` with the help of `py.test <http://pytest.org/>`_ and
-`pytest-runner <https://pypi.python.org/pypi/pytest-runner>`_. Some sane
-default flags for py.test are already defined in the ``[pytest]`` section of
-``setup.cfg``. The py.test plugin
+``tests`` with the help of `py.test <http://pytest.org/>`_. The py.test plugin
 `pytest-cov <https://github.com/schlamar/pytest-cov>`_ is used to automatically
-generate a coverage report. It is also possible to provide additional
-parameters and flags on the commandline, e.g., type::
-
-    python setup.py test --addopts -h
-
-to show the help of py.test.
-
-.. rubric:: JUnit and Coverage HTML/XML
-
-For usage with a continuous integration software JUnit and Coverage XML output
-can be activated in ``setup.cfg``. Use the flag ``--with-travis`` to generate
-templates of the `Travis <https://travis-ci.org/>`_ configuration files
-``.travis.yml`` and ``tests/travis_install.sh`` which even features the
-coverage and stats system `Coveralls <https://coveralls.io/>`_.
+generate a coverage report. For usage with a continuous integration software
+JUnit and Coverage XML output can be activated in ``setup.cfg``.
+Use the flag ``--with-travis`` to generate templates of the
+`Travis <https://travis-ci.org/>`_ configuration files ``.travis.yml`` and
+``tests/travis_install.sh`` which even features the coverage and stats system
+`Coveralls <https://coveralls.io/>`_.
 In order to use the virtualenv management and test tool `Tox
 <https://tox.readthedocs.org/>`_ the flag ``--with-tox`` can be specified.
 
-.. rubric:: Managing test environments with tox
-
-Run ``tox`` to generate test virtual environments for various python
-environments defined in the generated :file:`tox.ini`. Testing and building
-*sdists* for python 2.7 and python 3.4 is just as simple with tox as::
-
-        tox -e py27,py34
-
-Environments for tests with the the static code analyzers pyflakes and pep8
-which are bundled in `flake8 <http://flake8.readthedocs.org/>`_ are included
-as well. Run it explicitly with::
-
-        tox -e flake8
-
-With tox, you can use the ``--recreate`` flag to force tox to create new
-environments. By default, PyScaffold's tox configuration will execute tests for
-a variety of python versions. If an environment is not available on the system
-the tests are skipped gracefully. You can relay on the `tox documentation
-<http://tox.readthedocs.org/en/latest/>`_ for detailed configuration options.
-
 
 Requirements Management
 =======================
@@ -163,6 +127,7 @@ An existing project that was not setup with PyScaffold can be converted with
 ``putup --force existing_project``. The force option is completely safe to use
 since the git repository of the existing project is not touched!
 
+
 .. note::
 
     Replace the content of this file with a description of your project.