From 0efcfeed1739c7ab80c9090d1157135eb8c15a28 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Mon, 21 Sep 2015 14:04:30 +0200 Subject: [PATCH 1/4] 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):: From 71c5883d526dc5c05b258e3c71e184eb6f1092d3 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Tue, 22 Sep 2015 10:21:01 +0200 Subject: [PATCH 2/4] update according to discussion on pytest-dev and in PR --- CHANGELOG | 6 ++++++ CONTRIBUTING.rst | 14 +++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index bab682ea9..f5e107f0f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,9 +1,15 @@ x.y.z ----- +- (experimental) adapt more SEMVER style versioning and change meaning of + master branch in git repo: "master" branch now keeps the bugfixes, changes + aimed for micro releases. "features" branch will only be be released + with minor or macro pytest releases. + - Fix issue #766 by removing documentation references to distutils. Thanks Russel Winder. + 2.8.0 ----------------------------- diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 5315e0bf0..01c0768b9 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -151,9 +151,17 @@ but here is a simple overview: $ git clone git@github.com:YOUR_GITHUB_USERNAME/pytest.git $ cd pytest - $ 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 + # now, to fix a bug create your own branch off "master": + + $ git checkout master -b your-bugfix-branch-name + + # or to instead add a feature create your own branch off "features": + + $ git checkout features -b your-feature-branch-name + + Given we have "macro.minor.micro" version numbers, bugfixes will usually + be released in micro releases whereas features will be released in + minor releases and incompatible changes in major releases. If you need some help with Git, follow this quick start guide: https://git.wiki.kernel.org/index.php/QuickStart From f19ba6c2b1792547ed31c72264b95e30d872622b Mon Sep 17 00:00:00 2001 From: holger krekel Date: Tue, 22 Sep 2015 10:29:12 +0200 Subject: [PATCH 3/4] fix naming --- CONTRIBUTING.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 01c0768b9..7cb0d64dd 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -159,7 +159,7 @@ but here is a simple overview: $ git checkout features -b your-feature-branch-name - Given we have "macro.minor.micro" version numbers, bugfixes will usually + Given we have "major.minor.micro" version numbers, bugfixes will usually be released in micro releases whereas features will be released in minor releases and incompatible changes in major releases. From a5ff345f7baeadd47144605ab14630c357124513 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Tue, 22 Sep 2015 10:45:55 +0200 Subject: [PATCH 4/4] fix another occurence of "macro" to "major" --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 4b00fb5ea..d17d29def 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,7 +4,7 @@ - (experimental) adapt more SEMVER style versioning and change meaning of master branch in git repo: "master" branch now keeps the bugfixes, changes aimed for micro releases. "features" branch will only be be released - with minor or macro pytest releases. + with minor or major pytest releases. - Fix issue #766 by removing documentation references to distutils. Thanks Russel Winder.