From 1cb070fd45253a169b8348fd7ed538198304887f Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Wed, 26 Jun 2024 11:29:12 +1000 Subject: [PATCH 1/9] wip --- .devcontainer/devcontainer.json | 20 +++ .../linux-codespace-jupyter/Dockerfile copy | 123 ++++++++++++++++++ .../linux-codespace-jupyter/devcontainer.json | 20 +++ 3 files changed, 163 insertions(+) create mode 100644 .devcontainer/devcontainer.json create mode 100644 .devcontainer/linux-codespace-jupyter/Dockerfile copy create mode 100644 .devcontainer/linux-codespace-jupyter/devcontainer.json diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000..5a276dce --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,20 @@ +{ + "image": "mcr.microsoft.com/devcontainers/universal:2", + "waitFor": "onCreateCommand", + "updateContentCommand": "python3 -m pip install -r requirements.txt", + "postCreateCommand": "", + "customizations": { + "codespaces": { + "openFiles": [] + }, + "vscode": { + "extensions": [ + "ms-python.python@prerelease", + "esbenp.prettier-vscode", + "rust-lang.rust-analyzer", + "EditorConfig.EditorConfig" + ] + } + }, + "workspaceFolder": "/workspaces/python-environment-tools" +} \ No newline at end of file diff --git a/.devcontainer/linux-codespace-jupyter/Dockerfile copy b/.devcontainer/linux-codespace-jupyter/Dockerfile copy new file mode 100644 index 00000000..424d1ad2 --- /dev/null +++ b/.devcontainer/linux-codespace-jupyter/Dockerfile copy @@ -0,0 +1,123 @@ +#------------------------------------------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information. +#------------------------------------------------------------------------------------------------------------- + +FROM amd64/ubuntu:focal + +COPY first-run-notice.txt /tmp/scripts/ + +RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ + # Restore man command + && yes | unminimize 2>&1 + +ENV LANG="C.UTF-8" + +# Install basic build tools +RUN apt-get update \ + && apt-get upgrade -y \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + make \ + unzip \ + # The tools in this package are used when installing packages for Python + build-essential \ + swig3.0 \ + # Required for Microsoft SQL Server + unixodbc-dev \ + # Required for PostgreSQL + libpq-dev \ + # Required for mysqlclient + default-libmysqlclient-dev \ + # Required for ts + moreutils \ + rsync \ + zip \ + libgdiplus \ + jq \ + # By default pip is not available in the buildpacks image + python-pip-whl \ + python3-pip \ + #.NET Core related pre-requisites + libc6 \ + libgcc1 \ + libgssapi-krb5-2 \ + libncurses5 \ + liblttng-ust0 \ + libssl-dev \ + libstdc++6 \ + zlib1g \ + libuuid1 \ + libunwind8 \ + sqlite3 \ + libsqlite3-dev \ + software-properties-common \ + tk-dev \ + uuid-dev \ + curl \ + gettext \ + inotify-tools \ + && rm -rf /var/lib/apt/lists/* \ + # This is the folder containing 'links' to benv and build script generator + && apt-get update \ + && apt-get upgrade -y \ + && add-apt-repository universe \ + && rm -rf /var/lib/apt/lists/* + +# Verify expected build and debug tools are present +RUN apt-get update \ + && apt-get -y install build-essential cmake cppcheck valgrind clang lldb llvm gdb python3-dev \ + # Install tools and shells not in common script + && apt-get install -yq vim vim-doc xtail software-properties-common libsecret-1-dev \ + # Install additional tools (useful for 'puppeteer' project) + && apt-get install -y --no-install-recommends libnss3 libnspr4 libatk-bridge2.0-0 libatk1.0-0 libx11-6 libpangocairo-1.0-0 \ + libx11-xcb1 libcups2 libxcomposite1 libxdamage1 libxfixes3 libpango-1.0-0 libgbm1 libgtk-3-0 \ + # Clean up + && apt-get autoremove -y && apt-get clean -y \ + # Move first run notice to right spot + && mkdir -p "/usr/local/etc/vscode-dev-containers/" \ + && mv -f /tmp/scripts/first-run-notice.txt /usr/local/etc/vscode-dev-containers/ + +# Default to bash shell (other shells available at /usr/bin/fish and /usr/bin/zsh) +ENV SHELL=/bin/bash \ + DOCKER_BUILDKIT=1 + +# Install and setup fish +RUN apt-get install -yq fish \ + && FISH_PROMPT="function fish_prompt\n set_color green\n echo -n (whoami)\n set_color normal\n echo -n \":\"\n set_color blue\n echo -n (pwd)\n set_color normal\n echo -n \"> \"\nend\n" \ + && printf "$FISH_PROMPT" >> /etc/fish/functions/fish_prompt.fish \ + && printf "if type code-insiders > /dev/null 2>&1; and not type code > /dev/null 2>&1\n alias code=code-insiders\nend" >> /etc/fish/conf.d/code_alias.fish + +# Remove scripts now that we're done with them +RUN apt-get clean -y && rm -rf /tmp/scripts + +# Mount for docker-in-docker +VOLUME [ "/var/lib/docker" ] + +# Fire Docker/Moby script if needed +ENTRYPOINT [ "/usr/local/share/docker-init.sh", "/usr/local/share/ssh-init.sh"] +CMD [ "sleep", "infinity" ] + +# [Optional] Install debugger for development of Codespaces - Not in resulting image by default +ARG DeveloperBuild +RUN if [ -z $DeveloperBuild ]; then \ + echo "not including debugger" ; \ + else \ + curl -sSL https://aka.ms/getvsdbgsh | bash /dev/stdin -v latest -l /vsdbg ; \ + fi + +# # Do not install Python, this is the same one used for Jupyter in codespaces +# RUN apt-get update +# RUN apt install curl -y +# RUN sh -c "$(curl -fsSL https://github.com/deluan/zsh-in-docker/releases/download/v1.1.5/zsh-in-docker.sh)" -- \ +# -t powerlevel10k/powerlevel10k \ +# -p git \ +# -p git-extras \ +# -p https://github.com/zsh-users/zsh-completions +# RUN git clone https://github.com/romkatv/powerlevel10k $HOME/.oh-my-zsh/custom/themes/powerlevel10k +# RUN curl https://raw.githubusercontent.com/DonJayamanne/vscode-jupyter/containerChanges/.devcontainer/.p10k.zsh > ~/.p10k.zsh +# RUN echo "# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh." >> ~/.zshrc +# RUN echo "[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh" >> ~/.zshrc +# # Install Rust +# RUN curl https://sh.rustup.rs -sSf | sh -s -- -y +# RUN echo 'source $HOME/.cargo/env' >> $HOME/.bashrc +# ENV PATH="/root/.cargo/bin:${PATH}" diff --git a/.devcontainer/linux-codespace-jupyter/devcontainer.json b/.devcontainer/linux-codespace-jupyter/devcontainer.json new file mode 100644 index 00000000..5a276dce --- /dev/null +++ b/.devcontainer/linux-codespace-jupyter/devcontainer.json @@ -0,0 +1,20 @@ +{ + "image": "mcr.microsoft.com/devcontainers/universal:2", + "waitFor": "onCreateCommand", + "updateContentCommand": "python3 -m pip install -r requirements.txt", + "postCreateCommand": "", + "customizations": { + "codespaces": { + "openFiles": [] + }, + "vscode": { + "extensions": [ + "ms-python.python@prerelease", + "esbenp.prettier-vscode", + "rust-lang.rust-analyzer", + "EditorConfig.EditorConfig" + ] + } + }, + "workspaceFolder": "/workspaces/python-environment-tools" +} \ No newline at end of file From b75fed83ae8d79513e5b5071f9f00c9274c12803 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Wed, 26 Jun 2024 01:48:58 +0000 Subject: [PATCH 2/9] Fixes --- crates/pet-conda/src/lib.rs | 2 +- crates/pet-conda/src/utils.rs | 9 +++++---- crates/pet/Cargo.toml | 2 +- crates/pet/src/find.rs | 3 +++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/crates/pet-conda/src/lib.rs b/crates/pet-conda/src/lib.rs index f8465a95..cc0d0318 100644 --- a/crates/pet-conda/src/lib.rs +++ b/crates/pet-conda/src/lib.rs @@ -270,7 +270,6 @@ impl Locator for Conda { if manager.is_none() { // 4.1 Build the manager from the conda dir if we do not have it. if let Some(conda_manager) = CondaManager::from(conda_dir) { - reporter.report_manager(&conda_manager.to_manager()); let mut managers = self.managers.lock().unwrap(); managers.insert(conda_dir.to_path_buf().clone(), conda_manager.clone()); manager = Some(conda_manager); @@ -285,6 +284,7 @@ impl Locator for Conda { ); let mut environments = self.environments.lock().unwrap(); environments.insert(prefix.clone(), env.clone()); + reporter.report_manager(&manager.to_manager()); reporter.report_environment(&env); } else { // We will still return the conda env even though we do not have the manager. diff --git a/crates/pet-conda/src/utils.rs b/crates/pet-conda/src/utils.rs index aaf9e898..46e93833 100644 --- a/crates/pet-conda/src/utils.rs +++ b/crates/pet-conda/src/utils.rs @@ -6,13 +6,14 @@ use std::{ path::{Path, PathBuf}, }; -// conda-meta must exist as this contains a mandatory `history` file. +/// conda-meta must exist as this contains a mandatory `history` file. pub fn is_conda_install(path: &Path) -> bool { - path.join("envs").metadata().is_ok() && path.join("conda-meta").metadata().is_ok() + (path.join("condabin").metadata().is_ok() || path.join("envs").metadata().is_ok()) + && path.join("conda-meta").metadata().is_ok() } -// conda-meta must exist as this contains a mandatory `history` file. -// The root conda installation folder is also a conda environment (its the base environment). +/// conda-meta must exist as this contains a mandatory `history` file. +/// The root conda installation folder is also a conda environment (its the base environment). pub fn is_conda_env(path: &Path) -> bool { if let Ok(metadata) = fs::metadata(path.join("conda-meta")) { metadata.is_dir() diff --git a/crates/pet/Cargo.toml b/crates/pet/Cargo.toml index 9e8cb4cb..10a56569 100644 --- a/crates/pet/Cargo.toml +++ b/crates/pet/Cargo.toml @@ -38,7 +38,7 @@ clap = { version = "4.5.4", features = ["derive", "cargo"] } serde = { version = "1.0.152", features = ["derive"] } serde_json = "1.0.93" -[dev_dependencies] +[dev-dependencies] regex = "1.10.4" lazy_static = "1.4.0" diff --git a/crates/pet/src/find.rs b/crates/pet/src/find.rs index 6509b8ed..ffc5bc5e 100644 --- a/crates/pet/src/find.rs +++ b/crates/pet/src/find.rs @@ -307,6 +307,9 @@ fn identify_python_executables_using_locators( identify_python_environment_using_locators(&env, locators, fallback_category) { reporter.report_environment(&env); + if let Some(manager) = env.manager { + reporter.report_manager(&manager); + } continue; } else { warn!("Unknown Python Env {:?}", executable); From c08db880b9f75d167dc76059dc84782068700f15 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Wed, 26 Jun 2024 11:54:08 +1000 Subject: [PATCH 3/9] wip --- .devcontainer/Dockerfile | 17 +++ .devcontainer/devcontainer.json | 11 +- .../linux-codespace-jupyter/Dockerfile copy | 123 ------------------ .../linux-codespace-jupyter/devcontainer.json | 20 --- 4 files changed, 26 insertions(+), 145 deletions(-) create mode 100644 .devcontainer/Dockerfile delete mode 100644 .devcontainer/linux-codespace-jupyter/Dockerfile copy delete mode 100644 .devcontainer/linux-codespace-jupyter/devcontainer.json diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 00000000..85ae476c --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,17 @@ +# Based off, https://github.com/github/codespaces-jupyter +FROM mcr.microsoft.com/devcontainers/universal:2 + +RUN apt install curl -y +RUN sh -c "$(curl -fsSL https://github.com/deluan/zsh-in-docker/releases/download/v1.1.5/zsh-in-docker.sh)" -- \ + -t powerlevel10k/powerlevel10k \ + -p git \ + -p git-extras \ + -p https://github.com/zsh-users/zsh-completions +RUN git clone https://github.com/romkatv/powerlevel10k $HOME/.oh-my-zsh/custom/themes/powerlevel10k +RUN curl https://raw.githubusercontent.com/DonJayamanne/vscode-jupyter/containerChanges/.devcontainer/.p10k.zsh > ~/.p10k.zsh +RUN echo "# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh." >> ~/.zshrc +RUN echo "[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh" >> ~/.zshrc +# Install Rust +RUN curl https://sh.rustup.rs -sSf | sh -s -- -y +RUN echo 'source $HOME/.cargo/env' >> $HOME/.bashrc +ENV PATH="/root/.cargo/bin:${PATH}" diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 5a276dce..f97825ab 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,7 +1,14 @@ { - "image": "mcr.microsoft.com/devcontainers/universal:2", + // Based off, https://github.com/github/codespaces-jupyter + // Making this the top level container so it works on codespaces, + // Cannot always use locally as this is only x64 compatible + "name": "codespaces-jupyter", + // "image": "mcr.microsoft.com/devcontainers/universal:2", + "build": { + "context": "..", + "dockerfile": "./Dockerfile" + }, "waitFor": "onCreateCommand", - "updateContentCommand": "python3 -m pip install -r requirements.txt", "postCreateCommand": "", "customizations": { "codespaces": { diff --git a/.devcontainer/linux-codespace-jupyter/Dockerfile copy b/.devcontainer/linux-codespace-jupyter/Dockerfile copy deleted file mode 100644 index 424d1ad2..00000000 --- a/.devcontainer/linux-codespace-jupyter/Dockerfile copy +++ /dev/null @@ -1,123 +0,0 @@ -#------------------------------------------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information. -#------------------------------------------------------------------------------------------------------------- - -FROM amd64/ubuntu:focal - -COPY first-run-notice.txt /tmp/scripts/ - -RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ - # Restore man command - && yes | unminimize 2>&1 - -ENV LANG="C.UTF-8" - -# Install basic build tools -RUN apt-get update \ - && apt-get upgrade -y \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - make \ - unzip \ - # The tools in this package are used when installing packages for Python - build-essential \ - swig3.0 \ - # Required for Microsoft SQL Server - unixodbc-dev \ - # Required for PostgreSQL - libpq-dev \ - # Required for mysqlclient - default-libmysqlclient-dev \ - # Required for ts - moreutils \ - rsync \ - zip \ - libgdiplus \ - jq \ - # By default pip is not available in the buildpacks image - python-pip-whl \ - python3-pip \ - #.NET Core related pre-requisites - libc6 \ - libgcc1 \ - libgssapi-krb5-2 \ - libncurses5 \ - liblttng-ust0 \ - libssl-dev \ - libstdc++6 \ - zlib1g \ - libuuid1 \ - libunwind8 \ - sqlite3 \ - libsqlite3-dev \ - software-properties-common \ - tk-dev \ - uuid-dev \ - curl \ - gettext \ - inotify-tools \ - && rm -rf /var/lib/apt/lists/* \ - # This is the folder containing 'links' to benv and build script generator - && apt-get update \ - && apt-get upgrade -y \ - && add-apt-repository universe \ - && rm -rf /var/lib/apt/lists/* - -# Verify expected build and debug tools are present -RUN apt-get update \ - && apt-get -y install build-essential cmake cppcheck valgrind clang lldb llvm gdb python3-dev \ - # Install tools and shells not in common script - && apt-get install -yq vim vim-doc xtail software-properties-common libsecret-1-dev \ - # Install additional tools (useful for 'puppeteer' project) - && apt-get install -y --no-install-recommends libnss3 libnspr4 libatk-bridge2.0-0 libatk1.0-0 libx11-6 libpangocairo-1.0-0 \ - libx11-xcb1 libcups2 libxcomposite1 libxdamage1 libxfixes3 libpango-1.0-0 libgbm1 libgtk-3-0 \ - # Clean up - && apt-get autoremove -y && apt-get clean -y \ - # Move first run notice to right spot - && mkdir -p "/usr/local/etc/vscode-dev-containers/" \ - && mv -f /tmp/scripts/first-run-notice.txt /usr/local/etc/vscode-dev-containers/ - -# Default to bash shell (other shells available at /usr/bin/fish and /usr/bin/zsh) -ENV SHELL=/bin/bash \ - DOCKER_BUILDKIT=1 - -# Install and setup fish -RUN apt-get install -yq fish \ - && FISH_PROMPT="function fish_prompt\n set_color green\n echo -n (whoami)\n set_color normal\n echo -n \":\"\n set_color blue\n echo -n (pwd)\n set_color normal\n echo -n \"> \"\nend\n" \ - && printf "$FISH_PROMPT" >> /etc/fish/functions/fish_prompt.fish \ - && printf "if type code-insiders > /dev/null 2>&1; and not type code > /dev/null 2>&1\n alias code=code-insiders\nend" >> /etc/fish/conf.d/code_alias.fish - -# Remove scripts now that we're done with them -RUN apt-get clean -y && rm -rf /tmp/scripts - -# Mount for docker-in-docker -VOLUME [ "/var/lib/docker" ] - -# Fire Docker/Moby script if needed -ENTRYPOINT [ "/usr/local/share/docker-init.sh", "/usr/local/share/ssh-init.sh"] -CMD [ "sleep", "infinity" ] - -# [Optional] Install debugger for development of Codespaces - Not in resulting image by default -ARG DeveloperBuild -RUN if [ -z $DeveloperBuild ]; then \ - echo "not including debugger" ; \ - else \ - curl -sSL https://aka.ms/getvsdbgsh | bash /dev/stdin -v latest -l /vsdbg ; \ - fi - -# # Do not install Python, this is the same one used for Jupyter in codespaces -# RUN apt-get update -# RUN apt install curl -y -# RUN sh -c "$(curl -fsSL https://github.com/deluan/zsh-in-docker/releases/download/v1.1.5/zsh-in-docker.sh)" -- \ -# -t powerlevel10k/powerlevel10k \ -# -p git \ -# -p git-extras \ -# -p https://github.com/zsh-users/zsh-completions -# RUN git clone https://github.com/romkatv/powerlevel10k $HOME/.oh-my-zsh/custom/themes/powerlevel10k -# RUN curl https://raw.githubusercontent.com/DonJayamanne/vscode-jupyter/containerChanges/.devcontainer/.p10k.zsh > ~/.p10k.zsh -# RUN echo "# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh." >> ~/.zshrc -# RUN echo "[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh" >> ~/.zshrc -# # Install Rust -# RUN curl https://sh.rustup.rs -sSf | sh -s -- -y -# RUN echo 'source $HOME/.cargo/env' >> $HOME/.bashrc -# ENV PATH="/root/.cargo/bin:${PATH}" diff --git a/.devcontainer/linux-codespace-jupyter/devcontainer.json b/.devcontainer/linux-codespace-jupyter/devcontainer.json deleted file mode 100644 index 5a276dce..00000000 --- a/.devcontainer/linux-codespace-jupyter/devcontainer.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "image": "mcr.microsoft.com/devcontainers/universal:2", - "waitFor": "onCreateCommand", - "updateContentCommand": "python3 -m pip install -r requirements.txt", - "postCreateCommand": "", - "customizations": { - "codespaces": { - "openFiles": [] - }, - "vscode": { - "extensions": [ - "ms-python.python@prerelease", - "esbenp.prettier-vscode", - "rust-lang.rust-analyzer", - "EditorConfig.EditorConfig" - ] - } - }, - "workspaceFolder": "/workspaces/python-environment-tools" -} \ No newline at end of file From debf2548f82883477a8cebe63e7f3e609e7d6925 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Wed, 26 Jun 2024 02:06:29 +0000 Subject: [PATCH 4/9] wip --- .devcontainer/devcontainer.json | 7 ++----- .devcontainer/setup.sh | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 .devcontainer/setup.sh diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index f97825ab..97bb6e19 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,13 +3,10 @@ // Making this the top level container so it works on codespaces, // Cannot always use locally as this is only x64 compatible "name": "codespaces-jupyter", - // "image": "mcr.microsoft.com/devcontainers/universal:2", - "build": { - "context": "..", - "dockerfile": "./Dockerfile" - }, + "image": "mcr.microsoft.com/devcontainers/universal:2", "waitFor": "onCreateCommand", "postCreateCommand": "", + "postStartCommand": "bash ./setup.sh", "customizations": { "codespaces": { "openFiles": [] diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh new file mode 100644 index 00000000..f707f938 --- /dev/null +++ b/.devcontainer/setup.sh @@ -0,0 +1,17 @@ +#!/bin/bash + + +# sh -c "$(curl -fsSL https://github.com/deluan/zsh-in-docker/releases/download/v1.1.5/zsh-in-docker.sh)" -- \ +# -t powerlevel10k/powerlevel10k \ +# -p git \ +# -p git-extras \ +# -p https://github.com/zsh-users/zsh-completions +# git clone https://github.com/romkatv/powerlevel10k $HOME/.oh-my-zsh/custom/themes/powerlevel10k +# curl https://raw.githubusercontent.com/DonJayamanne/vscode-jupyter/containerChanges/.devcontainer/.p10k.zsh > ~/.p10k.zsh +# echo "# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh." >> ~/.zshrc +# echo "[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh" >> ~/.zshrc + +# Install Rust +curl https://sh.rustup.rs -sSf | sh -s -- -y +echo 'source $HOME/.cargo/env' >> $HOME/.bashrc +PATH="/root/.cargo/bin:${PATH}" From fa183f47ffdc5aaccc133b1454f6871720829590 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Wed, 26 Jun 2024 02:08:20 +0000 Subject: [PATCH 5/9] wip --- .devcontainer/devcontainer.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 97bb6e19..8470a8c4 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -8,9 +8,6 @@ "postCreateCommand": "", "postStartCommand": "bash ./setup.sh", "customizations": { - "codespaces": { - "openFiles": [] - }, "vscode": { "extensions": [ "ms-python.python@prerelease", From 763481cd5e68cfab4bf2a91546b77a880e2f373a Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Wed, 26 Jun 2024 02:08:29 +0000 Subject: [PATCH 6/9] wip --- .devcontainer/devcontainer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 8470a8c4..b2f08403 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,8 +5,7 @@ "name": "codespaces-jupyter", "image": "mcr.microsoft.com/devcontainers/universal:2", "waitFor": "onCreateCommand", - "postCreateCommand": "", - "postStartCommand": "bash ./setup.sh", + // "postStartCommand": "bash ./setup.sh", "customizations": { "vscode": { "extensions": [ From 7a402ccad0640ccedb1bd2ff3bbe7485782d24f2 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Wed, 26 Jun 2024 02:09:15 +0000 Subject: [PATCH 7/9] post start command --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b2f08403..8a0c0a3a 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,7 +5,7 @@ "name": "codespaces-jupyter", "image": "mcr.microsoft.com/devcontainers/universal:2", "waitFor": "onCreateCommand", - // "postStartCommand": "bash ./setup.sh", + "postStartCommand": "bash ./setup.sh", "customizations": { "vscode": { "extensions": [ From 1860f3eaa2a77154ca6ed89ab403e1e75648162b Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Wed, 26 Jun 2024 02:11:03 +0000 Subject: [PATCH 8/9] fixes --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 8a0c0a3a..54b1aec7 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,7 +5,7 @@ "name": "codespaces-jupyter", "image": "mcr.microsoft.com/devcontainers/universal:2", "waitFor": "onCreateCommand", - "postStartCommand": "bash ./setup.sh", + "postStartCommand": "bash ./.devcontainer/setup.sh", "customizations": { "vscode": { "extensions": [ From 0bfa762044895e3e489dac0184e1ef645aa3b6c8 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Wed, 26 Jun 2024 02:14:22 +0000 Subject: [PATCH 9/9] wip --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 54b1aec7..3dfe321b 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,7 +5,7 @@ "name": "codespaces-jupyter", "image": "mcr.microsoft.com/devcontainers/universal:2", "waitFor": "onCreateCommand", - "postStartCommand": "bash ./.devcontainer/setup.sh", + "postCreateCommand": "bash ./.devcontainer/setup.sh", "customizations": { "vscode": { "extensions": [