From b0c7596b287f7fcd88438dd40c64fba2a7f54cd7 Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Wed, 11 Dec 2024 17:24:42 +0000
Subject: [PATCH] Fix: Update package references and CI workflow for proper
 dependency resolution

Co-Authored-By: ned.twigg@diffplug.com <ned.twigg@diffplug.com>
---
 .github/workflows/python-ci.yml               | 11 ++++++-----
 python/example-pytest-selfie/requirements.txt |  5 +++--
 python/pytest-selfie/requirements.txt         |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index 3af74444..3d095b7a 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -24,6 +24,9 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Install uv
+        uses: astral-sh/setup-uv@v4
+
       - name: Set up Python environment
         shell: bash
         run: |
@@ -34,7 +37,7 @@ jobs:
             . .venv/bin/activate
           fi
           python -m pip install --upgrade pip
-          pip install uv
+          uv pip install --system
 
       - name: selfie-lib - install dependencies
         shell: bash
@@ -90,8 +93,7 @@ jobs:
           else
             . ../../.venv/bin/activate
           fi
-          python -m pip install -e . -e ../selfie-lib
-          python -m pip install -r requirements.txt -r dev-requirements.txt
+          uv pip install -r requirements.txt -r dev-requirements.txt
 
       - name: pytest-selfie - pyright
         shell: bash
@@ -124,8 +126,7 @@ jobs:
           else
             . ../../.venv/bin/activate
           fi
-          python -m pip install -e . -e ../selfie-lib -e ../pytest-selfie
-          python -m pip install -r requirements.txt -r dev-requirements.txt
+          uv pip install -r requirements.txt -r dev-requirements.txt
 
       - name: example-pytest-selfie - pytest
         shell: bash
diff --git a/python/example-pytest-selfie/requirements.txt b/python/example-pytest-selfie/requirements.txt
index 63ead84f..23cf7933 100644
--- a/python/example-pytest-selfie/requirements.txt
+++ b/python/example-pytest-selfie/requirements.txt
@@ -1,4 +1,5 @@
+file:../selfie-lib
+file:../pytest-selfie
+pytest>=8.0.0,<9.0.0
 flask>=3.0.3
 openai>=1.0.0
--e ../selfie-lib
--e ../pytest-selfie
diff --git a/python/pytest-selfie/requirements.txt b/python/pytest-selfie/requirements.txt
index 4e6d1de8..87355430 100644
--- a/python/pytest-selfie/requirements.txt
+++ b/python/pytest-selfie/requirements.txt
@@ -1,2 +1,2 @@
-pytest>=8.0.0
--e ../selfie-lib
+file:../selfie-lib
+pytest>=8.0.0,<9.0.0