From 9ecbd98212aa08abd898eaa1a4dbbc7ce4265d59 Mon Sep 17 00:00:00 2001
From: Henry Schreiner <henryschreineriii@gmail.com>
Date: Mon, 22 Jul 2024 10:42:19 -0400
Subject: [PATCH] chore: fix up for missing deps, faster setup

Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
---
 .devcontainer/devcontainer.json | 7 ++++---
 environment.yml                 | 5 +++--
 requirements.txt                | 2 ++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 8aa0412..d07d1f3 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -4,11 +4,12 @@
     "cpus": 2
   },
   "waitFor": "onCreateCommand",
-  "updateContentCommand": {
-    "Installing apt packages": "sudo apt-get -yqq update && sudo apt-get install -yqq python3-pip python3-xrootd"
+  "onCreateCommand": {
+    "Installing uv": "curl -LsSf https://astral.sh/uv/install.sh | sh",
+    "Install Python": "sudo apt-get -yqq update && sudo apt-get install -yqq python3-dev python3-xrootd"
   },
   "postCreateCommand": {
-    "Installing python packages": "python3 -m pip install -r requirements.txt"
+    "Installing Python packages": "sudo env PATH=$PATH uv pip install --system --break-system-packages -r requirements.txt pip 2>&1"
   },
   "customizations": {
     "codespaces": {
diff --git a/environment.yml b/environment.yml
index a037402..afb7ecd 100644
--- a/environment.yml
+++ b/environment.yml
@@ -2,6 +2,9 @@ name: software-carpentries-scikit-hep-tutorial
 channels:
   - conda-forge
 dependencies:
+  - aiohttp
+  - fastjet
+  - fsspec-xrootd
   - jupyterlab
   - lz4
   - matplotlib
@@ -17,5 +20,3 @@ dependencies:
   - xrootd
   - zfit
   - zstandard
-  - pip:
-     - fastjet
diff --git a/requirements.txt b/requirements.txt
index 033d6f9..7a0c911 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,6 @@
+aiohttp
 fastjet
+fsspec-xrootd
 lz4
 matplotlib
 nlopt