Skip to content

Update the setup and PR lifecycle pages #265

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

Merged
merged 11 commits into from
Sep 28, 2017
Merged

Update the setup and PR lifecycle pages #265

merged 11 commits into from
Sep 28, 2017

Conversation

ezio-melotti
Copy link
Member

This is part of #120, and it builds on #263. The goal of this PR is to reorganize the setup and pullrequest pages.

The end result will be:

  • The setup page will include all the necessary information for the initial setup. This will need to be done once.
  • The pullrequest page will include all the steps from creating a branch to getting it merged in CPython.

@willingc
Copy link
Collaborator

willingc commented Sep 7, 2017

@ezio-melotti Is this still WIP or ready for review? Lots of good improvements here 👍

@ezio-melotti
Copy link
Member Author

There are still a few changes I want to make before it's ready -- it shouldn't take too long.

@ezio-melotti ezio-melotti changed the title WIP: Update the setup and PR lifecycle pages Update the setup and PR lifecycle pages Sep 7, 2017
@ezio-melotti
Copy link
Member Author

That's enough commits for this PR :)
There are still a few more changes that need to be done, but they can be addressed by separate pull requests. Feel free to review :)

The automated patch check doesn't actually *answer* all of these
questions. Aside from the whitespace checks, the tool is
a memory aid for the various elements that can go into
making a complete patch.
Copy link
Member Author

Choose a reason for hiding this comment

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

This has been moved to the pullrequest page.

feature/bugfix.

It is of course okay to pile up several commits to one branch and merge them
into another in one commit.
Copy link
Member Author

Choose a reason for hiding this comment

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

This has been moved to pullrequest and combined with the next red chunk.

contributed to the resolution, it is good practice to credit them.



Copy link
Member Author

Choose a reason for hiding this comment

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

This has been combined with the previous chunk.

(note that not all checks apply to non-core developers). On Windows, use this
command (after any successful build of Python)::

python.bat Tools/scripts/patchcheck.py
Copy link
Member Author

Choose a reason for hiding this comment

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

This has been combined with the other patchcheck section and has been moved further down.

@Mariatta
Copy link
Member

Thanks @ezio-melotti It's looking great!

Copy link
Collaborator

@willingc willingc left a comment

Choose a reason for hiding this comment

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

@ezio-melotti One small comment as something to think about. I would merge this PR as is and address that in a future PR if needed. Great work! 🎉 🍰

6. Configure an ``upstream`` remote::

$ cd cpython
$ git remote add upstream [email protected]:python/cpython.git
Copy link
Collaborator

Choose a reason for hiding this comment

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

@ezio-melotti I think this is correct if you have push privileges on the repo, but others likely will need to use https for the upstream repo.

Copy link
Member

@terryjreedy terryjreedy Sep 26, 2017

Choose a reason for hiding this comment

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

One has to be using ssh for git@github to work. I believe we agreed to consistently use https: (and git's credential keeper) in the instructions as using both randomly is confusing.

Copy link
Member

Choose a reason for hiding this comment

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

But for the record, it does work even if you don't have push privileges for the repo, if you are using ssh already with github.

Copy link
Member Author

Choose a reason for hiding this comment

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

This was already discussed on #263. The outcome was that by using this URL we don't need to have separate instructions for core devs and contributors. Pulling works for both, and pushing to upstream would fail anyway if contributors don't have push privileges.
This was also moved from the old instructions, I didn't change it :)

@ezio-melotti ezio-melotti merged commit 7b9ba6f into python:master Sep 28, 2017
@ezio-melotti ezio-melotti deleted the update-pr-lifecycle branch September 28, 2017 00:18
@ezio-melotti
Copy link
Member Author

Thanks everyone for the reviews!
@willingc, if you think we should use different URLs it would be better to raise a separate issue or discuss it on the core-workflow ML.

AA-Turner pushed a commit to AA-Turner/devguide that referenced this pull request Jun 17, 2022
* Update the setup page and the quick guides.

* Working and markup tweaks.

* Remove the "Tool Setup" section.

* Rename the "Creating" section to "Introduction".

* Reorganize info about patchcheck.

* Rename and move the "Preparation" section to "Making good PRs".

* Fix headers levels (by rotating quotes).

* Remove outdated comment.

* Move and refactor the sections about commits.

* Fix markup and long lines.

* Convert the step-by-step guide to a bullet list.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants