Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

main fixes #8425

Merged
merged 1 commit into from Mar 9, 2021
Merged

Conversation

RonnyPfannschmidt
Copy link
Member

@RonnyPfannschmidt RonnyPfannschmidt commented Mar 9, 2021

relates to pytest-dev/meta#8

Copy link
Member

@nicoddemus nicoddemus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work!

Just some comments:

  • There's a reference to master in development_guide.rst.
  • The diff shows an empty HOWTORELEASE.rst file?

CONTRIBUTING.rst Outdated Show resolved Hide resolved
@RonnyPfannschmidt RonnyPfannschmidt force-pushed the main-fixes branch 3 times, most recently from 965c846 to 748675b Compare March 9, 2021 21:33
@RonnyPfannschmidt
Copy link
Member Author

thanks for the comments, my key mistake was starting off in the branch from the debugging session with @nedbat where i did not check my branch state

@RonnyPfannschmidt RonnyPfannschmidt merged commit bfbf733 into pytest-dev:main Mar 9, 2021
@The-Compiler
Copy link
Member

The-Compiler commented Mar 17, 2021

This seems very incomplete...

CHANGELOG.rst

7:The source document can be found at: https://github.com/pytest-dev/pytest/blob/master/doc/en/changelog.rst

README.rst

27:   :target: https://results.pre-commit.ci/latest/github/pytest-dev/pytest/master

RELEASING.rst

35:1. Create a new maintenance branch from ``master``::
38:        git branch 5.2.x upstream/master
51:1. Create a new maintenance branch from ``master``::
54:        git branch 6.0.x upstream/master
69:into ``master`` and ported back to the maintenance branch, even for release candidates.
86:   ``upstream/master`` and push it to ``upstream``.
117:#. Cherry-pick the CHANGELOG / announce files to the ``master`` branch::
120:       git checkout origin/master -b cherry-pick-release
125:#. For major and minor releases, tag the release cherry-pick merge commit in master with
128:       git checkout master

CONTRIBUTING.rst

237:    # now, create your own branch off "master":
390:#. First, make sure the bug is fixed the ``master`` branch, with a regular pull
392:   applicable to ``master`` anymore.
394:#. ``git checkout origin/1.2.x -b backport-XXXX`` # use the master PR number here
398:    nicoddemus merged commit 0f8b462 into pytest-dev:master
411:As mentioned above, bugs should first be fixed on ``master`` (except in rare occasions
420:   the backport, normally the one that merged the PR on ``master``.
421:4. If a non-maintainers notices a bug which is fixed on ``master`` but has not been backported

scripts/prepare-release-pr.py

6:``6.1.x`` or ``master``) and if it should be a major release.

doc/en/changelog.rst

6670:  master branch in git repo: "master" branch now keeps the bug fixes, changes

(debatable because it's historical)

scripts/release-on-comment.py

6:`master` and is triggered by two comment related events:
19:* a major release from master if "major" appears in the phrase in that position
20:* a feature or bug fix release from master (based if there are features in the current changelog
233:    if is_feature_release and base_branch != "master":
237:            created from `master`:

(I suspect this one will break things if not fixed before the next release)

@RonnyPfannschmidt
Copy link
Member Author

Thanks for the note, sounds like a good idea to add test coverage on those

@RonnyPfannschmidt RonnyPfannschmidt deleted the main-fixes branch June 6, 2021 09:31
nicoddemus pushed a commit to nicoddemus/pytest that referenced this pull request Aug 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants