Merge branch 'develop' into feature/mark-sync-deprecated

Author: connesy

CHANGELOG.md

@@ -2,12 +2,13 @@
 
 ## [Unreleased](https://github.com/SallingGroup-AI-and-ML/venv-cli/tree/develop)
 
-## Minor changes
+### Minor changes
 * `venv sync` command marked as deprecated with removal planned for `v2.0`. Use `venv install <requirements>.lock` instead. [#14](https://github.com/SallingGroup-AI-and-ML/venv-cli/pull/14)
+* `venv install` now runs `venv clear` before installation. This ensures that the enrivonment doesn't end up with orphaned packages after making changes to `requirements.txt`. [#9](https://github.com/SallingGroup-AI-and-ML/venv-cli/issues/9)
 
 ## [v1.3.0](https://github.com/SallingGroup-AI-and-ML/venv-cli/releases/tag/v1.3.0) (2023-10-30)
 
-## Major changes
+### Major changes
 * `venv lock` no longer tries to fill in credentials for packages installed via VCS. This behavior was undocumented and difficult to maintain and ultimately tried to alleviate a shortcoming of the way `pip` handles these credentials. [#11](https://github.com/SallingGroup-AI-and-ML/venv-cli/pull/11)
 For users who have credentials as part of URLs in their `requirements.txt` files, there are other ways to handle credentials, e.g. filling them in `requirements.lock` manually, using a `.netrc` file to store the credetials or using a keyring. See https://pip.pypa.io/en/stable/topics/authentication/ for more info.
 

src/venv-cli/venv.sh

@@ -167,8 +167,8 @@ venv::install() {
   if venv::_check_if_help_requested "$1"; then
     echo "venv install [<requirements file>] [--skip-lock] [<install args>]"
     echo
-    echo "Install requirements from <requirements file>, like 'requirements.txt'"
-    echo "or 'requirements.lock'."
+    echo "Clear the environment, then install requirements from <requirements file>,"
+    echo "like 'requirements.txt' or 'requirements.lock'."
     echo "Installed packages are then locked into the corresponding .lock-file,"
     echo "e.g. 'venv install requirements.txt' will lock packages into 'requirements.lock'."
     echo "This step is skipped if '--skip-lock' is specified, or when installing"
@@ -211,6 +211,10 @@ venv::install() {
     shift
   fi
 
+  # Clear the environment before running pip install to avoid orphaned packages
+  # https://github.com/SallingGroup-AI-and-ML/venv-cli/issues/9
+  venv::clear
+
   venv::color_echo "${_green}" "Installing requirements from ${requirements_file}"
   if ! pip install --require-virtualenv --use-pep517 -r "${requirements_file}" "$@"; then
     return "${_fail}"