Skip to content

Commit

Permalink
Finalise
Browse files Browse the repository at this point in the history
  • Loading branch information
@scaramallion
scaramallion committed Jul 27, 2024
1 parent 06b3e7f commit 1f14e87
Show file tree
Hide file tree
Showing 3 changed files with 125 additions and 125 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pr-pytest-apps.yml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: pull-request-pytest-apps

on:
# pull_request:
# branches: [ main ]
pull_request:
branches: [ main ]

jobs:

Expand Down
242 changes: 121 additions & 121 deletions .github/workflows/pr-pytest.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,35 @@ on:

jobs:

# conda:
# # Test conda build with latest Python version
# runs-on: ubuntu-latest
# timeout-minutes: 30
# strategy:
# fail-fast: false
# matrix:
# python-version: ['3.10']
#
# steps:
# - uses: actions/checkout@v4
# - name: Setup conda
# uses: s-weigand/setup-conda@v1
# with:
# update-conda: true
# python-version: ${{ matrix.python-version }}
# conda-channels: anaconda, conda-forge
# - name: Install dependencies
# run: |
# conda install pytest
# conda install -c conda-forge pydicom
# - name: Get OpenSSL version
# run: |
# python -c "import ssl; print('OpenSSL:', ssl.OPENSSL_VERSION_INFO)"
# - name: Test with pytest
# env:
# PYTHON_VERSION: ${{ matrix.python-version }}
# run: |
# pytest -x --ignore=pynetdicom/apps
conda:
# Test conda build with latest Python version
runs-on: ubuntu-latest
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
python-version: ['3.10']

steps:
- uses: actions/checkout@v4
- name: Setup conda
uses: s-weigand/setup-conda@v1
with:
update-conda: true
python-version: ${{ matrix.python-version }}
conda-channels: anaconda, conda-forge
- name: Install dependencies
run: |
conda install pytest
conda install -c conda-forge pydicom
- name: Get OpenSSL version
run: |
python -c "import ssl; print('OpenSSL:', ssl.OPENSSL_VERSION_INFO)"
- name: Test with pytest
env:
PYTHON_VERSION: ${{ matrix.python-version }}
run: |
pytest -x --ignore=pynetdicom/apps
windows:
runs-on: windows-latest
Expand Down Expand Up @@ -75,100 +75,100 @@ jobs:
env:
PYTHON_VERSION: ${{ matrix.python-version }}
run: |
poetry run pytest -x --cov pynetdicom --ignore=pynetdicom/apps pynetdicom/tests/test_assoc.py::TestAssociationWindows &&
poetry run pytest -x --cov pynetdicom --ignore=pynetdicom/apps &&
poetry run coverage xml
- name: Send coverage results
if: ${{ success() }}
uses: codecov/codecov-action@v4

# pydicom-dev:
# # Matrix builds with development pydicom
# runs-on: ubuntu-latest
# timeout-minutes: 30
# strategy:
# fail-fast: false
# matrix:
# python-version: ['3.10']
#
# steps:
# - uses: actions/checkout@v4
# with:
# fetch-depth: 2
# - name: Set up Python ${{ matrix.python-version }}
# uses: actions/setup-python@v5
# id: setup-python
# with:
# python-version: ${{ matrix.python-version }}
# - name: Install poetry
# uses: snok/install-poetry@v1
# with:
# virtualenvs-create: true
# virtualenvs-in-project: true
# installer-parallel: true
# - name: Load cached venv
# id: cached-poetry-dependencies
# uses: actions/cache@v4
# with:
# path: .venv
# key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
# - name: Install dependencies
# run: poetry install --no-interaction --extras tests
# - name: Switch to development pydicom
# run: |
# pip install git+https://github.com/pydicom/pydicom
# - name: Test with pytest
# env:
# PYTHON_VERSION: ${{ matrix.python-version }}
# run: |
# poetry run pytest -x --cov pynetdicom --ignore=pynetdicom/apps &&
# poetry run coverage xml
# - name: Send coverage results
# if: ${{ success() }}
# uses: codecov/codecov-action@v4
#
# pydicom-release:
# # Matrix builds with released pydicom
# runs-on: ubuntu-latest
# timeout-minutes: 30
# strategy:
# fail-fast: false
# matrix:
# python-version: ['3.10', '3.11', '3.12']
#
# steps:
# - uses: actions/checkout@v4
# with:
# fetch-depth: 2
# - name: Set up Python ${{ matrix.python-version }}
# id: setup-python
# uses: actions/setup-python@v5
# with:
# python-version: ${{ matrix.python-version }}
# - name: Install poetry
# uses: snok/install-poetry@v1
# with:
# virtualenvs-create: true
# virtualenvs-in-project: true
# installer-parallel: true
# - name: Load cached venv
# id: cached-poetry-dependencies
# uses: actions/cache@v4
# with:
# path: .venv
# key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
# - name: Install dependencies
# run: |
# poetry install --no-interaction --extras tests &&
# poetry run pip list
# - name: Get OpenSSL version
# run: |
# poetry run python -c "import ssl; print('OpenSSL:', ssl.OPENSSL_VERSION_INFO)"
# - name: Test with pytest
# env:
# PYTHON_VERSION: ${{ matrix.python-version }}
# run: |
# poetry run pytest -x --cov pynetdicom --ignore=pynetdicom/apps &&
# poetry run coverage xml
# - name: Send coverage results
# if: ${{ success() }}
# uses: codecov/codecov-action@v4
pydicom-dev:
# Matrix builds with development pydicom
runs-on: ubuntu-latest
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
python-version: ['3.10']

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
id: setup-python
with:
python-version: ${{ matrix.python-version }}
- name: Install poetry
uses: snok/install-poetry@v1
with:
virtualenvs-create: true
virtualenvs-in-project: true
installer-parallel: true
- name: Load cached venv
id: cached-poetry-dependencies
uses: actions/cache@v4
with:
path: .venv
key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
- name: Install dependencies
run: poetry install --no-interaction --extras tests
- name: Switch to development pydicom
run: |
pip install git+https://github.com/pydicom/pydicom
- name: Test with pytest
env:
PYTHON_VERSION: ${{ matrix.python-version }}
run: |
poetry run pytest -x --cov pynetdicom --ignore=pynetdicom/apps &&
poetry run coverage xml
- name: Send coverage results
if: ${{ success() }}
uses: codecov/codecov-action@v4

pydicom-release:
# Matrix builds with released pydicom
runs-on: ubuntu-latest
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
python-version: ['3.10', '3.11', '3.12']

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 2
- name: Set up Python ${{ matrix.python-version }}
id: setup-python
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install poetry
uses: snok/install-poetry@v1
with:
virtualenvs-create: true
virtualenvs-in-project: true
installer-parallel: true
- name: Load cached venv
id: cached-poetry-dependencies
uses: actions/cache@v4
with:
path: .venv
key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
- name: Install dependencies
run: |
poetry install --no-interaction --extras tests &&
poetry run pip list
- name: Get OpenSSL version
run: |
poetry run python -c "import ssl; print('OpenSSL:', ssl.OPENSSL_VERSION_INFO)"
- name: Test with pytest
env:
PYTHON_VERSION: ${{ matrix.python-version }}
run: |
poetry run pytest -x --cov pynetdicom --ignore=pynetdicom/apps &&
poetry run coverage xml
- name: Send coverage results
if: ${{ success() }}
uses: codecov/codecov-action@v4
4 changes: 2 additions & 2 deletions .github/workflows/pr-type-lint-format.yml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: pull-request-type-lint-format

on:
# pull_request:
# branches: [ main ]
pull_request:
branches: [ main ]

jobs:

Expand Down

0 comments on commit 1f14e87

Please sign in to comment.