c85b14391d
ci: add a workflow for backporting to other branches
...
To backport a PR, e.g. 1000, to another branch, e.g. `7.0.x`, add a
label `backport 7.0.x` to the PR. This will trigger a workflow which
will create a branch `backport-1000-to-7.0.x` based on the `7.0.x`
branch with a cherry-pick of the PR's merge commit, and create a new PR
for it against the `7.0.x` branch.
It is very simplistic, for instance it doesn't handle cherry-pick
failure gracefully, doesn't validate the state of the PR, doesn't check
if the branch already exists, etc. But we can improve on it later as
needed.
Finally, PRs created by github actions do not themselves trigger further
actions, i.e. the PR isn't checked. You need to close & reopen the PR
for the checks to trigger. There are workarounds for this but they are
either less secure or require more setup.
2021-12-12 01:12:35 +02:00
953fdabaf0
Adjust doc links for new scheme
...
Closes #8831
2021-07-06 09:11:35 +02:00
9ef608ef76
"fix" a couple of http -> https redirects
...
Found with
urli-fix . -a http: -i pytest
2021-04-26 17:44:27 +02:00
3cbbb0bb0d
Fix typos & missing commas in CONTRIBUTING.rst
2021-04-20 12:30:27 +02:00
ff6d5ae278
port the rest of the scripts/docs over to the main branch
2021-03-18 22:13:12 +01:00
dbed1ff68f
adopt main terminology in the configs
...
ref pytest-dev/meta#8
2021-03-09 22:35:34 +01:00
b02f1c8ae7
DOC: Update multiple references to testdir to pytester
...
In https://docs.pytest.org/en/stable/reference.html#testdir , it is
suggested:
> New code should avoid using testdir in favor of pytester.
Multiple spots in the documents still use testdir and they can be quite
confusing (especially the plugin writing guide).
2021-01-01 12:21:39 -08:00
2e322f183c
ask for commit after changelog and authors file edit ( #7878 )
2020-10-09 16:10:54 +02:00
895a8cf296
Add guidelines section about backporting
...
From https://github.com/pytest-dev/pytest/pull/7723#issuecomment-693310439
2020-09-17 10:06:04 -03:00
bc0020ad96
Merge pull request #7750 from pytest-dev/graingert-patch-1
...
permit tox config in non-tox.ini files for pytest-dev member projects
2020-09-13 09:37:35 -07:00
51752108b8
remove unused bitbucket link
2020-09-13 03:02:10 +01:00
24c26a046e
permit tox config in non-tox.ini files for pytest-dev member projects
2020-09-13 00:41:00 +01:00
7da6ebede0
Update pytest-dev requirements
...
- be more vague about "packaging metadata" over explicitly mentioning `setup.py`
(such that `pyproject.toml`-based distributions are allowed)
- drop extensions on `README.txt` / `LICENSE.txt` (it's more common to have `.md`
/ `.rst` / no extension)
- remove duplicate mention of license packaging metadata
2020-09-08 09:52:59 -07:00
cbec0f8c6a
CONTRIBUTING: document the docstring style we use
2020-08-01 17:14:38 +03:00
93d2ccbfb7
Point to stable docs instead of latest
...
Now that our master might contain new features, it is best to point
users to the stable docs rather than the latest
2020-07-07 07:45:27 -03:00
474973afa4
CONTRIBUTING: sync changelog types
...
The got out of date with the actual ones we use.
2020-06-24 16:11:27 +03:00
96d4e2f571
Add documentation on closing issues
2020-06-08 23:58:44 -04:00
a76855912b
Introduce guidelines for closing stale issues/PRs ( #7332 )
...
* Introduce guidelines for closing stale issues/PRs
Close #7282
Co-authored-by: Anthony Sottile <asottile@umich.edu>
Co-authored-by: Zac Hatfield-Dodds <Zac-HD@users.noreply.github.com>
Co-authored-by: Anthony Sottile <asottile@umich.edu>
Co-authored-by: Zac Hatfield-Dodds <Zac-HD@users.noreply.github.com>
2020-06-08 21:15:53 -03:00
b337a9a66d
CONTRIBUTING: add section about backporting fixes to patch releases
2020-05-20 19:29:13 +03:00
9926fcf452
remove incorrect note about requiring admin install
2020-05-07 13:51:20 -07:00
37cbab6899
CONTRIBUTING: Grammatical clarification and minor typo fixes
...
The main unclear part was that "to contribute changes" read in two
different ways; I've reworded it so it reads only one way.
2020-03-25 21:41:03 +09:00
4b53bbc0a9
docs: use doc/en/_build/html for html output ( #6842 )
...
This will use the same directory as `make -C doc/en` then, and reflects
the default location that Sphinx uses.
2020-02-29 00:47:30 +01:00
c3e53a072d
Switch to new git workflow
...
Co-Authored-By: Daniel Hahler <git@thequod.de>
2020-02-12 09:49:21 +02:00
cdd6f86e43
bug-fix fixes
2020-01-23 20:34:21 +01:00
d884164160
removed trailing whitespace to fix linting issue
2019-12-31 12:49:37 +11:00
9811ebdc57
Added how to reserve an issue to yourself when contributing
2019-12-31 10:32:31 +11:00
8f2fd8ffc0
Add develop instructions to CONTRIBUTING
...
From: https://github.com/pytest-dev/pytest/pull/6244
2019-11-21 10:06:32 -03:00
0767f080a4
Update URL: python/black → psf/black
2019-08-10 12:38:13 -07:00
01606315aa
More CSS fine-tuning
2019-07-15 13:40:30 +02:00
9972c78cfa
update CONTRIBUTING.rst
...
The following edits are for the "Preparing pull requests" section only.
1. remove Python2-related commands.
2. clarifying some details for beginners. Such as that pre-commit must to be installed as admin to function properly.
3. Added "You may not create a changelog entry if the change doesn't affect the documented behaviour of Pytest." on line 270.
2019-06-30 18:29:37 +02:00
23aa3bb0ae
Clarify changelog entries should be rst files
2019-06-24 20:55:51 -04:00
143499d041
Update Black URLs
...
> Black, your uncompromising #Python code formatter, was a project
> created with the community in mind from Day 1. Today we moved it under
> the PSF umbrella. It's now available on GitHub under
> https://github.com/python/black/ . You install and use it just like
> before.
https://twitter.com/llanga/status/1123980466292445190
2019-05-04 08:28:50 -07:00
935b106213
CI: use py37 instead of py36 by default
...
Closes https://github.com/pytest-dev/pytest/issues/4370 .
2018-11-12 03:16:52 +01:00
ea25eb1ecc
Fix linting
2018-10-15 08:15:40 -03:00
f129ba617f
Improve docs a bit
2018-10-15 08:00:16 -03:00
661013c3e9
Add testdir examples to CONTRIBUTING guide
...
Hopefully Closes : #4151
2018-10-15 11:13:24 +03:00
f300f7fa24
Improve contributing instructions regarding black/linting
2018-06-11 20:49:25 -03:00
86fc31db8d
apply most other hooks and opt out of black reformating
2018-05-23 16:45:58 +02:00
b60376dc28
add pre-commit to CONTRIBUTING.txt
2018-05-23 16:45:23 +02:00
86def48b25
Fix some mistakes in contributing.rst
2018-04-13 11:33:58 +01:00
17a43dc4a5
firther enhance the links in contributing.rst
2018-04-12 22:06:06 +02:00
958f146125
Update CONTRIBUTING.rst
...
Fixes a broken link in CONTRIBUTING.rst
2018-04-12 20:54:32 +01:00
d370e7788d
Merge pull request #2068 from flub/commitaccess
...
[proposal] Add section about how you become a committer
2017-12-18 18:20:49 +01:00
e273f5399d
Update github "bugs" link
...
Apparently, some time ago label was renamed from bug to "type:bug"
2017-11-25 17:44:58 +03:00
fe560b7192
Make CONTRIBUTING and PR template more consistent regarding doc contributions
2017-10-23 18:46:14 -02:00
58aaabbb10
fix tox documentation link
2017-09-19 16:57:16 +02:00
949a1406f0
Revisit CONTRIBUTING.rst
2017-07-25 18:27:26 +02:00
61219da0e2
Update PR guide and add a "short" version
2017-07-22 16:08:18 -03:00
22f54784c2
Add "fix-lint" tox environment to fix linting errors
2017-07-20 22:12:15 -03:00
7684b3af7b
Recommend using py36 for testing on CONTRIBUTING
2017-03-16 22:20:38 -03:00
Ran Benita
Florian Bruhin
Nico Schlömer
Johannes Maron
Ronny Pfannschmidt
Hong Xu
Charles Aracil
Bruno Oliveira
Anthony Sottile
Thomas Grainger
Gleb Nikonorov
Curt J. Sampson
Daniel Hahler
PaulC
Jon Dufresne
Tim Hoffmann
AmirElkess
Kevin J. Foley
Tomer Keren
Darren Burns
Eugene Prikazchikov
Oliver Bestwalter