From 21c4aeae88e544c42c8436bb22e720a8992476b1 Mon Sep 17 00:00:00 2001
From: Matthew Muckley <matt.muckley@gmail.com>
Date: Tue, 23 Jul 2024 11:19:32 -0400
Subject: [PATCH] Update requirements for new pip (#346)

* Update requirements for new pip

* Update workflow

* Try changing install order

* Change PTL version

* Remove full install

* Try a different package requirement

* Roll back test requirement

* Remove PTL version

* Try not upgrading pip

* Roll back pip

* Try quotes

* Don't need setuptools
---
 .github/workflows/build-and-test.yml | 22 ++++++----------------
 setup.cfg                            | 10 +++++-----
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 6bcf07b9..54b602b6 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -20,9 +20,9 @@ jobs:
     runs-on: ${{ matrix.platform }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install
@@ -46,25 +46,15 @@ jobs:
     runs-on: ${{ matrix.platform }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Get pip cache dir
-        id: pip-cache
-        run: |
-          echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
-      - name: pip cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.pip-cache.outputs.dir }}
-          key: ${{ runner.os }}-pip-py${{ matrix.python-version }}-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-py${{ matrix.python-version }}-
+          cache: 'pip'
       - name: Install Dependencies
         run: |
-          python -m pip install --upgrade pip
+          python -m pip install --upgrade "pip<24.1"
           pip install --upgrade wheel
           pip install --editable ".[tests]"
       - name: Check Formatting and Lint
diff --git a/setup.cfg b/setup.cfg
index 82022eb0..28b49cf8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -50,10 +50,10 @@ install_requires =
     numpy>=1.18.5
     scikit_image>=0.16.2
     torchvision>=0.8.1
-    torch>=1.8.0
-    runstats>=1.8.0
-    pytorch_lightning>=1.4
-    h5py>=2.10.0
+    torch>=1.8
+    runstats>=1.8
+    pytorch-lightning>=1.4
+    h5py>=2.10
     PyYAML>=5.3.1
     torchmetrics>=0.5.1
     pandas>=1.3.4
@@ -79,7 +79,7 @@ tests =
     pandas==1.4.2
     pandas-stubs==1.2.0.61
     pytest==7.1.2
-    pytorch_lightning==1.6.4
+    pytorch-lightning==1.6.4
     PyYAML==6.0
     runstats==2.0.0
     scikit_image==0.19.3