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.

Sign up for GitHub

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

Jump to bottom

special-case --prompt . to the cwd #2220

Merged
merged 3 commits into from
Oct 23, 2021
Merged

special-case --prompt . to the cwd #2220

merged 3 commits into from
Oct 23, 2021

Conversation

rkm
Copy link
Contributor

@rkm rkm commented Oct 21, 2021 •
edited
Loading

Fixes #2215.

Adds a special-case to the base Activator class when a prompt of . is specified, which replaces the prompt text with the name of the current directory.

  • ran the linter to address style issues (tox -e fix_lint)
  • wrote descriptive pull request text
  • ensured there are test(s) validating the fix
  • added news fragment in docs/changelog folder
  • updated/extended the documentation

@rkm rkm marked this pull request as ready for review October 21, 2021 21:45
@gaborbernat
PR Feedback
81c5086 
Signed-off-by: Bernát Gábor <gaborjbernat@gmail.com>
@gaborbernat
Fix help message
712ed9d 
Signed-off-by: Bernát Gábor <gaborjbernat@gmail.com>
@gaborbernat gaborbernat merged commit 6bfc29e into pypa:main Oct 23, 2021
@rkm
Copy link
Contributor Author

rkm commented Oct 23, 2021

@gaborbernat I think the PR as merged now doesn't meet all of the expectations from the issue -- namely the parens and space around the prompt which are present in the venv implementation.

@gaborbernat
Copy link
Contributor

namely the parens and space around the prompt which are present in the venv implementation.

The formatting of the prompt is up to the activator script and should be handled as such. Would be a follow-up PR to sync our activation format (per shell) with venv. But that's out of scope for this PR. You're free to submit those PRs though.

@rkm rkm deleted the 2215-prompt-basename branch October 23, 2021 11:02
mergify bot pushed a commit to andrewbolster/bolster that referenced this pull request Oct 25, 2021
@dependabot
Bump virtualenv from 20.8.1 to 20.9.0 in /.github/workflows (#68)
dd1c1bd 
Bumps [virtualenv](https://github.com/pypa/virtualenv) from 20.8.1 to 20.9.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/pypa/virtualenv/blob/main/docs/changelog.rst">virtualenv's changelog</a>.</em></p>
<blockquote>
<h2>v20.9.0 (2021-10-23)</h2>
<p>Features - 20.9.0</p>
<pre><code>- Special-case ``--prompt .`` to the name of the current directory - by :user:`rkm`. (`[#2220](pypa/virtualenv#2220) &lt;https://github.com/pypa/virtualenv/issues/2220&gt;`_)
- Add libffi-8.dll to pypy windows `[#2218](pypa/virtualenv#2218) &lt;https://github.com/pypa/virtualenv/issues/2218&gt;`_ - by :user:`mattip`
<p>Bugfixes - 20.9.0
</code></pre></p>
<ul>
<li>Fixed path collision that could lead to a PermissionError or writing to system
directories when using PyPy3.8 - by :user:<code>mgorny</code>. (<code>[#2182](pypa/virtualenv#2182) &lt;https://github.com/pypa/virtualenv/issues/2182&gt;</code>_)</li>
<li>Upgrade embedded setuptools to <code>58.3.0</code> from <code>58.1.0</code> and pip to <code>21.3.1</code> from <code>21.2.4</code> - by
:user:<code>gaborbernat</code>. (<code>[#2205](pypa/virtualenv#2205) &lt;https://github.com/pypa/virtualenv/issues/2205&gt;</code>_)</li>
<li>Remove stray closing parenthesis in activate.bat - by :user:<code>SiggyBar</code>. (<code>[#2221](pypa/virtualenv#2221) &lt;https://github.com/pypa/virtualenv/issues/2221&gt;</code>_)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/pypa/virtualenv/commit/35d6a19dad02c5b9d4f700f3aaf9cbecb284cbb6"><code>35d6a19</code></a> release 20.9.0</li>
<li><a href="https://github.com/pypa/virtualenv/commit/4a1328b8f764683bffe860cd34ab0510f6e790d7"><code>4a1328b</code></a> Bump pip and setuptools (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2222">#2222</a>)</li>
<li><a href="https://github.com/pypa/virtualenv/commit/6bfc29e1a3d621e3f622a0d0395ff261ce0f3973"><code>6bfc29e</code></a> special-case <code>--prompt .</code> to the cwd (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2220">#2220</a>)</li>
<li><a href="https://github.com/pypa/virtualenv/commit/4188ac6e72d3b731595c83d46d1c0eb76fe4f6eb"><code>4188ac6</code></a> Support PyPy 3.8 (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2206">#2206</a>)</li>
<li><a href="https://github.com/pypa/virtualenv/commit/35ec4416d2012cfcb7a5e638813f6d52e852f29f"><code>35ec441</code></a> Remove stray closing parenthesis in activate.bat (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2221">#2221</a>)</li>
<li><a href="https://github.com/pypa/virtualenv/commit/c36117987cf65da92d4cfa7ab042f28a6266e135"><code>c361179</code></a> add libffi-8.dll to pypy windows _shared_libs (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2218">#2218</a>)</li>
<li><a href="https://github.com/pypa/virtualenv/commit/c77c6bc30edde2885091ad0945a093638ecbf45a"><code>c77c6bc</code></a> refactor to not do too much in ReentrantFileLock.<strong>del</strong> (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2213">#2213</a>)</li>
<li><a href="https://github.com/pypa/virtualenv/commit/6633e8578f65dd8f5eced14b9f6a7a495e55389a"><code>6633e85</code></a> Fix feature request template (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2217">#2217</a>)</li>
<li><a href="https://github.com/pypa/virtualenv/commit/df8e5f29939258913817b47bb5c01767fc333cd5"><code>df8e5f2</code></a> Setup Githug workflow concurrency (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2212">#2212</a>)</li>
<li><a href="https://github.com/pypa/virtualenv/commit/eafadce95da65f29a94b2b3b732f3f95c6d8421d"><code>eafadce</code></a> [pre-commit.ci] pre-commit autoupdate (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2211">#2211</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/pypa/virtualenv/compare/20.8.1...20.9.0">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=virtualenv&package-manager=pip&previous-version=20.8.1&new-version=20.9.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>
bors bot added a commit to ChrisRBe/PP-P2P-Parser that referenced this pull request Nov 3, 2021
@bors @dependabot
Merge #427
b91bc33 
427: build(deps): bump virtualenv from 20.8.1 to 20.10.0 r=ChrisRBe a=dependabot[bot]

Bumps [virtualenv](https://github.com/pypa/virtualenv) from 20.8.1 to 20.10.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/pypa/virtualenv/blob/main/docs/changelog.rst">virtualenv's changelog</a>.</em></p>
<blockquote>
<h1>Release History</h1>
<p>.. include:: _draft.rst</p>
<p>.. towncrier release notes start</p>
<h2>v20.9.0 (2021-10-23)</h2>
<p>Features - 20.9.0</p>
<pre><code>- Special-case ``--prompt .`` to the name of the current directory - by :user:`rkm`. (`[#2220](pypa/virtualenv#2220) &lt;https://github.com/pypa/virtualenv/issues/2220&gt;`_)
- Add libffi-8.dll to pypy windows `[#2218](pypa/virtualenv#2218) &lt;https://github.com/pypa/virtualenv/issues/2218&gt;`_ - by :user:`mattip`
<p>Bugfixes - 20.9.0
</code></pre></p>
<ul>
<li>Fixed path collision that could lead to a PermissionError or writing to system
directories when using PyPy3.8 - by :user:<code>mgorny</code>. (<code>[#2182](pypa/virtualenv#2182) &lt;https://github.com/pypa/virtualenv/issues/2182&gt;</code>_)</li>
<li>Upgrade embedded setuptools to <code>58.3.0</code> from <code>58.1.0</code> and pip to <code>21.3.1</code> from <code>21.2.4</code> - by
:user:<code>gaborbernat</code>. (<code>[#2205](pypa/virtualenv#2205) &lt;https://github.com/pypa/virtualenv/issues/2205&gt;</code>_)</li>
<li>Remove stray closing parenthesis in activate.bat - by :user:<code>SiggyBar</code>. (<code>[#2221](pypa/virtualenv#2221) &lt;https://github.com/pypa/virtualenv/issues/2221&gt;</code>_)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/pypa/virtualenv/commit/2f4e2668a4f70047549a5c8b146ac75143367538"><code>2f4e266</code></a> release 20.10.0</li>
<li><a href="https://github.com/pypa/virtualenv/commit/15c09d6e0c1eb11c18918ef67590e5291fd361f0"><code>15c09d6</code></a> ?? prompt should be wrapped in paranthesis ?? (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2224">#2224</a>)</li>
<li><a href="https://github.com/pypa/virtualenv/commit/8da79db86d8a5c74d03667a40e64ff832076445e"><code>8da79db</code></a> Favor the &quot;venv&quot; sysconfig install scheme over the default and distutils sche...</li>
<li><a href="https://github.com/pypa/virtualenv/commit/31f39137544bfea32c475f4a99473900a2995144"><code>31f3913</code></a> Fix broken prompt set up by activate.bat (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2225">#2225</a>) (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2226">#2226</a>)</li>
<li><a href="https://github.com/pypa/virtualenv/commit/653d4ebcaae635183e95fba40a8bf3592ec3647e"><code>653d4eb</code></a> Fix docs</li>
<li><a href="https://github.com/pypa/virtualenv/commit/a13e51e69080a5a5a5a15630f4a0f7b3d97d1c9a"><code>a13e51e</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2223">#2223</a> from pypa/release-20.9.0</li>
<li><a href="https://github.com/pypa/virtualenv/commit/35d6a19dad02c5b9d4f700f3aaf9cbecb284cbb6"><code>35d6a19</code></a> release 20.9.0</li>
<li><a href="https://github.com/pypa/virtualenv/commit/4a1328b8f764683bffe860cd34ab0510f6e790d7"><code>4a1328b</code></a> Bump pip and setuptools (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2222">#2222</a>)</li>
<li><a href="https://github.com/pypa/virtualenv/commit/6bfc29e1a3d621e3f622a0d0395ff261ce0f3973"><code>6bfc29e</code></a> special-case <code>--prompt .</code> to the cwd (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2220">#2220</a>)</li>
<li><a href="https://github.com/pypa/virtualenv/commit/4188ac6e72d3b731595c83d46d1c0eb76fe4f6eb"><code>4188ac6</code></a> Support PyPy 3.8 (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2206">#2206</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/pypa/virtualenv/compare/20.8.1...20.10.0">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=virtualenv&package-manager=pip&previous-version=20.8.1&new-version=20.10.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting ``@dependabot` rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- ``@dependabot` rebase` will rebase this PR
- ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it
- ``@dependabot` merge` will merge this PR after your CI passes on it
- ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it
- ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging
- ``@dependabot` reopen` will reopen this PR if it is closed
- ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
qujingpengf added a commit to qujingpengf/ChrisRBe that referenced this pull request Jan 22, 2022
@qujingpengf @dependabot
Merge #427
db22417 
427: build(deps): bump virtualenv from 20.8.1 to 20.10.0 r=ChrisRBe a=dependabot[bot]

Bumps [virtualenv](https://github.com/pypa/virtualenv) from 20.8.1 to 20.10.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/pypa/virtualenv/blob/main/docs/changelog.rst">virtualenv's changelog</a>.</em></p>
<blockquote>
<h1>Release History</h1>
<p>.. include:: _draft.rst</p>
<p>.. towncrier release notes start</p>
<h2>v20.9.0 (2021-10-23)</h2>
<p>Features - 20.9.0</p>
<pre><code>- Special-case ``--prompt .`` to the name of the current directory - by :user:`rkm`. (`[#2220](pypa/virtualenv#2220) &lt;https://github.com/pypa/virtualenv/issues/2220&gt;`_)
- Add libffi-8.dll to pypy windows `[#2218](pypa/virtualenv#2218) &lt;https://github.com/pypa/virtualenv/issues/2218&gt;`_ - by :user:`mattip`
<p>Bugfixes - 20.9.0
</code></pre></p>
<ul>
<li>Fixed path collision that could lead to a PermissionError or writing to system
directories when using PyPy3.8 - by :user:<code>mgorny</code>. (<code>[#2182](pypa/virtualenv#2182) &lt;https://github.com/pypa/virtualenv/issues/2182&gt;</code>_)</li>
<li>Upgrade embedded setuptools to <code>58.3.0</code> from <code>58.1.0</code> and pip to <code>21.3.1</code> from <code>21.2.4</code> - by
:user:<code>gaborbernat</code>. (<code>[#2205](pypa/virtualenv#2205) &lt;https://github.com/pypa/virtualenv/issues/2205&gt;</code>_)</li>
<li>Remove stray closing parenthesis in activate.bat - by :user:<code>SiggyBar</code>. (<code>[#2221](pypa/virtualenv#2221) &lt;https://github.com/pypa/virtualenv/issues/2221&gt;</code>_)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/pypa/virtualenv/commit/2f4e2668a4f70047549a5c8b146ac75143367538"><code>2f4e266</code></a> release 20.10.0</li>
<li><a href="https://github.com/pypa/virtualenv/commit/15c09d6e0c1eb11c18918ef67590e5291fd361f0"><code>15c09d6</code></a> ?? prompt should be wrapped in paranthesis ?? (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2224">#2224</a>)</li>
<li><a href="https://github.com/pypa/virtualenv/commit/8da79db86d8a5c74d03667a40e64ff832076445e"><code>8da79db</code></a> Favor the &quot;venv&quot; sysconfig install scheme over the default and distutils sche...</li>
<li><a href="https://github.com/pypa/virtualenv/commit/31f39137544bfea32c475f4a99473900a2995144"><code>31f3913</code></a> Fix broken prompt set up by activate.bat (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2225">#2225</a>) (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2226">#2226</a>)</li>
<li><a href="https://github.com/pypa/virtualenv/commit/653d4ebcaae635183e95fba40a8bf3592ec3647e"><code>653d4eb</code></a> Fix docs</li>
<li><a href="https://github.com/pypa/virtualenv/commit/a13e51e69080a5a5a5a15630f4a0f7b3d97d1c9a"><code>a13e51e</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2223">#2223</a> from pypa/release-20.9.0</li>
<li><a href="https://github.com/pypa/virtualenv/commit/35d6a19dad02c5b9d4f700f3aaf9cbecb284cbb6"><code>35d6a19</code></a> release 20.9.0</li>
<li><a href="https://github.com/pypa/virtualenv/commit/4a1328b8f764683bffe860cd34ab0510f6e790d7"><code>4a1328b</code></a> Bump pip and setuptools (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2222">#2222</a>)</li>
<li><a href="https://github.com/pypa/virtualenv/commit/6bfc29e1a3d621e3f622a0d0395ff261ce0f3973"><code>6bfc29e</code></a> special-case <code>--prompt .</code> to the cwd (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2220">#2220</a>)</li>
<li><a href="https://github.com/pypa/virtualenv/commit/4188ac6e72d3b731595c83d46d1c0eb76fe4f6eb"><code>4188ac6</code></a> Support PyPy 3.8 (<a href="https://github-redirect.dependabot.com/pypa/virtualenv/issues/2206">#2206</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/pypa/virtualenv/compare/20.8.1...20.10.0">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=virtualenv&package-manager=pip&previous-version=20.8.1&new-version=20.10.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting ``@dependabot` rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- ``@dependabot` rebase` will rebase this PR
- ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it
- ``@dependabot` merge` will merge this PR after your CI passes on it
- ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it
- ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging
- ``@dependabot` reopen` will reopen this PR if it is closed
- ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gaborbernat gaborbernat gaborbernat approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

--prompt . : the dot causes the basename of the current directory to be used
2 participants
@rkm @gaborbernat