From f7f355628e644b68fd33b96698058f6a6c7233b6 Mon Sep 17 00:00:00 2001
From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com>
Date: Wed, 26 Jan 2022 09:43:50 -0800
Subject: [PATCH 01/15] Add testing support for python 3.10

---
 .github/workflows/test.yml                    |  2 +-
 .../environment-3.10-jdk11-dev.yaml           | 42 +++++++++++++++++++
 .../environment-3.10-jdk8-dev.yaml            | 42 +++++++++++++++++++
 3 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 continuous_integration/environment-3.10-jdk11-dev.yaml
 create mode 100644 continuous_integration/environment-3.10-jdk8-dev.yaml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6f83c0c0a..0ed381551 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -76,7 +76,7 @@ jobs:
       matrix:
         java: [8, 11]
         os: [ubuntu-latest, windows-latest]
-        python: [3.7, 3.8, 3.9]
+        python: [3.7, 3.8, 3.9, 3.10]
     steps:
       - uses: actions/checkout@v2
       - name: Cache local Maven repository
diff --git a/continuous_integration/environment-3.10-jdk11-dev.yaml b/continuous_integration/environment-3.10-jdk11-dev.yaml
new file mode 100644
index 000000000..5ddc155a5
--- /dev/null
+++ b/continuous_integration/environment-3.10-jdk11-dev.yaml
@@ -0,0 +1,42 @@
+name: dask-sql
+channels:
+- conda-forge
+- defaults
+dependencies:
+- adagio>=0.2.3
+- antlr4-python3-runtime>=4.9.2
+- black=19.10b0
+- ciso8601>=2.2.0
+- dask-ml>=2022.1.22
+- dask>=2021.11.1
+- fastapi>=0.61.1
+- fs>=2.4.11
+- intake>=0.6.0
+- isort=5.7.0
+- jpype1>=1.0.2
+- lightgbm>=3.2.1
+- maven>=3.6.0
+- mlflow>=1.19.0
+- mock>=4.0.3
+- nest-asyncio>=1.4.3
+- openjdk=11
+- pandas>=1.0.0  # below 1.0, there were no nullable ext. types
+- pip=20.2.4
+- pre-commit>=2.11.1
+- prompt_toolkit>=3.0.8
+- psycopg2>=2.9.1
+- pyarrow>=0.15.1
+- pygments>=2.7.1
+- pyhive>=0.6.4
+- pytest-cov>=2.10.1
+- pytest-xdist
+- pytest>=6.0.1
+- python=3.10
+- scikit-learn>=0.24.2
+- sphinx>=3.2.1
+- tpot>=0.11.7
+- triad>=0.5.4
+- tzlocal>=2.1
+- uvicorn>=0.11.3
+- pip:
+  - fugue[sql]>=0.5.3
diff --git a/continuous_integration/environment-3.10-jdk8-dev.yaml b/continuous_integration/environment-3.10-jdk8-dev.yaml
new file mode 100644
index 000000000..b74335c6e
--- /dev/null
+++ b/continuous_integration/environment-3.10-jdk8-dev.yaml
@@ -0,0 +1,42 @@
+name: dask-sql
+channels:
+- conda-forge
+- defaults
+dependencies:
+- adagio>=0.2.3
+- antlr4-python3-runtime>=4.9.2
+- black=19.10b0
+- ciso8601>=2.2.0
+- dask-ml>=2022.1.22
+- dask>=2021.11.1
+- fastapi>=0.61.1
+- fs>=2.4.11
+- intake>=0.6.0
+- isort=5.7.0
+- jpype1>=1.0.2
+- lightgbm>=3.2.1
+- maven>=3.6.0
+- mlflow>=1.19.0
+- mock>=4.0.3
+- nest-asyncio>=1.4.3
+- openjdk=8
+- pandas>=1.0.0  # below 1.0, there were no nullable ext. types
+- pip=20.2.4
+- pre-commit>=2.11.1
+- prompt_toolkit>=3.0.8
+- psycopg2>=2.9.1
+- pyarrow>=0.15.1
+- pygments>=2.7.1
+- pyhive>=0.6.4
+- pytest-cov>=2.10.1
+- pytest-xdist
+- pytest>=6.0.1
+- python=3.10
+- scikit-learn>=0.24.2
+- sphinx>=3.2.1
+- tpot>=0.11.7
+- triad>=0.5.4
+- tzlocal>=2.1
+- uvicorn>=0.11.3
+- pip:
+  - fugue[sql]>=0.5.3

From d503e9352d8eabca1a7d7f44c5fff501c14d75cf Mon Sep 17 00:00:00 2001
From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com>
Date: Wed, 26 Jan 2022 10:01:56 -0800
Subject: [PATCH 02/15] Use quotes for python versions in workflow

---
 .github/workflows/conda.yml         | 2 +-
 .github/workflows/release.yml       | 2 +-
 .github/workflows/test-upstream.yml | 4 ++--
 .github/workflows/test.yml          | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
index bdb9337f9..d5cd229dd 100644
--- a/.github/workflows/conda.yml
+++ b/.github/workflows/conda.yml
@@ -29,7 +29,7 @@ jobs:
         with:
           miniforge-variant: Mambaforge
           use-mamba: true
-          python-version: 3.8
+          python-version: "3.8"
       - name: Install dependencies
         run: |
           mamba install boa conda-verify
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3ba6d13a2..ce19c08b3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,7 +26,7 @@ jobs:
         with:
           miniforge-variant: Mambaforge
           use-mamba: true
-          python-version: 3.8
+          python-version: "3.8"
           activate-environment: dask-sql
           environment-file: continuous_integration/environment-3.8-jdk11-dev.yaml
       - name: Install dependencies
diff --git a/.github/workflows/test-upstream.yml b/.github/workflows/test-upstream.yml
index 3c5ec5405..1b6f9aa9e 100644
--- a/.github/workflows/test-upstream.yml
+++ b/.github/workflows/test-upstream.yml
@@ -26,7 +26,7 @@ jobs:
         with:
           miniforge-variant: Mambaforge
           use-mamba: true
-          python-version: 3.8
+          python-version: "3.8"
           activate-environment: dask-sql
           environment-file: continuous_integration/environment-3.8-jdk11-dev.yaml
       - name: Install dependencies and build the jar
@@ -52,7 +52,7 @@ jobs:
       matrix:
         java: [8, 11]
         os: [ubuntu-latest, windows-latest]
-        python: [3.7, 3.8, 3.9]
+        python: ["3.7", "3.8", "3.9", "3.10"]
     steps:
       - uses: actions/checkout@v2
         with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0ed381551..21b9a55c7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -53,7 +53,7 @@ jobs:
         with:
           miniforge-variant: Mambaforge
           use-mamba: true
-          python-version: 3.8
+          python-version: "3.8"
           activate-environment: dask-sql
           environment-file: continuous_integration/environment-3.8-jdk11-dev.yaml
       - name: Build the jar
@@ -76,7 +76,7 @@ jobs:
       matrix:
         java: [8, 11]
         os: [ubuntu-latest, windows-latest]
-        python: [3.7, 3.8, 3.9, 3.10]
+        python: ["3.7", "3.8", "3.9", "3.10"]
     steps:
       - uses: actions/checkout@v2
       - name: Cache local Maven repository
@@ -195,7 +195,7 @@ jobs:
       - name: Set up Python
         uses: conda-incubator/setup-miniconda@v2
         with:
-          python-version: 3.8
+          python-version: "3.8"
           mamba-version: "*"
           channels: conda-forge,defaults
           channel-priority: true

From e43cef0eedbb673ee19cc1faf0edb01da633420f Mon Sep 17 00:00:00 2001
From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com>
Date: Wed, 26 Jan 2022 10:39:37 -0800
Subject: [PATCH 03/15] Constrain numpy version to resolve Numba conflicts

---
 continuous_integration/environment-3.10-jdk11-dev.yaml | 1 +
 continuous_integration/environment-3.10-jdk8-dev.yaml  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/continuous_integration/environment-3.10-jdk11-dev.yaml b/continuous_integration/environment-3.10-jdk11-dev.yaml
index 5ddc155a5..ffb60a5ee 100644
--- a/continuous_integration/environment-3.10-jdk11-dev.yaml
+++ b/continuous_integration/environment-3.10-jdk11-dev.yaml
@@ -19,6 +19,7 @@ dependencies:
 - mlflow>=1.19.0
 - mock>=4.0.3
 - nest-asyncio>=1.4.3
+- numpy<=1.21
 - openjdk=11
 - pandas>=1.0.0  # below 1.0, there were no nullable ext. types
 - pip=20.2.4
diff --git a/continuous_integration/environment-3.10-jdk8-dev.yaml b/continuous_integration/environment-3.10-jdk8-dev.yaml
index b74335c6e..b0514e56b 100644
--- a/continuous_integration/environment-3.10-jdk8-dev.yaml
+++ b/continuous_integration/environment-3.10-jdk8-dev.yaml
@@ -19,6 +19,7 @@ dependencies:
 - mlflow>=1.19.0
 - mock>=4.0.3
 - nest-asyncio>=1.4.3
+- numpy<=1.21
 - openjdk=8
 - pandas>=1.0.0  # below 1.0, there were no nullable ext. types
 - pip=20.2.4

From f9071c9ab0f8835f4dc1153262c96206cde1dcaa Mon Sep 17 00:00:00 2001
From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com>
Date: Wed, 26 Jan 2022 11:01:27 -0800
Subject: [PATCH 04/15] numpy needs to be pinned for some reason

---
 continuous_integration/environment-3.10-jdk11-dev.yaml | 2 +-
 continuous_integration/environment-3.10-jdk8-dev.yaml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/continuous_integration/environment-3.10-jdk11-dev.yaml b/continuous_integration/environment-3.10-jdk11-dev.yaml
index ffb60a5ee..3c2facb11 100644
--- a/continuous_integration/environment-3.10-jdk11-dev.yaml
+++ b/continuous_integration/environment-3.10-jdk11-dev.yaml
@@ -19,7 +19,7 @@ dependencies:
 - mlflow>=1.19.0
 - mock>=4.0.3
 - nest-asyncio>=1.4.3
-- numpy<=1.21
+- numpy=1.21
 - openjdk=11
 - pandas>=1.0.0  # below 1.0, there were no nullable ext. types
 - pip=20.2.4
diff --git a/continuous_integration/environment-3.10-jdk8-dev.yaml b/continuous_integration/environment-3.10-jdk8-dev.yaml
index b0514e56b..0d66b4bbf 100644
--- a/continuous_integration/environment-3.10-jdk8-dev.yaml
+++ b/continuous_integration/environment-3.10-jdk8-dev.yaml
@@ -19,7 +19,7 @@ dependencies:
 - mlflow>=1.19.0
 - mock>=4.0.3
 - nest-asyncio>=1.4.3
-- numpy<=1.21
+- numpy=1.21
 - openjdk=8
 - pandas>=1.0.0  # below 1.0, there were no nullable ext. types
 - pip=20.2.4

From 86f2070ad6c5cc2ce5642835e25c09b825df4a25 Mon Sep 17 00:00:00 2001
From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com>
Date: Wed, 26 Jan 2022 11:37:15 -0800
Subject: [PATCH 05/15] Pick the correct numpy constraint

---
 continuous_integration/environment-3.10-jdk11-dev.yaml | 2 +-
 continuous_integration/environment-3.10-jdk8-dev.yaml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/continuous_integration/environment-3.10-jdk11-dev.yaml b/continuous_integration/environment-3.10-jdk11-dev.yaml
index 3c2facb11..ce9d69f85 100644
--- a/continuous_integration/environment-3.10-jdk11-dev.yaml
+++ b/continuous_integration/environment-3.10-jdk11-dev.yaml
@@ -19,7 +19,7 @@ dependencies:
 - mlflow>=1.19.0
 - mock>=4.0.3
 - nest-asyncio>=1.4.3
-- numpy=1.21
+- numpy<1.22  # numba only supports up to numpy 1.21
 - openjdk=11
 - pandas>=1.0.0  # below 1.0, there were no nullable ext. types
 - pip=20.2.4
diff --git a/continuous_integration/environment-3.10-jdk8-dev.yaml b/continuous_integration/environment-3.10-jdk8-dev.yaml
index 0d66b4bbf..d690c893e 100644
--- a/continuous_integration/environment-3.10-jdk8-dev.yaml
+++ b/continuous_integration/environment-3.10-jdk8-dev.yaml
@@ -19,7 +19,7 @@ dependencies:
 - mlflow>=1.19.0
 - mock>=4.0.3
 - nest-asyncio>=1.4.3
-- numpy=1.21
+- numpy<1.22  # numba only supports up to numpy 1.21
 - openjdk=8
 - pandas>=1.0.0  # below 1.0, there were no nullable ext. types
 - pip=20.2.4

From eddbc4831f0c71cf950f6d937a18725ae29586e1 Mon Sep 17 00:00:00 2001
From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com>
Date: Wed, 26 Jan 2022 15:31:07 -0800
Subject: [PATCH 06/15] Remove defaults channel, numpy constraint

---
 continuous_integration/environment-3.10-jdk11-dev.yaml | 2 --
 continuous_integration/environment-3.10-jdk8-dev.yaml  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/continuous_integration/environment-3.10-jdk11-dev.yaml b/continuous_integration/environment-3.10-jdk11-dev.yaml
index ce9d69f85..413a8beb4 100644
--- a/continuous_integration/environment-3.10-jdk11-dev.yaml
+++ b/continuous_integration/environment-3.10-jdk11-dev.yaml
@@ -1,7 +1,6 @@
 name: dask-sql
 channels:
 - conda-forge
-- defaults
 dependencies:
 - adagio>=0.2.3
 - antlr4-python3-runtime>=4.9.2
@@ -19,7 +18,6 @@ dependencies:
 - mlflow>=1.19.0
 - mock>=4.0.3
 - nest-asyncio>=1.4.3
-- numpy<1.22  # numba only supports up to numpy 1.21
 - openjdk=11
 - pandas>=1.0.0  # below 1.0, there were no nullable ext. types
 - pip=20.2.4
diff --git a/continuous_integration/environment-3.10-jdk8-dev.yaml b/continuous_integration/environment-3.10-jdk8-dev.yaml
index d690c893e..34db50481 100644
--- a/continuous_integration/environment-3.10-jdk8-dev.yaml
+++ b/continuous_integration/environment-3.10-jdk8-dev.yaml
@@ -1,7 +1,6 @@
 name: dask-sql
 channels:
 - conda-forge
-- defaults
 dependencies:
 - adagio>=0.2.3
 - antlr4-python3-runtime>=4.9.2
@@ -19,7 +18,6 @@ dependencies:
 - mlflow>=1.19.0
 - mock>=4.0.3
 - nest-asyncio>=1.4.3
-- numpy<1.22  # numba only supports up to numpy 1.21
 - openjdk=8
 - pandas>=1.0.0  # below 1.0, there were no nullable ext. types
 - pip=20.2.4

From a38708c2ac5f67ad6cf6a2670e08e4361fae6264 Mon Sep 17 00:00:00 2001
From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com>
Date: Mon, 31 Jan 2022 12:25:22 -0500
Subject: [PATCH 07/15] Set channel_priority strict to ignore defaults

---
 .github/workflows/test-upstream.yml                   | 4 +++-
 .github/workflows/test.yml                            | 6 ++++--
 continuous_integration/recipe/conda_build_config.yaml | 6 +++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test-upstream.yml b/.github/workflows/test-upstream.yml
index 1b6f9aa9e..41254887c 100644
--- a/.github/workflows/test-upstream.yml
+++ b/.github/workflows/test-upstream.yml
@@ -26,7 +26,8 @@ jobs:
         with:
           miniforge-variant: Mambaforge
           use-mamba: true
-          python-version: "3.8"
+          python-version: "3.9"
+          channel-priority: strict
           activate-environment: dask-sql
           environment-file: continuous_integration/environment-3.8-jdk11-dev.yaml
       - name: Install dependencies and build the jar
@@ -68,6 +69,7 @@ jobs:
           miniforge-variant: Mambaforge
           use-mamba: true
           python-version: ${{ matrix.python }}
+          channel-priority: strict
           activate-environment: dask-sql
           environment-file: ${{ env.CONDA_FILE }}
       - name: Download the pre-build jar
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 21b9a55c7..2c956542c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -53,7 +53,8 @@ jobs:
         with:
           miniforge-variant: Mambaforge
           use-mamba: true
-          python-version: "3.8"
+          python-version: "3.9"
+          channel-priority: strict
           activate-environment: dask-sql
           environment-file: continuous_integration/environment-3.8-jdk11-dev.yaml
       - name: Build the jar
@@ -90,6 +91,7 @@ jobs:
           miniforge-variant: Mambaforge
           use-mamba: true
           python-version: ${{ matrix.python }}
+          channel-priority: strict
           activate-environment: dask-sql
           environment-file: ${{ env.CONDA_FILE }}
       - name: Download the pre-build jar
@@ -198,7 +200,7 @@ jobs:
           python-version: "3.8"
           mamba-version: "*"
           channels: conda-forge,defaults
-          channel-priority: true
+          channel-priority: strict
       - name: Download the pre-build jar
         uses: actions/download-artifact@v1
         with:
diff --git a/continuous_integration/recipe/conda_build_config.yaml b/continuous_integration/recipe/conda_build_config.yaml
index 378349abc..b20471798 100644
--- a/continuous_integration/recipe/conda_build_config.yaml
+++ b/continuous_integration/recipe/conda_build_config.yaml
@@ -1,4 +1,4 @@
 python:
-    - 3.7
-    - 3.8
-    - 3.9
+    - "3.8"
+    - "3.9"
+    - "3.10"

From b8fd3f8a49b7401d88a2ff043d5e56f0e3aaf3c0 Mon Sep 17 00:00:00 2001
From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com>
Date: Mon, 31 Jan 2022 12:26:41 -0500
Subject: [PATCH 08/15] Remove testing / environments for 3.7

---
 .github/workflows/test-upstream.yml           |  2 +-
 .github/workflows/test.yml                    |  2 +-
 .../environment-3.7-jdk11-dev.yaml            | 41 -------------------
 .../environment-3.7-jdk8-dev.yaml             | 41 -------------------
 4 files changed, 2 insertions(+), 84 deletions(-)
 delete mode 100644 continuous_integration/environment-3.7-jdk11-dev.yaml
 delete mode 100644 continuous_integration/environment-3.7-jdk8-dev.yaml

diff --git a/.github/workflows/test-upstream.yml b/.github/workflows/test-upstream.yml
index 41254887c..21af64810 100644
--- a/.github/workflows/test-upstream.yml
+++ b/.github/workflows/test-upstream.yml
@@ -53,7 +53,7 @@ jobs:
       matrix:
         java: [8, 11]
         os: [ubuntu-latest, windows-latest]
-        python: ["3.7", "3.8", "3.9", "3.10"]
+        python: ["3.8", "3.9", "3.10"]
     steps:
       - uses: actions/checkout@v2
         with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2c956542c..467b798e0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -77,7 +77,7 @@ jobs:
       matrix:
         java: [8, 11]
         os: [ubuntu-latest, windows-latest]
-        python: ["3.7", "3.8", "3.9", "3.10"]
+        python: ["3.8", "3.9", "3.10"]
     steps:
       - uses: actions/checkout@v2
       - name: Cache local Maven repository
diff --git a/continuous_integration/environment-3.7-jdk11-dev.yaml b/continuous_integration/environment-3.7-jdk11-dev.yaml
deleted file mode 100644
index 80651e6fa..000000000
--- a/continuous_integration/environment-3.7-jdk11-dev.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: dask-sql
-channels:
-- conda-forge
-dependencies:
-- adagio>=0.2.3
-- antlr4-python3-runtime>=4.9.2
-- black=19.10b0
-- ciso8601>=2.2.0
-- dask-ml>=2022.1.22
-- dask>=2021.11.1
-- fastapi>=0.61.1
-- fs>=2.4.11
-- intake>=0.6.0
-- isort=5.7.0
-- jpype1>=1.0.2
-- lightgbm>=3.2.1
-- maven>=3.6.0
-- mlflow>=1.19.0
-- mock>=4.0.3
-- nest-asyncio>=1.4.3
-- openjdk=11
-- pandas>=1.0.0  # below 1.0, there were no nullable ext. types
-- pip=20.2.4
-- pre-commit>=2.11.1
-- prompt_toolkit>=3.0.8
-- psycopg2>=2.9.1
-- pyarrow>=0.15.1
-- pygments>=2.7.1
-- pyhive>=0.6.4
-- pytest-cov>=2.10.1
-- pytest-xdist
-- pytest>=6.0.1
-- python=3.7
-- scikit-learn>=0.24.2
-- sphinx>=3.2.1
-- tpot>=0.11.7
-- triad>=0.5.4
-- tzlocal>=2.1
-- uvicorn>=0.11.3
-- pip:
-  - fugue[sql]>=0.5.3
diff --git a/continuous_integration/environment-3.7-jdk8-dev.yaml b/continuous_integration/environment-3.7-jdk8-dev.yaml
deleted file mode 100644
index 76d22e9dd..000000000
--- a/continuous_integration/environment-3.7-jdk8-dev.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: dask-sql
-channels:
-- conda-forge
-dependencies:
-- adagio>=0.2.3
-- antlr4-python3-runtime>=4.9.2
-- black=19.10b0
-- ciso8601>=2.2.0
-- dask-ml>=2022.1.22
-- dask>=2021.11.1
-- fastapi>=0.61.1
-- fs>=2.4.11
-- intake>=0.6.0
-- isort=5.7.0
-- jpype1>=1.0.2
-- lightgbm>=3.2.1
-- maven>=3.6.0
-- mlflow>=1.19.0
-- mock>=4.0.3
-- nest-asyncio>=1.4.3
-- openjdk=8
-- pandas>=1.0.0  # below 1.0, there were no nullable ext. types
-- pip=20.2.4
-- pre-commit>=2.11.1
-- prompt_toolkit>=3.0.8
-- psycopg2>=2.9.1
-- pyarrow>=0.15.1
-- pygments>=2.7.1
-- pyhive>=0.6.4
-- pytest-cov>=2.10.1
-- pytest-xdist
-- pytest>=6.0.1
-- python=3.7
-- scikit-learn>=0.24.2
-- sphinx>=3.2.1
-- tpot>=0.11.7
-- triad>=0.5.4
-- tzlocal>=2.1
-- uvicorn>=0.11.3
-- pip:
-  - fugue[sql]>=0.5.3

From 3853cdec0734b9af47d74662e483f3dd55c1e2f3 Mon Sep 17 00:00:00 2001
From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com>
Date: Mon, 31 Jan 2022 12:32:55 -0500
Subject: [PATCH 09/15] Bump various docs / pinned testing builds to 3.9

---
 .github/workflows/release.yml       | 4 ++--
 .github/workflows/test-upstream.yml | 2 +-
 .github/workflows/test.yml          | 6 +++---
 README.md                           | 4 ++--
 docs/pages/installation.rst         | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ce19c08b3..77351c713 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,9 +26,9 @@ jobs:
         with:
           miniforge-variant: Mambaforge
           use-mamba: true
-          python-version: "3.8"
+          python-version: "3.9"
           activate-environment: dask-sql
-          environment-file: continuous_integration/environment-3.8-jdk11-dev.yaml
+          environment-file: continuous_integration/environment-3.9-jdk11-dev.yaml
       - name: Install dependencies
         run: |
           pip install setuptools wheel twine
diff --git a/.github/workflows/test-upstream.yml b/.github/workflows/test-upstream.yml
index 21af64810..ad0593ced 100644
--- a/.github/workflows/test-upstream.yml
+++ b/.github/workflows/test-upstream.yml
@@ -29,7 +29,7 @@ jobs:
           python-version: "3.9"
           channel-priority: strict
           activate-environment: dask-sql
-          environment-file: continuous_integration/environment-3.8-jdk11-dev.yaml
+          environment-file: continuous_integration/environment-3.9-jdk11-dev.yaml
       - name: Install dependencies and build the jar
         run: |
           python setup.py java
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 467b798e0..d11eff2d3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -56,7 +56,7 @@ jobs:
           python-version: "3.9"
           channel-priority: strict
           activate-environment: dask-sql
-          environment-file: continuous_integration/environment-3.8-jdk11-dev.yaml
+          environment-file: continuous_integration/environment-3.9-jdk11-dev.yaml
       - name: Build the jar
         run: |
           python setup.py java
@@ -147,9 +147,9 @@ jobs:
         with:
           miniforge-variant: Mambaforge
           use-mamba: true
-          python-version: 3.8
+          python-version: 3.9
           activate-environment: dask-sql
-          environment-file: continuous_integration/environment-3.8-jdk11-dev.yaml
+          environment-file: continuous_integration/environment-3.9-jdk11-dev.yaml
       - name: Download the pre-build jar
         uses: actions/download-artifact@v1
         with:
diff --git a/README.md b/README.md
index 02dc2c206..44e97c65a 100644
--- a/README.md
+++ b/README.md
@@ -111,11 +111,11 @@ If you want to have the newest (unreleased) `dask-sql` version or if you plan to
 
 Create a new conda environment and install the development environment:
 
-    conda env create -f continuous_integration/environment-3.8-jdk11-dev.yaml
+    conda env create -f continuous_integration/environment-3.9-jdk11-dev.yaml
 
 It is not recommended to use `pip` instead of `conda` for the environment setup.
 If you however need to, make sure to have Java (jdk >= 8) and maven installed and correctly setup before continuing.
-Have a look into `environment-3.8-jdk11-dev.yaml` for the rest of the development environment.
+Have a look into `environment-3.9-jdk11-dev.yaml` for the rest of the development environment.
 
 After that, you can install the package in development mode
 
diff --git a/docs/pages/installation.rst b/docs/pages/installation.rst
index 1c5b8f11b..4b95f13cb 100644
--- a/docs/pages/installation.rst
+++ b/docs/pages/installation.rst
@@ -85,11 +85,11 @@ Create a new conda environment and install the development environment:
 
 .. code-block:: bash
 
-    conda env create -f continuous_integration/environment-3.8-jdk11-dev.yaml
+    conda env create -f continuous_integration/environment-3.9-jdk11-dev.yaml
 
 It is not recommended to use ``pip`` instead of ``conda``.
 If you however need to, make sure to have Java (jdk >= 8) and maven installed and correctly setup before continuing.
-Have a look into ``environment-3.8-jdk11-dev.yaml`` for the rest of the development environment.
+Have a look into ``environment-3.9-jdk11-dev.yaml`` for the rest of the development environment.
 
 After that, you can install the package in development mode
 

From 0a8c2b03b9fc2fba34b974f951cfd919cc71377a Mon Sep 17 00:00:00 2001
From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com>
Date: Mon, 31 Jan 2022 13:22:01 -0500
Subject: [PATCH 10/15] Use nodefaults channel to disable defaults?

---
 continuous_integration/environment-3.10-jdk11-dev.yaml | 1 +
 continuous_integration/environment-3.10-jdk8-dev.yaml  | 1 +
 continuous_integration/environment-3.8-jdk11-dev.yaml  | 1 +
 continuous_integration/environment-3.8-jdk8-dev.yaml   | 1 +
 continuous_integration/environment-3.9-jdk11-dev.yaml  | 1 +
 continuous_integration/environment-3.9-jdk8-dev.yaml   | 1 +
 6 files changed, 6 insertions(+)

diff --git a/continuous_integration/environment-3.10-jdk11-dev.yaml b/continuous_integration/environment-3.10-jdk11-dev.yaml
index 413a8beb4..e58e00c87 100644
--- a/continuous_integration/environment-3.10-jdk11-dev.yaml
+++ b/continuous_integration/environment-3.10-jdk11-dev.yaml
@@ -1,6 +1,7 @@
 name: dask-sql
 channels:
 - conda-forge
+- nodefaults
 dependencies:
 - adagio>=0.2.3
 - antlr4-python3-runtime>=4.9.2
diff --git a/continuous_integration/environment-3.10-jdk8-dev.yaml b/continuous_integration/environment-3.10-jdk8-dev.yaml
index 34db50481..4ad533e94 100644
--- a/continuous_integration/environment-3.10-jdk8-dev.yaml
+++ b/continuous_integration/environment-3.10-jdk8-dev.yaml
@@ -1,6 +1,7 @@
 name: dask-sql
 channels:
 - conda-forge
+- nodefaults
 dependencies:
 - adagio>=0.2.3
 - antlr4-python3-runtime>=4.9.2
diff --git a/continuous_integration/environment-3.8-jdk11-dev.yaml b/continuous_integration/environment-3.8-jdk11-dev.yaml
index df66278ff..ddf84ab5a 100644
--- a/continuous_integration/environment-3.8-jdk11-dev.yaml
+++ b/continuous_integration/environment-3.8-jdk11-dev.yaml
@@ -1,6 +1,7 @@
 name: dask-sql
 channels:
 - conda-forge
+- nodefaults
 dependencies:
 - adagio>=0.2.3
 - antlr4-python3-runtime>=4.9.2
diff --git a/continuous_integration/environment-3.8-jdk8-dev.yaml b/continuous_integration/environment-3.8-jdk8-dev.yaml
index 28ca36336..bc6980584 100644
--- a/continuous_integration/environment-3.8-jdk8-dev.yaml
+++ b/continuous_integration/environment-3.8-jdk8-dev.yaml
@@ -1,6 +1,7 @@
 name: dask-sql
 channels:
 - conda-forge
+- nodefaults
 dependencies:
 - adagio>=0.2.3
 - antlr4-python3-runtime>=4.9.2
diff --git a/continuous_integration/environment-3.9-jdk11-dev.yaml b/continuous_integration/environment-3.9-jdk11-dev.yaml
index f71fc889e..7f7b19be2 100644
--- a/continuous_integration/environment-3.9-jdk11-dev.yaml
+++ b/continuous_integration/environment-3.9-jdk11-dev.yaml
@@ -1,6 +1,7 @@
 name: dask-sql
 channels:
 - conda-forge
+- nodefaults
 dependencies:
 - adagio>=0.2.3
 - antlr4-python3-runtime>=4.9.2
diff --git a/continuous_integration/environment-3.9-jdk8-dev.yaml b/continuous_integration/environment-3.9-jdk8-dev.yaml
index 999cf6fd3..a7f35a132 100644
--- a/continuous_integration/environment-3.9-jdk8-dev.yaml
+++ b/continuous_integration/environment-3.9-jdk8-dev.yaml
@@ -1,6 +1,7 @@
 name: dask-sql
 channels:
 - conda-forge
+- nodefaults
 dependencies:
 - adagio>=0.2.3
 - antlr4-python3-runtime>=4.9.2

From 2af00fef74cc44930c8176087bfb4eda7ad21dc3 Mon Sep 17 00:00:00 2001
From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com>
Date: Wed, 16 Feb 2022 21:43:48 -0800
Subject: [PATCH 11/15] Update env files to match upstream merge

---
 .github/workflows/release.yml       | 2 +-
 .github/workflows/test-upstream.yml | 2 +-
 .github/workflows/test.yml          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d7ec3d32c..3a071338f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,7 +29,7 @@ jobs:
           python-version: "3.8"
           channel-priority: strict
           activate-environment: dask-sql
-          environment-file: continuous_integration/environment-3.9-jdk11-dev.yaml
+          environment-file: continuous_integration/environment-3.8-jdk11-dev.yaml
       - name: Install dependencies
         run: |
           pip install setuptools wheel twine
diff --git a/.github/workflows/test-upstream.yml b/.github/workflows/test-upstream.yml
index 421638f58..77597d3c4 100644
--- a/.github/workflows/test-upstream.yml
+++ b/.github/workflows/test-upstream.yml
@@ -29,7 +29,7 @@ jobs:
           python-version: "3.8"
           channel-priority: strict
           activate-environment: dask-sql
-          environment-file: continuous_integration/environment-3.9-jdk11-dev.yaml
+          environment-file: continuous_integration/environment-3.8-jdk11-dev.yaml
       - name: Install dependencies and build the jar
         run: |
           python setup.py java
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 90ee07b2c..0877a46a5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -56,7 +56,7 @@ jobs:
           python-version: "3.8"
           channel-priority: strict
           activate-environment: dask-sql
-          environment-file: continuous_integration/environment-3.9-jdk11-dev.yaml
+          environment-file: continuous_integration/environment-3.8-jdk11-dev.yaml
       - name: Build the jar
         run: |
           python setup.py java
@@ -150,7 +150,7 @@ jobs:
           python-version: "3.8"
           channel-priority: strict
           activate-environment: dask-sql
-          environment-file: continuous_integration/environment-3.9-jdk11-dev.yaml
+          environment-file: continuous_integration/environment-3.8-jdk11-dev.yaml
       - name: Download the pre-build jar
         uses: actions/download-artifact@v1
         with:

From d2473841b5bd8ddad0f697894e305cd54ac4236d Mon Sep 17 00:00:00 2001
From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com>
Date: Wed, 16 Feb 2022 21:49:16 -0800
Subject: [PATCH 12/15] Restrict to Python >=3.8 in setup.py / nightlies

---
 continuous_integration/recipe/meta.yaml | 2 +-
 setup.py                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/continuous_integration/recipe/meta.yaml b/continuous_integration/recipe/meta.yaml
index ca97712f6..987641a6b 100644
--- a/continuous_integration/recipe/meta.yaml
+++ b/continuous_integration/recipe/meta.yaml
@@ -24,7 +24,7 @@ requirements:
     - maven >=3.6.0
   host:
     - pip
-    - python
+    - python >=3.8
   run:
     - python
     - dask >=2021.11.1
diff --git a/setup.py b/setup.py
index 29cb06787..14ca7bbdb 100755
--- a/setup.py
+++ b/setup.py
@@ -66,7 +66,7 @@ def run(self):
     long_description_content_type="text/markdown",
     packages=find_packages(include=["dask_sql", "dask_sql.*"]),
     package_data={"dask_sql": ["jar/DaskSQL.jar"]},
-    python_requires=">=3.6",
+    python_requires=">=3.8",
     setup_requires=sphinx_requirements,
     install_requires=[
         "dask[dataframe,distributed]>=2021.11.1",

From c31cba63e606d023e06a486da93ad24f58feaabc Mon Sep 17 00:00:00 2001
From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com>
Date: Wed, 16 Feb 2022 21:57:33 -0800
Subject: [PATCH 13/15] Bump RTD python version

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

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 9044b4c4c..582ddbeee 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -1,7 +1,7 @@
 version: 2
 
 python:
-  version: 3.7
+  version: 3.8
   install:
     - method: setuptools
       path: .

From 53081d38c11af11468f6ae36753bf53b093f9fd1 Mon Sep 17 00:00:00 2001
From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com>
Date: Wed, 16 Feb 2022 21:57:57 -0800
Subject: [PATCH 14/15] Bump docker conda env requirements

---
 docker/conda.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/conda.txt b/docker/conda.txt
index 579d265c0..b008852cd 100644
--- a/docker/conda.txt
+++ b/docker/conda.txt
@@ -1,4 +1,4 @@
-python>=3.7
+python>=3.8
 dask>=2021.11.1
 pandas>=1.0.0  # below 1.0, there were no nullable ext. types
 jpype1>=1.0.2

From ac143f13b1236f1e1ecf426164c8e9a22c72df7d Mon Sep 17 00:00:00 2001
From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com>
Date: Thu, 17 Feb 2022 08:45:15 -0800
Subject: [PATCH 15/15] [test-upstream]