From a0f70415e2bdf9a9b4aef13ebe7a23e6dd126168 Mon Sep 17 00:00:00 2001
From: Sean Gillies <sean.gillies@tiledb.com>
Date: Tue, 22 Oct 2024 09:31:48 -0600
Subject: [PATCH] Move test requirements, adjust and streamline CI YAML

---
 .github/workflows/tiledb-cloud-py.yaml                   | 9 ++++-----
 .../requirements-geospatial-py3.9.txt                    | 0
 requirements-py3.9.txt => ci/requirements-py3.9.txt      | 0
 3 files changed, 4 insertions(+), 5 deletions(-)
 rename requirements-geospatial-py3.9.txt => ci/requirements-geospatial-py3.9.txt (100%)
 rename requirements-py3.9.txt => ci/requirements-py3.9.txt (100%)

diff --git a/.github/workflows/tiledb-cloud-py.yaml b/.github/workflows/tiledb-cloud-py.yaml
index 4b6f08a24..9fe0da35b 100644
--- a/.github/workflows/tiledb-cloud-py.yaml
+++ b/.github/workflows/tiledb-cloud-py.yaml
@@ -70,7 +70,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ matrix.path }}
-          key: ${{ runner.os }}-py${{ matrix.python-version }}-pip-${{ hashFiles(format('./requirements-py{0}.txt', matrix.python-version)) }}
+          key: ${{ runner.os }}-py${{ matrix.python-version }}-pip-${{ hashFiles(format('./ci/requirements-py{0}.txt', matrix.python-version)) }}
           restore-keys: |
             ${{ runner.os }}-py${{ matrix.python-version }}-pip-
 
@@ -107,7 +107,7 @@ jobs:
       - name: Install pinned dependencies
         if: ${{ matrix.dependencies == 'pinned' }}
         run: |
-          pip install -r requirements-py${{ matrix.python-version }}.txt
+          pip install -r ci/requirements-py${{ matrix.python-version }}.txt
 
       - name: Install TileDB-Cloud-Py
         run: |
@@ -224,7 +224,7 @@ jobs:
         with:
           python-version: "3.9"
           cache: pip
-          cache-dependency-path: requirements-py3.9.txt
+          cache-dependency-path: ci/requirements-py3.9.txt
 
       - name: Make fake version for Test PyPI
         if: ${{ github.event_name != 'release' }}
@@ -233,8 +233,7 @@ jobs:
 
       - name: Build wheel
         run: |
-          pip install --upgrade pip build wheel setuptools setuptools-scm
-          pip install -r requirements-py3.9.txt
+          pip install --upgrade pip build
           python -m build
 
       - name: Publish to PyPI
diff --git a/requirements-geospatial-py3.9.txt b/ci/requirements-geospatial-py3.9.txt
similarity index 100%
rename from requirements-geospatial-py3.9.txt
rename to ci/requirements-geospatial-py3.9.txt
diff --git a/requirements-py3.9.txt b/ci/requirements-py3.9.txt
similarity index 100%
rename from requirements-py3.9.txt
rename to ci/requirements-py3.9.txt