From e0739c29aa6a93cc65d8c769c8c129280a710e52 Mon Sep 17 00:00:00 2001
From: Douglas Lowe <10961945+douglowe@users.noreply.github.com>
Date: Tue, 2 Jun 2026 17:08:51 +0000
Subject: [PATCH 1/4] x86 dev container for wrf-python

---
 .devcontainer/Dockerfile        | 19 +++++++++++++++++++
 .devcontainer/devcontainer.json | 24 ++++++++++++++++++++++++
 .devcontainer/noop.txt          |  3 +++
 3 files changed, 46 insertions(+)
 create mode 100644 .devcontainer/Dockerfile
 create mode 100644 .devcontainer/devcontainer.json
 create mode 100644 .devcontainer/noop.txt

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 0000000..bf3bb77
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,19 @@
+FROM --platform=linux/amd64 mcr.microsoft.com/devcontainers/anaconda:1.3.10-3
+
+# Copy environment.yml (if found) to a temp location so we update the environment. Also
+# copy "noop.txt" so the COPY instruction does not fail if no environment.yml exists.
+COPY environment.yml* .devcontainer/noop.txt /tmp/conda-tmp/
+RUN <<EOF_COMPILE
+rm /opt/conda/.condarc
+conda config --add channels conda-forge
+umask 0002
+/opt/conda/bin/conda env create --file /tmp/conda-tmp/environment.yml
+rm -rf /tmp/conda-tmp
+EOF_COMPILE
+
+USER vscode
+RUN <<EOF_USERSETUP
+conda config --add channels conda-forge
+conda config --remove channels defaults
+conda init bash
+EOF_USERSETUP
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000..70e91b2
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,24 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/anaconda
+{
+	"name": "Anaconda (Python 3)",
+	"build": { 
+		"context": "..",
+		"dockerfile": "Dockerfile"
+	}
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "python --version",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}
diff --git a/.devcontainer/noop.txt b/.devcontainer/noop.txt
new file mode 100644
index 0000000..dde8dc3
--- /dev/null
+++ b/.devcontainer/noop.txt
@@ -0,0 +1,3 @@
+This file copied into the container along with environment.yml* from the parent
+folder. This file is included to prevents the Dockerfile COPY instruction from 
+failing if no environment.yml is found.
\ No newline at end of file

From 6f380ce35dab0319b7f69eabf61e6b113ac4e97b Mon Sep 17 00:00:00 2001
From: Douglas Lowe <10961945+douglowe@users.noreply.github.com>
Date: Tue, 2 Jun 2026 18:10:03 +0100
Subject: [PATCH 2/4] ignore devcontainer lock file

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 8c00bc7..fd4a346 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@ tests
 !tests/*.py
 __pycache__/*
 RIP/*.sif
-
+.devcontainer/devcontainer-lock.json

From fa049aa23b0712cac2b8b64ac65e453078c97c64 Mon Sep 17 00:00:00 2001
From: Douglas Lowe <10961945+douglowe@users.noreply.github.com>
Date: Tue, 2 Jun 2026 21:41:02 +0100
Subject: [PATCH 3/4] build conda env in userspace of devcontainer

---
 .devcontainer/Dockerfile | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index bf3bb77..63c1432 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -2,18 +2,12 @@ FROM --platform=linux/amd64 mcr.microsoft.com/devcontainers/anaconda:1.3.10-3
 
 # Copy environment.yml (if found) to a temp location so we update the environment. Also
 # copy "noop.txt" so the COPY instruction does not fail if no environment.yml exists.
-COPY environment.yml* .devcontainer/noop.txt /tmp/conda-tmp/
-RUN <<EOF_COMPILE
-rm /opt/conda/.condarc
-conda config --add channels conda-forge
-umask 0002
-/opt/conda/bin/conda env create --file /tmp/conda-tmp/environment.yml
-rm -rf /tmp/conda-tmp
-EOF_COMPILE
-
 USER vscode
-RUN <<EOF_USERSETUP
+COPY environment.yml /home/vscode
+RUN <<EOF_USERSETUPINSTALL
 conda config --add channels conda-forge
 conda config --remove channels defaults
 conda init bash
-EOF_USERSETUP
+conda env create --file /home/vscode/environment.yml
+rm /home/vscode/environment.yml
+EOF_USERSETUPINSTALL

From 346247cf2f68b65c73bb5ba46a9811972c402a48 Mon Sep 17 00:00:00 2001
From: Douglas Lowe <10961945+douglowe@users.noreply.github.com>
Date: Tue, 2 Jun 2026 21:41:51 +0100
Subject: [PATCH 4/4] fix setuptools version to ensure pkg_resources is
 included

---
 environment.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 386e731..3485b8c 100644
--- a/environment.yml
+++ b/environment.yml
@@ -12,7 +12,8 @@ dependencies:
 #  - pynio==1.5     #Reccomended by wrf-python, not needed for Plotting a Two-dimensional Field script
 #  - pyngl==1.6     #Reccomended by wrf-python, not needed for Plotting a Two-dimensional Field script
 #  - basemap==1.3   #Reccomended by wrf-python, not needed for Plotting a Two-dimensional Field script
-  - wrf-python==1.3.4
+  - wrf-python==1.3.4.1
   - imageio==2.19.3
   - imageio-ffmpeg==0.4.7
   - metpy==1.5.1
+  - setuptools==79.0.1