From f7e92a1450a25147a6feb370d6b4598308ff9158 Mon Sep 17 00:00:00 2001 From: Matthew Clapp Date: Thu, 5 Dec 2019 22:54:23 -0800 Subject: [PATCH 1/8] Add #222 items to changelog. --- docs/changelog.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/changelog.md b/docs/changelog.md index 4ac103fe4b..0656d85429 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,5 +1,9 @@ dev +- Now store metadata information for each application installed, including install options like `--spec`, and injected packages. This information allows upgrade, upgrade-all and reinstall-all to work properly even with non-pypi installed packages. (#222) +- Change `upgrade`, removing options `--spec`, `--include-deps`. Use original options used to install application instead. (#222) +- Change `upgrade-all`, removing options `--include-deps`, `--system-site-packages`, `--index-url`, `--editable`, `--pip-args`. Use original options used to install each application instead. (#222) +- Change `reinstall-all`, removing options `--include-deps`, `--system-site-packages`, `--index-url`, `--editable`, `--pip-args`. Use original options used to install each application instead. (#222) - Handle missing interpreters more gracefully (#146) - Change `reinstall-all` to use system python by default for apps. Now use `--python` option to specify a different python version. - Remove the PYTHONPATH environment variable when executing any command to prevent conflicts between pipx dependencies and package dependencies when pipx is installed via homebrew. Homebrew can use pythonpath manipulation instead of virtual environments. (#233) From 8a3af1b01239b0f7d033339f417f65c2aa8c392a Mon Sep 17 00:00:00 2001 From: Matthew Clapp Date: Thu, 5 Dec 2019 23:05:15 -0800 Subject: [PATCH 2/8] Rebuild docs. --- README.md | 2 +- docs/docs.md | 25 ++++++++++--------------- docs/index.md | 2 +- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 1355ca2a53..0e4ac47701 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ See Contributing for how to update this file. - + Code style: black

diff --git a/docs/docs.md b/docs/docs.md index daad583b68..d9955c34ec 100644 --- a/docs/docs.md +++ b/docs/docs.md @@ -36,8 +36,7 @@ subcommands: for each package. uninstall Uninstall a package uninstall-all Uninstall all packages - reinstall-all Reinstall all packages with a different Python - executable + reinstall-all Reinstall all packages list List installed packages run Download the latest version of a package to a temporary virtual environment, then run an app from @@ -169,9 +168,9 @@ optional arguments: ``` pipx upgrade --help -usage: pipx upgrade [-h] [--spec SPEC] [--force] [--include-deps] - [--system-site-packages] [--index-url INDEX_URL] - [--editable] [--pip-args PIP_ARGS] [--verbose] +usage: pipx upgrade [-h] [--force] [--system-site-packages] + [--index-url INDEX_URL] [--editable] [--pip-args PIP_ARGS] + [--verbose] package Upgrade a package in a pipx-managed Virtual Environment by running 'pip @@ -182,13 +181,8 @@ positional arguments: optional arguments: -h, --help show this help message and exit - --spec SPEC The package name or specific installation source - passed to pip. Runs `pip install -U SPEC`. For example - `--spec mypackage==2.0.0` or `--spec - git+https://github.com/user/repo.git@branch` --force, -f Modify existing virtual environment and files in PIPX_BIN_DIR - --include-deps Include apps of dependent packages --system-site-packages Give the virtual environment access to the system site-packages dir. @@ -295,20 +289,21 @@ optional arguments: ``` pipx reinstall-all --help -usage: pipx reinstall-all [-h] [--skip SKIP [SKIP ...]] [--verbose] python +usage: pipx reinstall-all [-h] [--python PYTHON] [--skip SKIP [SKIP ...]] + [--verbose] -Reinstalls all packages using a different version of Python. +Reinstalls all packages. Packages are uninstalled, then installed with pipx install PACKAGE with the same options used in the original install of PACKAGE. This is useful if you upgraded to a new version of Python and want all your packages to use the latest as well. -positional arguments: - python - optional arguments: -h, --help show this help message and exit + --python PYTHON The Python executable used to recreate the Virtual + Environment and run the associated app/apps. Must be + v3.5+. --skip SKIP [SKIP ...] skip these packages --verbose diff --git a/docs/index.md b/docs/index.md index 1355ca2a53..0e4ac47701 100644 --- a/docs/index.md +++ b/docs/index.md @@ -21,7 +21,7 @@ See Contributing for how to update this file. - + Code style: black

From 3af7fc76830d56ec859362100ac5bce3516020be Mon Sep 17 00:00:00 2001 From: Matthew Clapp Date: Tue, 10 Dec 2019 22:03:25 -0800 Subject: [PATCH 3/8] Make changelog items not sound like commands to user. --- docs/changelog.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/changelog.md b/docs/changelog.md index 0656d85429..897dbfeefc 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,9 +1,9 @@ dev -- Now store metadata information for each application installed, including install options like `--spec`, and injected packages. This information allows upgrade, upgrade-all and reinstall-all to work properly even with non-pypi installed packages. (#222) -- Change `upgrade`, removing options `--spec`, `--include-deps`. Use original options used to install application instead. (#222) -- Change `upgrade-all`, removing options `--include-deps`, `--system-site-packages`, `--index-url`, `--editable`, `--pip-args`. Use original options used to install each application instead. (#222) -- Change `reinstall-all`, removing options `--include-deps`, `--system-site-packages`, `--index-url`, `--editable`, `--pip-args`. Use original options used to install each application instead. (#222) +- Metadata is now stored for each application installed, including install options like `--spec`, and injected packages. This information allows upgrade, upgrade-all and reinstall-all to work properly even with non-pypi installed packages. (#222) +- `upgrade` options `--spec` and `--include-deps` were removed. Pipx now uses the original options used to install each application instead. (#222) +- `upgrade-all` options `--include-deps`, `--system-site-packages`, `--index-url`, `--editable`, and `--pip-args` were removed. Pipx now uses the original options used to install each application instead. (#222) +- `reinstall-all` options `--include-deps`, `--system-site-packages`, `--index-url`, `--editable`, and `--pip-args` were removed. Pipx now uses the original options used to install each application instead. (#222) - Handle missing interpreters more gracefully (#146) - Change `reinstall-all` to use system python by default for apps. Now use `--python` option to specify a different python version. - Remove the PYTHONPATH environment variable when executing any command to prevent conflicts between pipx dependencies and package dependencies when pipx is installed via homebrew. Homebrew can use pythonpath manipulation instead of virtual environments. (#233) From c966bd2c988c5302600c3c14a429e1eaead5ea03 Mon Sep 17 00:00:00 2001 From: Matthew Clapp Date: Thu, 12 Dec 2019 13:08:36 -0800 Subject: [PATCH 4/8] Revert generated docs. --- README.md | 2 +- docs/docs.md | 26 +++++++++++++++----------- docs/index.md | 2 +- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 0e4ac47701..1355ca2a53 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ See Contributing for how to update this file. - + Code style: black

diff --git a/docs/docs.md b/docs/docs.md index d9955c34ec..6e6030a427 100644 --- a/docs/docs.md +++ b/docs/docs.md @@ -36,7 +36,8 @@ subcommands: for each package. uninstall Uninstall a package uninstall-all Uninstall all packages - reinstall-all Reinstall all packages + reinstall-all Reinstall all packages with a different Python + executable list List installed packages run Download the latest version of a package to a temporary virtual environment, then run an app from @@ -168,9 +169,9 @@ optional arguments: ``` pipx upgrade --help -usage: pipx upgrade [-h] [--force] [--system-site-packages] - [--index-url INDEX_URL] [--editable] [--pip-args PIP_ARGS] - [--verbose] +usage: pipx upgrade [-h] [--spec SPEC] [--force] [--include-deps] + [--system-site-packages] [--index-url INDEX_URL] + [--editable] [--pip-args PIP_ARGS] [--verbose] package Upgrade a package in a pipx-managed Virtual Environment by running 'pip @@ -181,8 +182,13 @@ positional arguments: optional arguments: -h, --help show this help message and exit + --spec SPEC The package name or specific installation source + passed to pip. Runs `pip install -U SPEC`. For example + `--spec mypackage==2.0.0` or `--spec + git+https://github.com/user/repo.git@branch` --force, -f Modify existing virtual environment and files in PIPX_BIN_DIR + --include-deps Include apps of dependent packages --system-site-packages Give the virtual environment access to the system site-packages dir. @@ -289,21 +295,20 @@ optional arguments: ``` pipx reinstall-all --help -usage: pipx reinstall-all [-h] [--python PYTHON] [--skip SKIP [SKIP ...]] - [--verbose] +usage: pipx reinstall-all [-h] [--skip SKIP [SKIP ...]] [--verbose] python -Reinstalls all packages. +Reinstalls all packages using a different version of Python. Packages are uninstalled, then installed with pipx install PACKAGE with the same options used in the original install of PACKAGE. This is useful if you upgraded to a new version of Python and want all your packages to use the latest as well. +positional arguments: + python + optional arguments: -h, --help show this help message and exit - --python PYTHON The Python executable used to recreate the Virtual - Environment and run the associated app/apps. Must be - v3.5+. --skip SKIP [SKIP ...] skip these packages --verbose @@ -344,4 +349,3 @@ optional arguments: --verbose ``` - diff --git a/docs/index.md b/docs/index.md index 0e4ac47701..1355ca2a53 100644 --- a/docs/index.md +++ b/docs/index.md @@ -21,7 +21,7 @@ See Contributing for how to update this file. - + Code style: black

From c929fa4bd1d1e77c7eb4e933119ccf9c359282f5 Mon Sep 17 00:00:00 2001 From: Matthew Clapp Date: Thu, 12 Dec 2019 13:14:26 -0800 Subject: [PATCH 5/8] Revert "Revert generated docs." This reverts commit c966bd2c988c5302600c3c14a429e1eaead5ea03. --- README.md | 2 +- docs/docs.md | 26 +++++++++++--------------- docs/index.md | 2 +- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 1355ca2a53..0e4ac47701 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ See Contributing for how to update this file. - + Code style: black

diff --git a/docs/docs.md b/docs/docs.md index 6e6030a427..d9955c34ec 100644 --- a/docs/docs.md +++ b/docs/docs.md @@ -36,8 +36,7 @@ subcommands: for each package. uninstall Uninstall a package uninstall-all Uninstall all packages - reinstall-all Reinstall all packages with a different Python - executable + reinstall-all Reinstall all packages list List installed packages run Download the latest version of a package to a temporary virtual environment, then run an app from @@ -169,9 +168,9 @@ optional arguments: ``` pipx upgrade --help -usage: pipx upgrade [-h] [--spec SPEC] [--force] [--include-deps] - [--system-site-packages] [--index-url INDEX_URL] - [--editable] [--pip-args PIP_ARGS] [--verbose] +usage: pipx upgrade [-h] [--force] [--system-site-packages] + [--index-url INDEX_URL] [--editable] [--pip-args PIP_ARGS] + [--verbose] package Upgrade a package in a pipx-managed Virtual Environment by running 'pip @@ -182,13 +181,8 @@ positional arguments: optional arguments: -h, --help show this help message and exit - --spec SPEC The package name or specific installation source - passed to pip. Runs `pip install -U SPEC`. For example - `--spec mypackage==2.0.0` or `--spec - git+https://github.com/user/repo.git@branch` --force, -f Modify existing virtual environment and files in PIPX_BIN_DIR - --include-deps Include apps of dependent packages --system-site-packages Give the virtual environment access to the system site-packages dir. @@ -295,20 +289,21 @@ optional arguments: ``` pipx reinstall-all --help -usage: pipx reinstall-all [-h] [--skip SKIP [SKIP ...]] [--verbose] python +usage: pipx reinstall-all [-h] [--python PYTHON] [--skip SKIP [SKIP ...]] + [--verbose] -Reinstalls all packages using a different version of Python. +Reinstalls all packages. Packages are uninstalled, then installed with pipx install PACKAGE with the same options used in the original install of PACKAGE. This is useful if you upgraded to a new version of Python and want all your packages to use the latest as well. -positional arguments: - python - optional arguments: -h, --help show this help message and exit + --python PYTHON The Python executable used to recreate the Virtual + Environment and run the associated app/apps. Must be + v3.5+. --skip SKIP [SKIP ...] skip these packages --verbose @@ -349,3 +344,4 @@ optional arguments: --verbose ``` + diff --git a/docs/index.md b/docs/index.md index 1355ca2a53..0e4ac47701 100644 --- a/docs/index.md +++ b/docs/index.md @@ -21,7 +21,7 @@ See Contributing for how to update this file. - + Code style: black

From 9d6d3e2282f11ea373247acd83bc4a408cece12c Mon Sep 17 00:00:00 2001 From: Matthew Clapp Date: Thu, 12 Dec 2019 13:14:38 -0800 Subject: [PATCH 6/8] Revert "Rebuild docs." This reverts commit 8a3af1b01239b0f7d033339f417f65c2aa8c392a. --- README.md | 2 +- docs/docs.md | 25 +++++++++++++++---------- docs/index.md | 2 +- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 0e4ac47701..1355ca2a53 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ See Contributing for how to update this file. - + Code style: black

diff --git a/docs/docs.md b/docs/docs.md index d9955c34ec..daad583b68 100644 --- a/docs/docs.md +++ b/docs/docs.md @@ -36,7 +36,8 @@ subcommands: for each package. uninstall Uninstall a package uninstall-all Uninstall all packages - reinstall-all Reinstall all packages + reinstall-all Reinstall all packages with a different Python + executable list List installed packages run Download the latest version of a package to a temporary virtual environment, then run an app from @@ -168,9 +169,9 @@ optional arguments: ``` pipx upgrade --help -usage: pipx upgrade [-h] [--force] [--system-site-packages] - [--index-url INDEX_URL] [--editable] [--pip-args PIP_ARGS] - [--verbose] +usage: pipx upgrade [-h] [--spec SPEC] [--force] [--include-deps] + [--system-site-packages] [--index-url INDEX_URL] + [--editable] [--pip-args PIP_ARGS] [--verbose] package Upgrade a package in a pipx-managed Virtual Environment by running 'pip @@ -181,8 +182,13 @@ positional arguments: optional arguments: -h, --help show this help message and exit + --spec SPEC The package name or specific installation source + passed to pip. Runs `pip install -U SPEC`. For example + `--spec mypackage==2.0.0` or `--spec + git+https://github.com/user/repo.git@branch` --force, -f Modify existing virtual environment and files in PIPX_BIN_DIR + --include-deps Include apps of dependent packages --system-site-packages Give the virtual environment access to the system site-packages dir. @@ -289,21 +295,20 @@ optional arguments: ``` pipx reinstall-all --help -usage: pipx reinstall-all [-h] [--python PYTHON] [--skip SKIP [SKIP ...]] - [--verbose] +usage: pipx reinstall-all [-h] [--skip SKIP [SKIP ...]] [--verbose] python -Reinstalls all packages. +Reinstalls all packages using a different version of Python. Packages are uninstalled, then installed with pipx install PACKAGE with the same options used in the original install of PACKAGE. This is useful if you upgraded to a new version of Python and want all your packages to use the latest as well. +positional arguments: + python + optional arguments: -h, --help show this help message and exit - --python PYTHON The Python executable used to recreate the Virtual - Environment and run the associated app/apps. Must be - v3.5+. --skip SKIP [SKIP ...] skip these packages --verbose diff --git a/docs/index.md b/docs/index.md index 0e4ac47701..1355ca2a53 100644 --- a/docs/index.md +++ b/docs/index.md @@ -21,7 +21,7 @@ See Contributing for how to update this file. - + Code style: black

From 167d250a2435ca245f4880ab4e205b52b18296b2 Mon Sep 17 00:00:00 2001 From: Matthew Clapp Date: Sun, 15 Dec 2019 21:05:35 -0800 Subject: [PATCH 7/8] Revert version back to 0.14.0.0 --- src/pipx/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pipx/main.py b/src/pipx/main.py index df744ba055..600b00776b 100644 --- a/src/pipx/main.py +++ b/src/pipx/main.py @@ -20,7 +20,7 @@ from .util import PipxError, mkdir from .venv import VenvContainer -__version__ = "0.14.0.1" +__version__ = "0.14.0.0" def simple_parse_version(s, segments=4) -> Tuple[Union[int, str], ...]: From 3030965c0265ecb5923a5a81a57652f9eda8d2a2 Mon Sep 17 00:00:00 2001 From: Matthew Clapp Date: Sun, 15 Dec 2019 21:10:56 -0800 Subject: [PATCH 8/8] Revert docs.md to Oct 19, 2019 version. --- docs/docs.md | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/docs/docs.md b/docs/docs.md index daad583b68..5e078bdff7 100644 --- a/docs/docs.md +++ b/docs/docs.md @@ -206,13 +206,25 @@ optional arguments: ``` pipx upgrade-all --help -usage: pipx upgrade-all [-h] [--skip SKIP [SKIP ...]] [--force] [--verbose] +usage: pipx upgrade-all [-h] [--include-deps] [--system-site-packages] + [--index-url INDEX_URL] [--editable] + [--pip-args PIP_ARGS] [--skip SKIP [SKIP ...]] + [--force] [--verbose] Upgrades all packages within their virtual environments by running 'pip install --upgrade PACKAGE' optional arguments: -h, --help show this help message and exit + --include-deps Include apps of dependent packages + --system-site-packages + Give the virtual environment access to the system + site-packages dir. + --index-url INDEX_URL, -i INDEX_URL + Base URL of Python Package Index + --editable, -e Install a project in editable mode + --pip-args PIP_ARGS Arbitrary pip arguments to pass directly to pip + install/upgrade commands --skip SKIP [SKIP ...] skip these packages --force, -f Modify existing virtual environment and files in @@ -295,20 +307,35 @@ optional arguments: ``` pipx reinstall-all --help -usage: pipx reinstall-all [-h] [--skip SKIP [SKIP ...]] [--verbose] python +usage: pipx reinstall-all [-h] [--include-deps] [--system-site-packages] + [--index-url INDEX_URL] [--editable] + [--pip-args PIP_ARGS] [--skip SKIP [SKIP ...]] + [--verbose] + python Reinstalls all packages using a different version of Python. -Packages are uninstalled, then installed with pipx install PACKAGE -with the same options used in the original install of PACKAGE. +Packages are uninstalled, then installed with pipx install PACKAGE. This is useful if you upgraded to a new version of Python and want all your packages to use the latest as well. +If you originally installed a package from a source other than PyPI, +this command may behave in unexpected ways since it will reinstall from PyPI. + positional arguments: python optional arguments: -h, --help show this help message and exit + --include-deps Include apps of dependent packages + --system-site-packages + Give the virtual environment access to the system + site-packages dir. + --index-url INDEX_URL, -i INDEX_URL + Base URL of Python Package Index + --editable, -e Install a project in editable mode + --pip-args PIP_ARGS Arbitrary pip arguments to pass directly to pip + install/upgrade commands --skip SKIP [SKIP ...] skip these packages --verbose