Replace pipxproject with pypa in docs and code (pypa#695)

kbayapu · May 27, 2021 · 17188a9 · 17188a9
1 parent 72786fb
commit 17188a9
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 28 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
@@ -8,7 +8,7 @@ about: Report a bug or unexpected behavior.
 Thank you for filing a bug! Please feel free to answer as much or as little of this template as you can.
 
 Please check pipx's Troubleshooting page to see if any of those solutions help solve your issue:
-https://pipxproject.github.io/pipx/troubleshooting/
+https://pypa.github.io/pipx/troubleshooting/
 -->
 
 **Describe the bug**

diff --git a/README.md b/README.md
@@ -1,27 +1,27 @@
 <p align="center">
-<a href="https://pipxproject.github.io/pipx/">
-<img align="center" src="https://github.com/pipxproject/pipx/raw/master/logo.png"/>
+<a href="https://pypa.github.io/pipx/">
+<img align="center" src="https://github.com/pypa/pipx/raw/master/logo.png"/>
 </a>
 </p>
 
 # pipx — Install and Run Python Applications in Isolated Environments
 
 <p align="center">
-<a href="https://github.com/pipxproject/pipx/raw/master/pipx_demo.gif">
-<img src="https://github.com/pipxproject/pipx/raw/master/pipx_demo.gif"/>
+<a href="https://github.com/pypa/pipx/raw/master/pipx_demo.gif">
+<img src="https://github.com/pypa/pipx/raw/master/pipx_demo.gif"/>
 </a>
 </p>
 
 <p align="center">
-<a href="https://github.com/pipxproject/pipx/actions?query=workflow%3ATest"><img src="https://github.com/pipxproject/pipx/workflows/Test/badge.svg?branch=master" alt="Test CI" ></a>
+<a href="https://github.com/pypa/pipx/actions?query=workflow%3ATest"><img src="https://github.com/pypa/pipx/workflows/Test/badge.svg?branch=master" alt="Test CI" ></a>
 <a href="https://badge.fury.io/py/pipx"><img src="https://badge.fury.io/py/pipx.svg" alt="PyPI version"></a>
 </p>
 
-**Documentation**: https://pipxproject.github.io/pipx/
+**Documentation**: https://pypa.github.io/pipx/
 
-**Source Code**: https://github.com/pipxproject/pipx
+**Source Code**: https://github.com/pypa/pipx
 
-_For comparison to other tools including pipsi, see [Comparison to Other Tools](https://pipxproject.github.io/pipx/comparisons/)._
+_For comparison to other tools including pipsi, see [Comparison to Other Tools](https://pypa.github.io/pipx/comparisons/)._
 
 ## Install pipx
 
@@ -48,7 +48,7 @@ Shell completions are available by following the instructions printed with this
 pipx completions
 ```
 
-For more details, see the [installation instructions](https://pipxproject.github.io/pipx/installation/).
+For more details, see the [installation instructions](https://pypa.github.io/pipx/installation/).
 
 
 ## Overview: What is `pipx`?
@@ -223,7 +223,7 @@ pipx is working!
 ```
 
 ### Summary
-That's it! Those are the most important commands `pipx` offers. To see all of pipx's documentation, run `pipx --help` or see the [docs](https://pipxproject.github.io/pipx/docs/).
+That's it! Those are the most important commands `pipx` offers. To see all of pipx's documentation, run `pipx --help` or see the [docs](https://pypa.github.io/pipx/docs/).
 
 ## Testimonials
 
@@ -258,7 +258,7 @@ That's it! Those are the most important commands `pipx` offers. To see all of pi
 
 ## Credits
 
-pipx was inspired by [pipsi](https://github.com/mitsuhiko/pipsi) and [npx](https://github.com/npm/npx). It was created by [Chad Smith](https://github.com/cs01/) and has had lots of help from [contributors](https://github.com/pipxproject/pipx/graphs/contributors). The logo was created by [@IrishMorales](https://github.com/IrishMorales).
+pipx was inspired by [pipsi](https://github.com/mitsuhiko/pipsi) and [npx](https://github.com/npm/npx). It was created by [Chad Smith](https://github.com/cs01/) and has had lots of help from [contributors](https://github.com/pypa/pipx/graphs/contributors). The logo was created by [@IrishMorales](https://github.com/IrishMorales).
 
 pipx is maintained by a team of volunteers (in alphabetical order)
 
@@ -268,6 +268,6 @@ pipx is maintained by a team of volunteers (in alphabetical order)
 - [Tzu-ping Chung](https://github.com/uranusjr)
 
 ## Contributing
-Issues and Pull Requests are definitely welcome! Check out [Contributing](https://pipxproject.github.io/pipx/contributing/) to get started.
+Issues and Pull Requests are definitely welcome! Check out [Contributing](https://pypa.github.io/pipx/contributing/) to get started.
 Everyone who interacts with the pipx project via codebase, issue tracker, chat rooms, or otherwise is expected to follow
 the [PSF Code of Conduct](https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md).
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -2,7 +2,7 @@ dev
 
 - Fixed `pipx list --json` to return valid json with no venvs installed.  Previously would return and empty string to stdout. (#681)
 - Changed `pipx ensurepath` bash behavior so that only one of {`~/.profile`, `~/.bash\_profile`} is modified with the extra pipx paths, not both.  Previously, if a `.bash_profile` file was created where one didn't exist, it could cause problems, e.g. #456. The internal change is to use userpath v1.5.0 or greater. (#684)
-- Changed default nox tests, Github Workflow tests, and pytest behavior to use local pypi server with fixed lists of available packages.  This allows greater test isolation (no network pypi access needed) and determinism (fixed available dependencies.)  It also allows running the tests offline with some extra preparation beforehand (See [Running Unit Tests Offline](https://pipxproject.github.io/pipx/contributing/#running-unit-tests-offline)). The old style tests that use the internet to access pypi.org are still available using `nox -s tests_internet` or `pytest --net-pypiserver tests`. (#686)
+- Changed default nox tests, Github Workflow tests, and pytest behavior to use local pypi server with fixed lists of available packages.  This allows greater test isolation (no network pypi access needed) and determinism (fixed available dependencies.)  It also allows running the tests offline with some extra preparation beforehand (See [Running Unit Tests Offline](https://pypa.github.io/pipx/contributing/#running-unit-tests-offline)). The old style tests that use the internet to access pypi.org are still available using `nox -s tests_internet` or `pytest --net-pypiserver tests`. (#686)
 * Colorama is now only installed on Windows. (#691)
 
 0.16.2.1

diff --git a/docs/comparisons.md b/docs/comparisons.md
@@ -52,10 +52,10 @@ None. Either one or the other should be used. These tools compete for a similar
 
 ### Migrating to pipx from pipsi
 
-After you have installed pipx, run [migrate_pipsi_to_pipx.py](https://raw.githubusercontent.com/pipxproject/pipx/master/scripts/migrate_pipsi_to_pipx.py). Why not do this with your new pipx installation?
+After you have installed pipx, run [migrate_pipsi_to_pipx.py](https://raw.githubusercontent.com/pypa/pipx/master/scripts/migrate_pipsi_to_pipx.py). Why not do this with your new pipx installation?
 
 ```
-pipx run https://raw.githubusercontent.com/pipxproject/pipx/master/scripts/migrate_pipsi_to_pipx.py
+pipx run https://raw.githubusercontent.com/pypa/pipx/master/scripts/migrate_pipsi_to_pipx.py
 ```
 
 ## pipx vs brew

diff --git a/docs/contributing.md b/docs/contributing.md
@@ -193,7 +193,7 @@ nox -s publish_docs
 ### Pre-release
 
 First, make sure the changelog is complete.  Next decide what the next version
-number will be.  Then, from a clone of the main pipxproject pipx repo (not a
+number will be.  Then, from a clone of the main pypa pipx repo (not a
 fork) execute:
 ```
 nox -s pre_release
@@ -212,7 +212,7 @@ trigger Github workflows that both publish the pipx version to PyPI and publish
 the pipx documentation to the pipx website.
 
 ### Post-release
-From a clone of the main pipxproject pipx repo (not a
+From a clone of the main pypa pipx repo (not a
 fork) execute:
 ```
 nox -s post_release

diff --git a/get-pipx.py b/get-pipx.py
@@ -11,7 +11,7 @@ def fail(msg):
 def main():
     fail(
         "This installation method has been deprecated. "
-        "See https://github.com/pipxproject/pipx for current installation "
+        "See https://github.com/pypa/pipx for current installation "
         "instructions."
     )
 

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -7,7 +7,7 @@ google_analytics:
   - 'UA-90243909-2'
   - 'auto'
 repo_name: pipx-project/pipx
-repo_url: https://github.com/pipxproject/pipx
+repo_url: https://github.com/pypa/pipx
 
 nav:
   - Home: "index.md"

diff --git a/setup.cfg b/setup.cfg
@@ -6,11 +6,11 @@ author_email = Chad Smith <[email protected]>
 description = Install and Run Python Applications in Isolated Environments
 long_description = file: README.md
 long_description_content_type = text/markdown
-url = https://github.com/pipxproject/pipx
+url = https://github.com/pypa/pipx
 project_urls =
-    Documentation = https://pipxproject.github.io/pipx/
-    Source Code = https://github.com/pipxproject/pipx
-    Bug Tracker = https://github.com/pipxproject/pipx/issues
+    Documentation = https://pypa.github.io/pipx/
+    Source Code = https://github.com/pypa/pipx
+    Bug Tracker = https://github.com/pypa/pipx/issues
 keywords = pip, install, cli, workflow, Virtual Environment
 license = License :: OSI Approved :: MIT License
 classifiers =

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 if sys.version_info < (3, 6, 0):
     sys.exit(
         "Python 3.6 or later is required. "
-        "See https://github.com/pipxproject/pipx "
+        "See https://github.com/pypa/pipx "
         "for installation instructions."
     )
 

diff --git a/src/pipx/__init__.py b/src/pipx/__init__.py
@@ -3,6 +3,6 @@
 if sys.version_info < (3, 6, 0):
     sys.exit(
         "Python 3.6 or later is required. "
-        "See https://github.com/pipxproject/pipx "
+        "See https://github.com/pypa/pipx "
         "for installation instructions."
     )
diff --git a/src/pipx/main.py b/src/pipx/main.py
@@ -729,7 +729,7 @@ def setup(args: argparse.Namespace) -> None:
                 {hazard}  A virtual environment for pipx was detected at
                 {str(old_pipx_venv_location)}. The 'pipx-app' package has been
                 renamed back to 'pipx'
-                (https://github.com/pipxproject/pipx/issues/82).
+                (https://github.com/pypa/pipx/issues/82).
                 """,
                 subsequent_indent=" " * 4,
             )

diff --git a/tests/test_install.py b/tests/test_install.py
@@ -32,7 +32,7 @@ def install_package(capsys, pipx_temp_env, caplog, package, package_name=""):
     assert f"installed package {package_name}" in captured.out
     if not sys.platform.startswith("win"):
         # TODO assert on windows too
-        # https://github.com/pipxproject/pipx/issues/217
+        # https://github.com/pypa/pipx/issues/217
         assert "symlink missing or pointing to unexpected location" not in captured.out
     assert "not modifying" not in captured.out
     assert "is not on your PATH environment variable" not in captured.out