From 0efcfeed1739c7ab80c9090d1157135eb8c15a28 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Mon, 21 Sep 2015 14:04:30 +0200 Subject: [PATCH] adapt contributing to new versioning and to python3.5 as latest. --- CONTRIBUTING.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 5032e27b3..5315e0bf0 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -151,8 +151,8 @@ but here is a simple overview: $ git clone git@github.com:YOUR_GITHUB_USERNAME/pytest.git $ cd pytest - $ git checkout pytest-2.7 # if you want to fix a bug for the pytest-2.7 series - $ git checkout master # if you want to add a feature bound for the next minor release + $ git checkout 2.8.X # if you want to fix a bug for the pytest-2.8 series + $ git checkout master # if you want to add a feature bound for the next minor release $ git branch your-branch-name # your feature/bugfix branch If you need some help with Git, follow this quick start @@ -168,12 +168,12 @@ but here is a simple overview: #. Run all the tests - You need to have Python 2.7 and 3.4 available in your system. Now + You need to have Python 2.7 and 3.5 available in your system. Now running tests is as simple as issuing this command:: - $ python runtox.py -e py27,py34,flakes + $ python runtox.py -e py27,py35,flakes - This command will run tests via the "tox" tool against Python 2.7 and 3.4 + This command will run tests via the "tox" tool against Python 2.7 and 3.5 and also perform "flakes" coding-style checks. ``runtox.py`` is a thin wrapper around ``tox`` which installs from a development package index where newer (not yet released to pypi) versions of dependencies @@ -188,9 +188,9 @@ but here is a simple overview: $ python runtox.py -e py27 -- --pdb - or to only run tests in a particular test module on py34:: + or to only run tests in a particular test module on py35:: - $ python runtox.py -e py34 -- testing/test_config.py + $ python runtox.py -e py35 -- testing/test_config.py #. Commit and push once your tests pass and you are happy with your change(s)::