From 5f18b8b32941a5ba20611bc6dcee1a275f8a6825 Mon Sep 17 00:00:00 2001
From: scaramallion <scaramallion@users.noreply.github.com>
Date: Mon, 13 Nov 2023 15:54:50 +1100
Subject: [PATCH] App debug 9

---
 .github/workflows/pr-pytest-apps.yml | 10 ++--------
 .github/workflows/pr-pytest.yml      | 12 +++++++-----
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/pr-pytest-apps.yml b/.github/workflows/pr-pytest-apps.yml
index 57b6b09a9..29398461a 100644
--- a/.github/workflows/pr-pytest-apps.yml
+++ b/.github/workflows/pr-pytest-apps.yml
@@ -37,7 +37,7 @@ jobs:
         key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
     - name: Install dependencies
       if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
-      run: poetry install --no-interaction --no-root --extras tests
+      run: poetry install --no-interaction --extras tests
     - name: Switch to development pydicom
       run: |
         pip install git+https://github.com/pydicom/pydicom &&
@@ -45,14 +45,8 @@ jobs:
     - name: Test with pytest
       env:
         PYTHON_VERSION: ${{ matrix.python-version }}
-      # /home/runner/work/pynetdicom/pynetdicom/.venv/bin/python
       run: |
-        pwd &&
-        ls -a &&
-        ls -a /home/runner/work/pynetdicom/pynetdicom/.venv/bin
-        echo $VENV &&
-        ls $VENV
-    #poetry run pytest --ignore=pynetdicom/tests
+        poetry run pytest --ignore=pynetdicom/tests
 
   # pydicom-release:
   #   runs-on: ubuntu-latest
diff --git a/.github/workflows/pr-pytest.yml b/.github/workflows/pr-pytest.yml
index c2757daa8..584166f02 100644
--- a/.github/workflows/pr-pytest.yml
+++ b/.github/workflows/pr-pytest.yml
@@ -1,8 +1,8 @@
 name: pull-request-pytest
 
 on:
-  #pull_request:
-#    branches: [ main ]
+  pull_request:
+    branches: [ main ]
 
 jobs:
 
@@ -65,7 +65,7 @@ jobs:
           key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
       - name: Install dependencies
         if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
-        run: poetry install --no-interaction --no-root --extras tests
+        run: poetry install --no-interaction --extras tests
       - name: Test with pytest
         env:
           PYTHON_VERSION: ${{ matrix.python-version }}
@@ -107,7 +107,7 @@ jobs:
         key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
     - name: Install dependencies
       if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
-      run: poetry install --no-interaction --no-root --extras tests
+      run: poetry install --no-interaction --extras tests
     - name: Switch to development pydicom
       run: |
         pip install git+https://github.com/pydicom/pydicom
@@ -152,7 +152,9 @@ jobs:
         key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
     - name: Install dependencies
       if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
-      run: poetry install --no-interaction --no-root --extras tests
+      run: |
+        poetry install --no-interaction --extras tests &&
+        poetry run pip list
     - name: Test with pytest
       env:
         PYTHON_VERSION: ${{ matrix.python-version }}