diff options
| author | Daniel Hahler <git@thequod.de> | 2020-01-23 20:34:21 +0100 |
|---|---|---|
| committer | Daniel Hahler <git@thequod.de> | 2020-01-23 20:34:21 +0100 |
| commit | cdd6f86e43efd0bd42aed7c51a0afb8ab2518702 (patch) | |
| tree | b04fd40670eee4817c7d4e073767c04a17aeb16d /CONTRIBUTING.rst | |
| parent | 55ebd9f80392e3175a08a62ee49a482d9a406f5b (diff) | |
| download | pytest-cdd6f86e43efd0bd42aed7c51a0afb8ab2518702.tar.gz | |
bug-fix fixes
Diffstat (limited to 'CONTRIBUTING.rst')
| -rw-r--r-- | CONTRIBUTING.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 455998b78..0474fa3a3 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -166,7 +166,7 @@ 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 bugfixes and doc changes. +#. 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``:: @@ -212,7 +212,7 @@ Here is a simple overview, with pytest-specific bits: $ git checkout -b your-feature-branch-name features - Given we have "major.minor.micro" version numbers, bugfixes will usually + 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,7 +294,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 bugfix + base: master # if it's a bug fix base: features # if it's a feature |