From 850df733b7ef2103226b29e02710c8a05b3e8c3d Mon Sep 17 00:00:00 2001
From: Coulton Theuer <60138157+theuerc@users.noreply.github.com>
Date: Thu, 6 Jul 2023 21:27:53 -0500
Subject: [PATCH 01/21] Update Dockerfile with new Conda version

---
 gitpod/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitpod/Dockerfile b/gitpod/Dockerfile
index a706824912174..dd4ddf64d16b4 100644
--- a/gitpod/Dockerfile
+++ b/gitpod/Dockerfile
@@ -27,7 +27,7 @@
 # OS/ARCH: linux/amd64
 FROM gitpod/workspace-base:latest
 
-ARG MAMBAFORGE_VERSION="22.9.0-1"
+ARG MAMBAFORGE_VERSION="23.1.0-3"
 ARG CONDA_ENV=pandas-dev
 ARG PANDAS_HOME="/home/pandas"
 

From b9723f5307954b8c33c8a63a085fde35b4c83d72 Mon Sep 17 00:00:00 2001
From: Coulton Theuer <60138157+theuerc@users.noreply.github.com>
Date: Thu, 6 Jul 2023 21:29:46 -0500
Subject: [PATCH 02/21] Update .gitpod.yml with meson build instructions

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

diff --git a/.gitpod.yml b/.gitpod.yml
index 0a5b5648994ae..c16f68385a706 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -13,7 +13,7 @@ tasks:
       conda activate pandas-dev
       git pull --unshallow  # need to force this else the prebuild fails
       git fetch --tags
-      python setup.py build_ext --inplace -j 4
+      python -m pip install -ve . --no-build-isolation --config-settings editable-verbose=true
       echo "🛠 Completed rebuilding Pandas!! 🛠 "
       pre-commit install
       echo "✨ Pre-build complete! You can close this terminal ✨ "

From d59ce18ca6ddb8f78b5d3f3c98c504723afd4ddd Mon Sep 17 00:00:00 2001
From: Coulton Theuer <60138157+theuerc@users.noreply.github.com>
Date: Thu, 6 Jul 2023 21:30:53 -0500
Subject: [PATCH 03/21] Update .gitpod.yml with new Dockerfile

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

diff --git a/.gitpod.yml b/.gitpod.yml
index c16f68385a706..e351e8e4d038a 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -4,7 +4,8 @@
 # -------------------------------------------------------------------------
 
 # assuming we use dockerhub: name of the docker user, docker image, tag, e.g. https://hub.docker.com/r/pandas/pandas-gitpod/tags
-image: pandas/pandas-gitpod:latest
+image: 
+  file: gitpod/Dockerfile
 tasks:
   - name: Prepare development environment
     init: |

From 91b1af4a40e18b3d1c7b967707fc07cd4cacf187 Mon Sep 17 00:00:00 2001
From: Coulton Theuer <60138157+theuerc@users.noreply.github.com>
Date: Thu, 6 Jul 2023 22:22:10 -0500
Subject: [PATCH 04/21] Remove lines that cause errors in .gitpod.yml

---
 .gitpod.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitpod.yml b/.gitpod.yml
index e351e8e4d038a..81f2e7193c480 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -12,12 +12,8 @@ tasks:
       mkdir -p .vscode
       cp gitpod/settings.json .vscode/settings.json
       conda activate pandas-dev
-      git pull --unshallow  # need to force this else the prebuild fails
       git fetch --tags
       python -m pip install -ve . --no-build-isolation --config-settings editable-verbose=true
-      echo "🛠 Completed rebuilding Pandas!! 🛠 "
-      pre-commit install
-      echo "✨ Pre-build complete! You can close this terminal ✨ "
 
 # --------------------------------------------------------
 # exposing ports for liveserve

From ecc5361dc862f0c8d2697fd16af5de781bfd55d1 Mon Sep 17 00:00:00 2001
From: Coulton Theuer <theuerc@umich.edu>
Date: Fri, 7 Jul 2023 03:49:17 +0000
Subject: [PATCH 05/21] add precommit hook back

---
 .gitpod.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitpod.yml b/.gitpod.yml
index 81f2e7193c480..7b54f45b5d5bd 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -14,6 +14,7 @@ tasks:
       conda activate pandas-dev
       git fetch --tags
       python -m pip install -ve . --no-build-isolation --config-settings editable-verbose=true
+      pre-commit install
 
 # --------------------------------------------------------
 # exposing ports for liveserve

From 295c663f0be42eb9a52eba39f5bc3c8eb7022713 Mon Sep 17 00:00:00 2001
From: Coulton Theuer <60138157+theuerc@users.noreply.github.com>
Date: Fri, 7 Jul 2023 14:25:35 -0500
Subject: [PATCH 06/21] Update gitpod.yml to use docker installation flow

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

diff --git a/.gitpod.yml b/.gitpod.yml
index 7b54f45b5d5bd..821ef4eefb5e0 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -5,7 +5,7 @@
 
 # assuming we use dockerhub: name of the docker user, docker image, tag, e.g. https://hub.docker.com/r/pandas/pandas-gitpod/tags
 image: 
-  file: gitpod/Dockerfile
+  file: Dockerfile
 tasks:
   - name: Prepare development environment
     init: |

From c7e65e3cb47b42a9d01380d0047c6bc6a1502f31 Mon Sep 17 00:00:00 2001
From: Coulton Theuer <theuerc@umich.edu>
Date: Fri, 7 Jul 2023 19:32:36 +0000
Subject: [PATCH 07/21] Remove outdated plugin configs

---
 gitpod/settings.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gitpod/settings.json b/gitpod/settings.json
index 6251c55878541..1e76db6b1ecea 100644
--- a/gitpod/settings.json
+++ b/gitpod/settings.json
@@ -1,6 +1,5 @@
 {
-    "restructuredtext.updateOnTextChanged": "true",
-    "restructuredtext.updateDelay": 300,
+    "esbonio.server.pythonPath": "/usr/local/bin/python"
     "restructuredtext.linter.disabledLinters": ["doc8","rst-lint", "rstcheck"],
-    "python.defaultInterpreterPath": "/home/gitpod/mambaforge3/envs/pandas-dev/bin/python"
+    "python.defaultInterpreterPath": "/usr/local/bin/python"
 }

From 0535c97695bce4a8d9f71ae0af5ed89db67f95f7 Mon Sep 17 00:00:00 2001
From: Coulton Theuer <theuerc@umich.edu>
Date: Fri, 7 Jul 2023 21:00:21 +0000
Subject: [PATCH 08/21] remove trailing whitespace

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

diff --git a/.gitpod.yml b/.gitpod.yml
index 821ef4eefb5e0..e5994dd5584fe 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -4,7 +4,7 @@
 # -------------------------------------------------------------------------
 
 # assuming we use dockerhub: name of the docker user, docker image, tag, e.g. https://hub.docker.com/r/pandas/pandas-gitpod/tags
-image: 
+image:
   file: Dockerfile
 tasks:
   - name: Prepare development environment

From 12571cc33362b98570b0b5ea64c546e7f98d47d6 Mon Sep 17 00:00:00 2001
From: Coulton Theuer <60138157+theuerc@users.noreply.github.com>
Date: Sat, 8 Jul 2023 10:12:49 -0500
Subject: [PATCH 09/21] Update .gitpod.yml to remove conda activation (using
 docker flow)

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

diff --git a/.gitpod.yml b/.gitpod.yml
index e5994dd5584fe..59b0d9e923d24 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -11,10 +11,10 @@ tasks:
     init: |
       mkdir -p .vscode
       cp gitpod/settings.json .vscode/settings.json
-      conda activate pandas-dev
       git fetch --tags
       python -m pip install -ve . --no-build-isolation --config-settings editable-verbose=true
       pre-commit install
+      echo "✨ Pre-build complete! You can close this terminal ✨ "
 
 # --------------------------------------------------------
 # exposing ports for liveserve

From a76e3be5a967d9806ca09aa8054b1088523d7a4c Mon Sep 17 00:00:00 2001
From: Coulton Theuer <60138157+theuerc@users.noreply.github.com>
Date: Sat, 8 Jul 2023 11:09:23 -0500
Subject: [PATCH 10/21] fix esbonio language server not installed error

---
 .gitpod.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitpod.yml b/.gitpod.yml
index 59b0d9e923d24..e1e22ddec7826 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -29,6 +29,7 @@ vscode:
     - ms-python.python
     - yzhang.markdown-all-in-one
     - eamodio.gitlens
+    - swyddfa.esbonio
     - lextudio.restructuredtext
     - ritwickdey.liveserver
     # add or remove what you think is generally useful to most contributors

From 5a36bdb5b238e0b83286afa3c28bcc2f56a68dec Mon Sep 17 00:00:00 2001
From: Coulton Theuer <60138157+theuerc@users.noreply.github.com>
Date: Sat, 8 Jul 2023 11:12:05 -0500
Subject: [PATCH 11/21] Add pip/meson build to command to fix issues with
 gitpod prebuild

---
 .gitpod.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitpod.yml b/.gitpod.yml
index e1e22ddec7826..a71dc6c57c284 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -15,6 +15,7 @@ tasks:
       python -m pip install -ve . --no-build-isolation --config-settings editable-verbose=true
       pre-commit install
       echo "✨ Pre-build complete! You can close this terminal ✨ "
+    command: python -m pip install -ve . --no-build-isolation --config-settings editable-verbose=true
 
 # --------------------------------------------------------
 # exposing ports for liveserve

From cfd11158f4d7ccc9295291a81b59d9636740c967 Mon Sep 17 00:00:00 2001
From: Coulton Theuer <theuerc@umich.edu>
Date: Sat, 8 Jul 2023 16:26:19 +0000
Subject: [PATCH 12/21] remove esbonio

---
 .gitpod.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitpod.yml b/.gitpod.yml
index a71dc6c57c284..2b8f1bb271b83 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -30,7 +30,6 @@ vscode:
     - ms-python.python
     - yzhang.markdown-all-in-one
     - eamodio.gitlens
-    - swyddfa.esbonio
     - lextudio.restructuredtext
     - ritwickdey.liveserver
     # add or remove what you think is generally useful to most contributors

From 88404342083906df4391e0697e84597aa4d4fa6e Mon Sep 17 00:00:00 2001
From: Coulton Theuer <theuerc@umich.edu>
Date: Sat, 8 Jul 2023 16:35:28 +0000
Subject: [PATCH 13/21] enable prebuilds to quickly access pull requests

---
 .gitpod.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitpod.yml b/.gitpod.yml
index 2b8f1bb271b83..1dd9418bac893 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -3,7 +3,8 @@
 # https://www.gitpod.io/docs/config-start-tasks/#configuring-the-terminal
 # -------------------------------------------------------------------------
 
-# assuming we use dockerhub: name of the docker user, docker image, tag, e.g. https://hub.docker.com/r/pandas/pandas-gitpod/tags
+# images for gitpod pandas are in https://hub.docker.com/r/pandas/pandas-gitpod/tags
+# we're using the Dockerfile in the base of the repo
 image:
   file: Dockerfile
 tasks:
@@ -37,17 +38,18 @@ vscode:
 
 # --------------------------------------------------------
 # using prebuilds for the container
-# With this configuration the prebuild will happen on push to main
+# With this configuration the prebuild will happen on push to main, branches,
+# pull requests, and pull requests from forks
 github:
   prebuilds:
     # enable for main/default branch
     main: true
     # enable for other branches (defaults to false)
-    branches: false
+    branches: true
     # enable for pull requests coming from this repo (defaults to true)
-    pullRequests: false
+    pullRequests: true
     # enable for pull requests coming from forks (defaults to false)
-    pullRequestsFromForks: false
+    pullRequestsFromForks: true
     # add a check to pull requests (defaults to true)
     addCheck: false
     # add a "Review in Gitpod" button as a comment to pull requests (defaults to false)

From 99bdebc00fda3a6bf7b9e6d2941a6d989a42f8cd Mon Sep 17 00:00:00 2001
From: Coulton Theuer <theuerc@umich.edu>
Date: Sat, 8 Jul 2023 16:55:13 +0000
Subject: [PATCH 14/21] add statement to close terminal

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

diff --git a/.gitpod.yml b/.gitpod.yml
index 1dd9418bac893..45cca9dfde1d5 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -15,8 +15,9 @@ tasks:
       git fetch --tags
       python -m pip install -ve . --no-build-isolation --config-settings editable-verbose=true
       pre-commit install
+    command: |
+      python -m pip install -ve . --no-build-isolation --config-settings editable-verbose=true
       echo "✨ Pre-build complete! You can close this terminal ✨ "
-    command: python -m pip install -ve . --no-build-isolation --config-settings editable-verbose=true
 
 # --------------------------------------------------------
 # exposing ports for liveserve

From 4d85f4ab27a3bf8fcfdc4eee395fae8d83dc758c Mon Sep 17 00:00:00 2001
From: Coulton Theuer <60138157+theuerc@users.noreply.github.com>
Date: Sat, 8 Jul 2023 12:14:46 -0500
Subject: [PATCH 15/21] Remove extra pip/meson command

---
 .gitpod.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitpod.yml b/.gitpod.yml
index 45cca9dfde1d5..c7a7f7bc4822b 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -15,8 +15,6 @@ tasks:
       git fetch --tags
       python -m pip install -ve . --no-build-isolation --config-settings editable-verbose=true
       pre-commit install
-    command: |
-      python -m pip install -ve . --no-build-isolation --config-settings editable-verbose=true
       echo "✨ Pre-build complete! You can close this terminal ✨ "
 
 # --------------------------------------------------------

From 04d8ee27824a1b556dfa50aedba4aa3958a5c4b8 Mon Sep 17 00:00:00 2001
From: Coulton Theuer <theuerc@umich.edu>
Date: Sat, 8 Jul 2023 17:34:12 +0000
Subject: [PATCH 16/21] add comma

---
 gitpod/settings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitpod/settings.json b/gitpod/settings.json
index 1e76db6b1ecea..2c2c3b551e1d1 100644
--- a/gitpod/settings.json
+++ b/gitpod/settings.json
@@ -1,5 +1,5 @@
 {
-    "esbonio.server.pythonPath": "/usr/local/bin/python"
+    "esbonio.server.pythonPath": "/usr/local/bin/python",
     "restructuredtext.linter.disabledLinters": ["doc8","rst-lint", "rstcheck"],
     "python.defaultInterpreterPath": "/usr/local/bin/python"
 }

From 5aa989d931dcf5a677cc348c98507bb6f0b58ee0 Mon Sep 17 00:00:00 2001
From: Coulton Theuer <theuerc@umich.edu>
Date: Sat, 8 Jul 2023 17:42:00 +0000
Subject: [PATCH 17/21] add back duplicate command to fix prebuild

---
 .gitpod.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitpod.yml b/.gitpod.yml
index c7a7f7bc4822b..45cca9dfde1d5 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -15,6 +15,8 @@ tasks:
       git fetch --tags
       python -m pip install -ve . --no-build-isolation --config-settings editable-verbose=true
       pre-commit install
+    command: |
+      python -m pip install -ve . --no-build-isolation --config-settings editable-verbose=true
       echo "✨ Pre-build complete! You can close this terminal ✨ "
 
 # --------------------------------------------------------

From 8837583b338416a7e676822f73379401c29a5cab Mon Sep 17 00:00:00 2001
From: Coulton Theuer <theuerc@umich.edu>
Date: Sat, 8 Jul 2023 18:54:16 +0000
Subject: [PATCH 18/21] remove prebuilds for branches/forks

---
 .gitpod.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitpod.yml b/.gitpod.yml
index 45cca9dfde1d5..3e8af9c088c1a 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -46,11 +46,11 @@ github:
     # enable for main/default branch
     main: true
     # enable for other branches (defaults to false)
-    branches: true
+    branches: false
     # enable for pull requests coming from this repo (defaults to true)
     pullRequests: true
     # enable for pull requests coming from forks (defaults to false)
-    pullRequestsFromForks: true
+    pullRequestsFromForks: false
     # add a check to pull requests (defaults to true)
     addCheck: false
     # add a "Review in Gitpod" button as a comment to pull requests (defaults to false)

From 85c7fb1a896038ba8215f7d6df3d9305c3a54810 Mon Sep 17 00:00:00 2001
From: Coulton Theuer <60138157+theuerc@users.noreply.github.com>
Date: Sat, 8 Jul 2023 16:38:49 -0500
Subject: [PATCH 19/21] remove pull request prebuild option

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

diff --git a/.gitpod.yml b/.gitpod.yml
index 3e8af9c088c1a..35dae9c98a4bd 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -48,7 +48,7 @@ github:
     # enable for other branches (defaults to false)
     branches: false
     # enable for pull requests coming from this repo (defaults to true)
-    pullRequests: true
+    pullRequests: false
     # enable for pull requests coming from forks (defaults to false)
     pullRequestsFromForks: false
     # add a check to pull requests (defaults to true)

From 7436d84363cd57554f736ac287e3deb5fcf9e0db Mon Sep 17 00:00:00 2001
From: Coulton Theuer <60138157+theuerc@users.noreply.github.com>
Date: Sat, 8 Jul 2023 16:45:53 -0500
Subject: [PATCH 20/21] Update gitpod comments

---
 .gitpod.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitpod.yml b/.gitpod.yml
index 35dae9c98a4bd..24d937c1ea1a4 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -39,8 +39,7 @@ vscode:
 
 # --------------------------------------------------------
 # using prebuilds for the container
-# With this configuration the prebuild will happen on push to main, branches,
-# pull requests, and pull requests from forks
+# With this configuration the prebuild will happen on push to main
 github:
   prebuilds:
     # enable for main/default branch

From f06ffc936728bfcd9d029106b673df221deaf474 Mon Sep 17 00:00:00 2001
From: Coulton Theuer <theuerc@umich.edu>
Date: Sun, 9 Jul 2023 18:01:01 +0000
Subject: [PATCH 21/21] update letter

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

diff --git a/.gitpod.yml b/.gitpod.yml
index 24d937c1ea1a4..9222639136a17 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -38,7 +38,7 @@ vscode:
     # avoid adding too many. they each open a pop-up window
 
 # --------------------------------------------------------
-# using prebuilds for the container
+# Using prebuilds for the container
 # With this configuration the prebuild will happen on push to main
 github:
   prebuilds: