From 90824ffb3694aa328deaa2c4b96486a953d738b4 Mon Sep 17 00:00:00 2001
From: Vatsal Gupta <40350810+gvatsal60@users.noreply.github.com>
Date: Tue, 22 Oct 2024 22:23:56 +0530
Subject: [PATCH 1/2] Python Feature Version Update (#222) (#1148)

* Fix: Handle case where Python version is already installed in dev container (#617)

* Incorporated Review Comment: Version exist handling

* Update: Python Feature Version
---
 src/python/devcontainer-feature.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index 768cb4388..64b02fd34 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "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.",

From 2951f0481a488ea43a6f2ea6f18a47f0a0bf744d Mon Sep 17 00:00:00 2001
From: Vatsal Gupta <40350810+gvatsal60@users.noreply.github.com>
Date: Tue, 22 Oct 2024 23:51:35 +0530
Subject: [PATCH 2/2] Fixed Nvm Source Issue(#1078) (#1114)

* Fixed Nvm Source Issue

* Fix: Test Scenario Failure

* Updated node feature version

* Incorporated Review Comment
---
 src/node/devcontainer-feature.json | 2 +-
 src/node/install.sh                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json
index a9b0d46b8..d8d49e538 100644
--- a/src/node/devcontainer-feature.json
+++ b/src/node/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "node",
-    "version": "1.6.0",
+    "version": "1.6.1",
     "name": "Node.js (via nvm), yarn and pnpm",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
     "description": "Installs Node.js, nvm, yarn, pnpm, and needed dependencies.",
diff --git a/src/node/install.sh b/src/node/install.sh
index 3b74f885b..46d448440 100755
--- a/src/node/install.sh
+++ b/src/node/install.sh
@@ -227,7 +227,7 @@ install_yarn() {
                 # Yum/DNF want to install nodejs dependencies, we'll use NPM to install yarn
                 su ${USERNAME} -c "umask 0002 && . '${NVM_DIR}/nvm.sh' && nvm use ${_ver} && npm install --global yarn"
             fi
-        else 
+        else
             echo "Yarn already installed."
         fi
     fi
@@ -309,7 +309,7 @@ curl -so- "https://raw.githubusercontent.com/nvm-sh/nvm/v${NVM_VERSION}/install.
     curl -so- "https://raw.githubusercontent.com/nvm-sh/nvm/\${PREV_NVM_VERSION}/install.sh" | bash
     NVM_VERSION="\${PREV_NVM_VERSION}"
 }
-source "${NVM_DIR}/nvm.sh"
+[ -s "${NVM_DIR}/nvm.sh" ] && source "${NVM_DIR}/nvm.sh"
 if [ "${NODE_VERSION}" != "" ]; then
     nvm alias default "${NODE_VERSION}"
 fi