From 77729834859e2aeaaad6d6df3bedefe8e33b16ad Mon Sep 17 00:00:00 2001 From: eitsupi Date: Fri, 23 Jun 2023 22:33:14 +0900 Subject: [PATCH 1/3] [r-apt][r-rig] set PIP_BREAK_SYSTEM_PACKAGES=1 when installing pip packages --- src/r-apt/install.sh | 1 + src/r-rig/install.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/src/r-apt/install.sh b/src/r-apt/install.sh index 0b581bc..8b94739 100755 --- a/src/r-apt/install.sh +++ b/src/r-apt/install.sh @@ -118,6 +118,7 @@ install_pip_packages() { packages="$*" if [ -n "${packages}" ]; then check_pip + export PIP_BREAK_SYSTEM_PACKAGES=1 # shellcheck disable=SC2086 python3 -m pip install --upgrade --no-cache-dir --no-warn-script-location ${packages} fi diff --git a/src/r-rig/install.sh b/src/r-rig/install.sh index 1205e0c..da4c8fd 100755 --- a/src/r-rig/install.sh +++ b/src/r-rig/install.sh @@ -273,6 +273,7 @@ install_pip_packages() { local packages="$*" if [ -n "${packages}" ]; then check_pip + export PIP_BREAK_SYSTEM_PACKAGES=1 # shellcheck disable=SC2086 python3 -m pip install --upgrade --no-cache-dir --no-warn-script-location ${packages} fi From c6e5c843aff9b27292fc6210639117f75e4bd328 Mon Sep 17 00:00:00 2001 From: eitsupi Date: Fri, 23 Jun 2023 22:33:38 +0900 Subject: [PATCH 2/3] bump versions --- src/r-apt/devcontainer-feature.json | 2 +- src/r-rig/devcontainer-feature.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/r-apt/devcontainer-feature.json b/src/r-apt/devcontainer-feature.json index 29423af..0ea7cf2 100644 --- a/src/r-apt/devcontainer-feature.json +++ b/src/r-apt/devcontainer-feature.json @@ -1,7 +1,7 @@ { "name": "R (via apt)", "id": "r-apt", - "version": "0.3.3", + "version": "0.3.4", "description": "Installs the latest R, some R packages, and needed dependencies. Note: May require source code compilation for some R packages.", "documentationURL": "https://github.com/rocker-org/devcontainer-features/tree/main/src/r-apt", "options": { diff --git a/src/r-rig/devcontainer-feature.json b/src/r-rig/devcontainer-feature.json index 1134cc4..5b9b0f6 100644 --- a/src/r-rig/devcontainer-feature.json +++ b/src/r-rig/devcontainer-feature.json @@ -1,7 +1,7 @@ { "name": "R (via rig)", "id": "r-rig", - "version": "1.2.2", + "version": "1.2.3", "description": "Installs R, some R packages, and needed dependencies. Note: May require source code compilation for R packages.", "documentationURL": "https://github.com/rocker-org/devcontainer-features/tree/main/src/r-rig", "options": { From fea3adaf6ac500b0ad23ce939c51263198c840ed Mon Sep 17 00:00:00 2001 From: eitsupi Date: Fri, 23 Jun 2023 22:35:47 +0900 Subject: [PATCH 3/3] update notes --- src/r-apt/NOTES.md | 2 ++ src/r-rig/NOTES.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/r-apt/NOTES.md b/src/r-apt/NOTES.md index a12dabb..f15591f 100644 --- a/src/r-apt/NOTES.md +++ b/src/r-apt/NOTES.md @@ -57,6 +57,8 @@ For more information, please check [the Rocker Project website](https://rocker-p This feature has some options to install Python packages such as `jupyterlab`. When installing Python packages, if `python3 -m pip` is not available, it will install `python3-pip` via apt. +This feature set `PIP_BREAK_SYSTEM_PACKAGES=1` when installing Python packages. + ## References - [Rocker Project](https://rocker-project.org) diff --git a/src/r-rig/NOTES.md b/src/r-rig/NOTES.md index dae4c4a..11eed77 100644 --- a/src/r-rig/NOTES.md +++ b/src/r-rig/NOTES.md @@ -67,6 +67,8 @@ $ R -q -e 'pak::pak("curl")' This feature has some options to install Python packages such as `jupyterlab`. When installing Python packages, if `python3 -m pip` is not available, it will install `python3-pip` via apt. +This feature set `PIP_BREAK_SYSTEM_PACKAGES=1` when installing Python packages. + ## References - [rig](https://github.com/r-lib/rig)