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

Update *Edit this page* link #761

Merged
merged 2 commits into from
Jan 3, 2022
Merged

Update *Edit this page* link #761

merged 2 commits into from
Jan 3, 2022

Conversation

NdagiStanley
Copy link
Contributor

@NdagiStanley NdagiStanley commented Nov 16, 2021

  • I have added an entry to docs/changelog.md

Summary of changes

  • Updated mkdocs.yml to include

Reference: MkDocs User guide configuration page

Test plan

Tested by running the following in a python virtual environment:

pip install nox
nox -s watch_docs

The updated docs can be viewed at http://127.0.0.1:8000/. Click on the pencil icon towards the top right part of the page and confirm that the link redirects to [this page].(https://github.com/pypa/pipx/edit/main/docs/index.md)

Screenshot 2021-11-16 at 14 16 09

@NdagiStanley
Copy link
Contributor Author

Closes #760

@NdagiStanley NdagiStanley changed the title Update *Edit this page* link (#760) Update *Edit this page* link Nov 16, 2021
Copy link
Contributor

@gaborbernat gaborbernat left a comment

Choose a reason for hiding this comment

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

Merge conflicts need to be resolved.

@gaborbernat gaborbernat marked this pull request as draft January 3, 2022 00:17
alextremblay and others added 2 commits January 3, 2022 09:53
* Fix python 3.6-3.8 compatability error

All PR CI checks are currently failing because a method call was added to the `pipx.commands.reinstall.reinstall` function which was only added in python 3.9

Replaced that method call with a python >=3.6 workaround

* fixed formatting to black's satisfaction

Co-authored-by: Alex Tremblay <alex@tremblay.in>
@NdagiStanley
Copy link
Contributor Author

@gaborbernat I've resolved the merge conflicts.

This can be added to the docs/changelog.md:

- Updated *Edit this page* link in the documentation pages to redirect to the `main` branch instead of the (non-existent) `master` branch.

@NdagiStanley NdagiStanley marked this pull request as ready for review January 3, 2022 07:27
@gaborbernat gaborbernat merged commit 9d24fb9 into pypa:main Jan 3, 2022
Comment on lines +31 to +38
# use PurePath.relative_to in a try block instead
# of PurePath.is_relative_to, for python 3.6-3.8 compatability
Path(python).relative_to(venv_dir)
python_relative_to_venv_dir = True
except ValueError:
pass
else:
python_relative_to_venv_dir = False

if python_relative_to_venv_dir:
Copy link
Contributor

Choose a reason for hiding this comment

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

This change seems unrelated, what happened here?

Copy link
Contributor

Choose a reason for hiding this comment

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

I've reverted the PR to avoid merging this. Please open a new PR and keep the change set scopped to the PR description.

gaborbernat added a commit that referenced this pull request Jan 3, 2022
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.

4 participants