From f3226b116fe14ec6fb90c5fff6b1e79a076a1518 Mon Sep 17 00:00:00 2001 From: Samruddhi Khandale Date: Thu, 12 May 2022 15:04:20 -0700 Subject: [PATCH 1/3] python: bug fix --- src/python/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/install.sh b/src/python/install.sh index bdfc4d8bc..49018afd2 100644 --- a/src/python/install.sh +++ b/src/python/install.sh @@ -322,7 +322,7 @@ chown :pipx ${PIPX_HOME} ${PIPX_BIN_DIR} chmod g+s ${PIPX_HOME} ${PIPX_BIN_DIR} # Update pip if not using os provided python -if [ ${PYTHON_VERSION} != "os-provided" ] && [ ${PYTHON_VERSION} != "system" ]; then +if [ ${PYTHON_VERSION} != "os-provided" ] && [ ${PYTHON_VERSION} != "system" ] && [ ${PYTHON_VERSION} != "none" ]; then echo "Updating pip..." ${PYTHON_INSTALL_PATH}/bin/python3 -m pip install --no-cache-dir --upgrade pip fi From 9059562eb4c226bc3a95869439f2e57e025775fe Mon Sep 17 00:00:00 2001 From: Samruddhi Khandale Date: Mon, 16 May 2022 10:47:57 -0700 Subject: [PATCH 2/3] add missing "none" proposal --- src/docker-from-docker/feature.json | 2 +- src/docker-in-docker/feature.json | 2 +- src/git-lfs/feature.json | 2 +- src/github-cli/feature.json | 2 +- src/go/feature.json | 2 +- src/gradle/feature.json | 2 +- src/java/feature.json | 2 +- src/kubectl-helm-minikube/feature.json | 2 +- src/maven/feature.json | 2 +- src/node/feature.json | 2 +- src/powershell/feature.json | 2 +- src/python/feature.json | 2 +- src/ruby/feature.json | 2 +- src/rust/feature.json | 2 +- src/terraform/feature.json | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/docker-from-docker/feature.json b/src/docker-from-docker/feature.json index c7d684e64..ce955a7e4 100644 --- a/src/docker-from-docker/feature.json +++ b/src/docker-from-docker/feature.json @@ -4,7 +4,7 @@ "options": { "version": { "type": "string", - "proposals": ["latest", "20.10"], + "proposals": ["latest", "none", "20.10"], "default": "latest", "description": "Select or enter a Docker/Moby CLI version. (Availability can vary by OS version.)" }, diff --git a/src/docker-in-docker/feature.json b/src/docker-in-docker/feature.json index 0eaaa801d..0aa95e9e1 100644 --- a/src/docker-in-docker/feature.json +++ b/src/docker-in-docker/feature.json @@ -4,7 +4,7 @@ "options": { "version": { "type": "string", - "proposals": ["latest", "20.10" ], + "proposals": ["latest", "none", "20.10" ], "default": "latest", "description": "Select or enter a Docker/Moby Engine version. (Availability can vary by OS version.)" }, diff --git a/src/git-lfs/feature.json b/src/git-lfs/feature.json index 4fa33c565..892670b61 100644 --- a/src/git-lfs/feature.json +++ b/src/git-lfs/feature.json @@ -4,7 +4,7 @@ "options": { "version": { "type": "string", - "enum": ["latest"], + "enum": ["latest", "none"], "default": "latest", "description": "Currently unused." } diff --git a/src/github-cli/feature.json b/src/github-cli/feature.json index 03f07cfdd..9a0092322 100644 --- a/src/github-cli/feature.json +++ b/src/github-cli/feature.json @@ -4,7 +4,7 @@ "options": { "version": { "type": "string", - "proposals": ["latest"], + "proposals": ["latest", "none"], "default": "latest", "description": "Select version of the GitHub CLI, if not latest." } diff --git a/src/go/feature.json b/src/go/feature.json index 0f8c6dbf7..387839e59 100644 --- a/src/go/feature.json +++ b/src/go/feature.json @@ -4,7 +4,7 @@ "options": { "version": { "type": "string", - "proposals": ["latest", "1.18", "1.17"], + "proposals": ["latest", "none", "1.18", "1.17"], "default": "latest", "description": "Select or enter a Go version to install" } diff --git a/src/gradle/feature.json b/src/gradle/feature.json index 3a393b9c5..6962eaa7a 100644 --- a/src/gradle/feature.json +++ b/src/gradle/feature.json @@ -5,7 +5,7 @@ "options": { "version": { "type": "string", - "proposals": ["latest", "7", "6", "5"], + "proposals": ["latest", "none", "7", "6", "5"], "default": "latest", "description": "Select or enter a Gradle version to install" } diff --git a/src/java/feature.json b/src/java/feature.json index 263c2c854..5914bd71a 100644 --- a/src/java/feature.json +++ b/src/java/feature.json @@ -4,7 +4,7 @@ "options": { "version": { "type": "string", - "proposals": ["lts", "latest", "17", "11", "8"], + "proposals": ["lts", "latest", "none", "17", "11", "8"], "default": "lts", "description": "Select or enter a Java version to install" } diff --git a/src/kubectl-helm-minikube/feature.json b/src/kubectl-helm-minikube/feature.json index 18723c727..fdfff0bb6 100644 --- a/src/kubectl-helm-minikube/feature.json +++ b/src/kubectl-helm-minikube/feature.json @@ -4,7 +4,7 @@ "options": { "version": { "type": "string", - "proposals": ["latest", "1.23", "1.22", "1.21"], + "proposals": ["latest", "none", "1.23", "1.22", "1.21"], "default": "latest", "description": "Select or enter a Kubernetes version to install" }, diff --git a/src/maven/feature.json b/src/maven/feature.json index bc4f5f3ac..7b945814a 100644 --- a/src/maven/feature.json +++ b/src/maven/feature.json @@ -5,7 +5,7 @@ "options": { "version": { "type": "string", - "proposals": ["latest", "3.8", "3.6", "3.5"], + "proposals": ["latest", "none", "3.8", "3.6", "3.5"], "default": "latest", "description": "Select or enter a Maven version to install" } diff --git a/src/node/feature.json b/src/node/feature.json index 5a8e81d5f..7b092a58a 100644 --- a/src/node/feature.json +++ b/src/node/feature.json @@ -4,7 +4,7 @@ "options": { "version": { "type": "string", - "proposals": [ "lts", "latest", "18", "16", "14" ], + "proposals": [ "lts", "latest", "none", "18", "16", "14" ], "default": "lts", "description": "Select or enter a Node.js version to install" }, diff --git a/src/powershell/feature.json b/src/powershell/feature.json index d81bb4bbe..842a62976 100644 --- a/src/powershell/feature.json +++ b/src/powershell/feature.json @@ -4,7 +4,7 @@ "options": { "version": { "type": "string", - "proposals": ["latest", "7.1"], + "proposals": ["latest", "none", "7.1"], "default": "latest", "description": "Select or enter a version of PowerShell." } diff --git a/src/python/feature.json b/src/python/feature.json index 18728f35b..f7a4f77db 100644 --- a/src/python/feature.json +++ b/src/python/feature.json @@ -5,7 +5,7 @@ "options": { "version": { "type": "string", - "enum": ["latest", "os-provided", "3.10", "3.9", "3.8", "3.7", "3.6"], + "enum": ["latest", "none", "os-provided", "3.10", "3.9", "3.8", "3.7", "3.6"], "default": "os-provided", "description": "Select a Python version to install." }, diff --git a/src/ruby/feature.json b/src/ruby/feature.json index 3ba0a3618..919cf47eb 100644 --- a/src/ruby/feature.json +++ b/src/ruby/feature.json @@ -4,7 +4,7 @@ "options": { "version": { "type": "string", - "proposals": ["latest", "3.1", "3.0", "2.7"], + "proposals": ["latest", "none", "3.1", "3.0", "2.7"], "default": "latest", "description": "Select or enter a Ruby version to install" } diff --git a/src/rust/feature.json b/src/rust/feature.json index 47df7e1b8..3604ced0e 100644 --- a/src/rust/feature.json +++ b/src/rust/feature.json @@ -4,7 +4,7 @@ "options": { "version": { "type": "string", - "proposals": ["latest", "1.55", "1.54", "1.53"], + "proposals": ["latest", "none", "1.55", "1.54", "1.53"], "default": "latest", "description": "Select or enter a version of Rust to install." }, diff --git a/src/terraform/feature.json b/src/terraform/feature.json index 02670a5fc..b59ac3efe 100644 --- a/src/terraform/feature.json +++ b/src/terraform/feature.json @@ -4,7 +4,7 @@ "options": { "version": { "type": "string", - "proposals": ["latest", "1.1", "1.0", "0.15"], + "proposals": ["latest", "none", "1.1", "1.0", "0.15"], "default": "latest", "description": "Terraform version" }, From a5088659671470c22d73e3e778155265e2334587 Mon Sep 17 00:00:00 2001 From: Samruddhi Khandale Date: Mon, 16 May 2022 10:51:10 -0700 Subject: [PATCH 3/3] nit --- src/kubectl-helm-minikube/feature.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kubectl-helm-minikube/feature.json b/src/kubectl-helm-minikube/feature.json index fdfff0bb6..7033c7a4b 100644 --- a/src/kubectl-helm-minikube/feature.json +++ b/src/kubectl-helm-minikube/feature.json @@ -4,7 +4,7 @@ "options": { "version": { "type": "string", - "proposals": ["latest", "none", "1.23", "1.22", "1.21"], + "proposals": ["latest", "none", "1.23", "1.22", "1.21"], "default": "latest", "description": "Select or enter a Kubernetes version to install" },