diff --git a/.github/workflows/merge-pytest.yml b/.github/workflows/merge-pytest.yml index ba20df97e..63418d9ef 100644 --- a/.github/workflows/merge-pytest.yml +++ b/.github/workflows/merge-pytest.yml @@ -64,39 +64,39 @@ jobs: env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - pydicom-dev: - # Matrix builds with development 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 }} - uses: actions/setup-python@v5 - id: setup-python - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: pip install .[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: | - pytest --cov pynetdicom --ignore=pynetdicom/apps && coverage xml - - name: Send coverage results - if: success() - uses: codecov/codecov-action@v4 - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + # pydicom-dev: + # # Matrix builds with development 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 }} + # uses: actions/setup-python@v5 + # id: setup-python + # with: + # python-version: ${{ matrix.python-version }} + # - name: Install dependencies + # run: pip install .[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: | + # pytest --cov pynetdicom --ignore=pynetdicom/apps && coverage xml + # - name: Send coverage results + # if: success() + # uses: codecov/codecov-action@v4 + # env: + # CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} pydicom-release: # Matrix builds with released pydicom diff --git a/.github/workflows/pr-pytest-apps.yml b/.github/workflows/pr-pytest-apps.yml index 5ca8b932e..191e4a5d7 100644 --- a/.github/workflows/pr-pytest-apps.yml +++ b/.github/workflows/pr-pytest-apps.yml @@ -6,7 +6,35 @@ on: jobs: - pydicom-dev: + # pydicom-dev: + # 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 dependencies + # run: pip install -e .[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: | + # pytest -x --ignore=pynetdicom/tests + + pydicom-release: runs-on: ubuntu-latest timeout-minutes: 30 strategy: @@ -25,37 +53,8 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies run: pip install -e .[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: | pytest -x --ignore=pynetdicom/tests - - # pydicom-release: - # runs-on: ubuntu-latest - # timeout-minutes: 30 - # strategy: - # fail-fast: false - # matrix: - # python-version: ['3.9'] - # - # steps: - # - uses: actions/checkout@v4 - # with: - # fetch-depth: 2 - # - name: Set up Python ${{ matrix.python-version }} - # uses: actions/setup-python@v5 - # with: - # python-version: ${{ matrix.python-version }} - # - name: Install dependencies - # run: | - # python -m pip install --upgrade pip - # pip install pytest pydicom sqlalchemy pyfakefs - # - name: Test with pytest - # env: - # PYTHON_VERSION: ${{ matrix.python-version }} - # run: | - # pytest --ignore=pynetdicom/tests diff --git a/.github/workflows/pr-pytest.yml b/.github/workflows/pr-pytest.yml index 2606e64eb..f7f30426c 100644 --- a/.github/workflows/pr-pytest.yml +++ b/.github/workflows/pr-pytest.yml @@ -68,37 +68,37 @@ jobs: 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 dependencies - run: pip install -e .[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: | - pytest -x --cov pynetdicom --ignore=pynetdicom/apps && 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 dependencies + # run: pip install -e .[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: | + # pytest -x --cov pynetdicom --ignore=pynetdicom/apps && coverage xml + # - name: Send coverage results + # if: ${{ success() }} + # uses: codecov/codecov-action@v4 pydicom-release: # Matrix builds with released pydicom diff --git a/pyproject.toml b/pyproject.toml index be6803d16..797fe8ec0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,7 @@ name = "pynetdicom" readme = "README.rst" version = "2.2.0.dev0" requires-python = ">=3.10" -dependencies = ["pydicom >=2.4"] +dependencies = ["pydicom >=2.4, <3"] [project.urls] documentation = "https://pydicom.github.io/pynetdicom" @@ -48,7 +48,7 @@ dev = [ "pyfakefs >=5.3", "pytest >=7.4", "pytest-cov >=4.1", - "ruff >=0.1.5", + "ruff >=0.1", "sqlalchemy >=2.0", ] docs = [