diff --git a/.github/workflows/merge-pytest.yml b/.github/workflows/merge-pytest.yml index f02ac5240..97169091c 100644 --- a/.github/workflows/merge-pytest.yml +++ b/.github/workflows/merge-pytest.yml @@ -64,8 +64,7 @@ jobs: path: .venv 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 +106,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 @@ -134,6 +133,7 @@ jobs: with: fetch-depth: 2 - name: Set up Python ${{ matrix.python-version }} + id: setup-python uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} @@ -150,8 +150,9 @@ jobs: path: .venv 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 }} diff --git a/.github/workflows/pr-pytest-apps.yml b/.github/workflows/pr-pytest-apps.yml index a9a8572ea..828f3feed 100644 --- a/.github/workflows/pr-pytest-apps.yml +++ b/.github/workflows/pr-pytest-apps.yml @@ -36,7 +36,6 @@ jobs: path: .venv 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 --extras tests - name: Switch to development pydicom run: | diff --git a/.github/workflows/pr-pytest.yml b/.github/workflows/pr-pytest.yml index c20ee2f29..1d60cf00f 100644 --- a/.github/workflows/pr-pytest.yml +++ b/.github/workflows/pr-pytest.yml @@ -64,7 +64,6 @@ jobs: path: .venv 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 --extras tests - name: Test with pytest env: @@ -151,7 +150,6 @@ jobs: path: .venv 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 --extras tests && poetry run pip list diff --git a/.github/workflows/pr-type-lint-format.yml b/.github/workflows/pr-type-lint-format.yml index 6256ef350..75d13c054 100644 --- a/.github/workflows/pr-type-lint-format.yml +++ b/.github/workflows/pr-type-lint-format.yml @@ -34,7 +34,6 @@ jobs: path: .venv 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 dev - name: Run type check using mypy run: | diff --git a/pynetdicom/apps/tests/test_echoscp.py b/pynetdicom/apps/tests/test_echoscp.py index 131787c0a..0ba3cbd83 100644 --- a/pynetdicom/apps/tests/test_echoscp.py +++ b/pynetdicom/apps/tests/test_echoscp.py @@ -33,7 +33,6 @@ def start_echoscp(args): """Start the echoscp.py app and return the process.""" pargs = [sys.executable, APP_FILE, "11112"] + [*args] - #print(sys.executable) return subprocess.Popen(pargs)