diff options
| author | Ran Benita <ran@unusedvar.com> | 2020-01-25 16:31:21 +0200 |
|---|---|---|
| committer | Ran Benita <ran@unusedvar.com> | 2020-02-12 09:49:21 +0200 |
| commit | c3e53a072d99fe799a932d75ef180bae8f14531f (patch) | |
| tree | f7da68148d8db99c31edb7c0b0e50201ff7c482a /CONTRIBUTING.rst | |
| parent | 0ee007ca33253758348e51130a7a2f9d92e31f1f (diff) | |
| download | pytest-c3e53a072d99fe799a932d75ef180bae8f14531f.tar.gz | |
Switch to new git workflow
Co-Authored-By: Daniel Hahler <git@thequod.de>
Diffstat (limited to 'CONTRIBUTING.rst')
| -rw-r--r-- | CONTRIBUTING.rst | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 0474fa3a3..57921de2f 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -166,8 +166,6 @@ Short version #. Fork the repository. #. Enable and install `pre-commit <https://pre-commit.com>`_ to ensure style-guides and code checks are followed. -#. Target ``master`` for bug fixes and doc changes. -#. Target ``features`` for new features or functionality changes. #. Follow **PEP-8** for naming and `black <https://github.com/psf/black>`_ for formatting. #. Tests are run using ``tox``:: @@ -204,14 +202,10 @@ Here is a simple overview, with pytest-specific bits: $ git clone git@github.com:YOUR_GITHUB_USERNAME/pytest.git $ cd pytest - # now, to fix a bug create your own branch off "master": + # now, create your own branch off "master": $ git checkout -b your-bugfix-branch-name master - # or to instead add a feature create your own branch off "features": - - $ git checkout -b your-feature-branch-name features - Given we have "major.minor.micro" version numbers, bug fixes will usually be released in micro releases whereas features will be released in minor releases and incompatible changes in major releases. @@ -294,8 +288,7 @@ Here is a simple overview, with pytest-specific bits: compare: your-branch-name base-fork: pytest-dev/pytest - base: master # if it's a bug fix - base: features # if it's a feature + base: master Writing Tests |