summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Aracil <charles_aracil@ultimatesoftware.com>2020-10-09 16:09:52 +0200
committerCharles Aracil <charles_aracil@ultimatesoftware.com>2020-10-09 16:10:54 +0200
commit2e322f183c95bcd32b64fba2911c0c81b23d1609 (patch)
treef7c3dfe68527b6a225b4df0b0ca49464596f59f0
parentdbd082af961871c59f2dbcda2fcb27faf4fa2ebc (diff)
downloadpytest-2e322f183c95bcd32b64fba2911c0c81b23d1609.tar.gz
ask for commit after changelog and authors file edit (#7878)
-rw-r--r--CONTRIBUTING.rst11
-rw-r--r--changelog/7878.doc.rst1
2 files changed, 6 insertions, 6 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 48ba147b7..2669cb195 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -299,12 +299,6 @@ Here is a simple overview, with pytest-specific bits:
$ pytest testing/test_config.py
-
-#. Commit and push once your tests pass and you are happy with your change(s)::
-
- $ git commit -a -m "<commit message>"
- $ git push -u
-
#. Create a new changelog entry in ``changelog``. The file should be named ``<issueid>.<type>.rst``,
where *issueid* is the number of the issue related to the change and *type* is one of
``feature``, ``improvement``, ``bugfix``, ``doc``, ``deprecation``, ``breaking``, ``vendor``
@@ -313,6 +307,11 @@ Here is a simple overview, with pytest-specific bits:
#. Add yourself to ``AUTHORS`` file if not there yet, in alphabetical order.
+#. Commit and push once your tests pass and you are happy with your change(s)::
+
+ $ git commit -a -m "<commit message>"
+ $ git push -u
+
#. Finally, submit a pull request through the GitHub website using this data::
head-fork: YOUR_GITHUB_USERNAME/pytest
diff --git a/changelog/7878.doc.rst b/changelog/7878.doc.rst
new file mode 100644
index 000000000..ff5d00d6c
--- /dev/null
+++ b/changelog/7878.doc.rst
@@ -0,0 +1 @@
+In pull request section, ask to commit after editing changelog and authors file.