Merge pull request #440 from dyson-ai/feature/update_from_template

Feature/update from template

bencher.deps.yaml

@@ -1,7 +1,3 @@
-apt_sources:
-  - curl
-  - ca-certificates
-
 apt_tools:
   - git
   - git-lfs
@@ -10,6 +6,4 @@ apt_tools:
 
 pip_language-toolchain:
   - uv #use uv instead of pip
-
-script_pixi-user:
-  - scripts/install_pixi.sh
+  - pip #update to the latest pip

pyproject.toml

@@ -5,6 +5,7 @@ version = "1.29.0"
 authors = [{ name = "Austin Gregg-Smith", email = "[email protected]" }]
 description = "A package for benchmarking the performance of arbitrary functions"
 readme = "README.md"
+license = "MIT"
 
 dependencies = [
   "holoviews>=1.15,<=1.19.1",
@@ -46,11 +47,6 @@ python = "3.11.*"
 [tool.pixi.feature.py312.dependencies]
 python = "3.12.*"
 
-#an environment for launching vscode with rocker and deps_rocker
-[tool.pixi.feature.devenv]
-dependencies = { python = "3.10" }
-pypi-dependencies = { deps-rocker = ">=0.2" }
-tasks = { code = "scripts/launch_vscode.sh", code-nocache = "scripts/launch_vscode.sh --nocache" }
 
 [tool.pixi.pypi-dependencies]
 holobench = { path = ".", editable = true }
@@ -60,9 +56,9 @@ test = [
   "black>=23,<=24.8.0",
   "pylint>=3.2.5,<=3.2.7",
   "pytest-cov>=4.1,<=5.0.0",
-  "pytest>=7.4,<=8.3.2",
-  "hypothesis>=6.104.2,<=6.111.2",
-  "ruff>=0.5.0,<=0.6.3",
+  "pytest>=7.4,<=8.3.3",
+  "hypothesis>=6.104.2,<=6.112.1",
+  "ruff>=0.5.0,<=0.6.5",
   "coverage>=7.5.4,<=7.6.1",
 ]
 
@@ -80,9 +76,6 @@ py310 = ["py310","test"]
 py311 = ["py311","test"]
 py312 = ["py312","test"]
 
-devenv = { features = [
-  "devenv",
-], solve-group = "devenv", no-default-feature = true }
 
 [tool.pixi.tasks]
 success = "echo Success"
@@ -118,7 +111,6 @@ update-from-template-repo = "./scripts/update_from_template.sh"
 #demos
 demo = "python3 bencher/example/example_image.py"
 
-
 [tool.pylint]
 extension-pkg-whitelist = ["numpy", "scipy"]
 jobs = 16                                    #detect number of cores

rockerc.yaml

@@ -0,0 +1,17 @@
+# This file describes the docker image and rocker extensions to load
+# Rockerc configuration: https://github.com/blooop/rockerc
+#
+# Key components:
+# - image: Specifies the base image to pass to rocker
+# - args: Lists additional features or tools to be added to the docker image
+
+image: ubuntu:22.04
+args:
+  - nvidia
+  - x11 
+  - user 
+  - pull 
+  - deps
+  - git 
+  - lazygit
+  - pixi

scripts/launch_vscode.sh

@@ -9,19 +9,6 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #gets the current
 #move to the project root folder
 cd "$SCRIPT_DIR"/..
 
-git submodule update --init --recursive
-
-CONTAINER_NAME=${PWD##*/}  
-# CONTAINER_NAME="${PWD##*/}_$(date +%Y-%m-%d_%H-%M-%S)"  
-
-echo "stopping existing container" "$CONTAINER_NAME" 
-# docker stop "$CONTAINER_NAME" || true 
-docker rename "$CONTAINER_NAME" "${CONTAINER_NAME}_$(date +%Y-%m-%d_%H-%M-%S)" || true 
-
-CONTAINER_HEX=$(printf $CONTAINER_NAME | xxd -p | tr '\n' ' ' | sed 's/\\s//g' | tr -d ' ');
-
-#!/bin/bash
-
 if ! dpkg -l | grep -q python3-venv; then
     echo "python3-venv is not installed. Installing..."
     sudo apt-get update
@@ -40,18 +27,14 @@ if [ ! -d "$VENV_DIR" ]; then
     echo "Activating the virtual environment..."
     source $VENV_DIR/bin/activate
     echo "Installing deps rocker..."
-    pip install deps-rocker
+    pip install deps-rocker pixi-rocker rockervsc
     echo "Virtual environment setup and deps rocker installation complete."
 else
     echo "Virtual environment already exists in $VENV_DIR."
     echo "Activating the existing virtual environment..."
     source $VENV_DIR/bin/activate
 fi
 
-# Run the rocker command with the specified parameters
-rocker --nvidia --x11 --user --pull --git --image-name "$CONTAINER_NAME" --name "$CONTAINER_NAME" --volume "${PWD}":/workspaces/"${CONTAINER_NAME}":Z --deps --oyr-run-arg " --detach" ubuntu:22.04 "$@" 
+rockervsc
 
 deactivate
-
-#this follows the same convention as if it were opened by a vscode devcontainer
-code --folder-uri vscode-remote://attached-container+"$CONTAINER_HEX"/workspaces/"${CONTAINER_NAME}"