diff options
| author | JP Ungaretti <19893438+jungaretti@users.noreply.github.com> | 2022-09-26 20:50:13 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-26 20:50:13 +0300 |
| commit | 960f21c2c5bd9bf7dc053518dc11bd4bf021fa5f (patch) | |
| tree | 5f89cb7214ccc5d087dc279aea73b9fc690c26b8 /src | |
| parent | 8c19bb1626c5e8b0b422b20ebf765e31fc200d26 (diff) | |
Fix additional Python and JupyterLab edge case (#182)
* Remove bloat from JupyterLab test
* Check location of JupyterLab installation
* Remove common-utils
* Add failing additional with JL test
* Fix Python feature
* Update scenario images
* Bump patch version
Diffstat (limited to 'src')
| -rw-r--r-- | src/python/devcontainer-feature.json | 2 | ||||
| -rwxr-xr-x | src/python/install.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json index 6d28941..0c90e0b 100644 --- a/src/python/devcontainer-feature.json +++ b/src/python/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "python", - "version": "1.0.7", + "version": "1.0.8", "name": "Python", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python", "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities. JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.", diff --git a/src/python/install.sh b/src/python/install.sh index 2a0dd55..3cf3a88 100755 --- a/src/python/install.sh +++ b/src/python/install.sh @@ -374,6 +374,7 @@ if [ "${PYTHON_VERSION}" != "none" ]; then # Additional python versions to be installed but not be set as default. if [ ! -z "${ADDITIONAL_VERSIONS}" ]; then + OLD_INSTALL_PATH="${INSTALL_PATH}" OLDIFS=$IFS IFS="," read -a additional_versions <<< "$ADDITIONAL_VERSIONS" @@ -381,6 +382,7 @@ if [ "${PYTHON_VERSION}" != "none" ]; then OVERRIDE_DEFAULT_VERSION="false" install_python $version done + INSTALL_PATH="${OLD_INSTALL_PATH}" IFS=$OLDIFS fi |