Test fix 1

pydicom · Jul 27, 2024 · b012419 · b012419
1 parent bf2711d
commit b012419
Show file tree

Hide file tree

Showing 4 changed files with 127 additions and 125 deletions.
diff --git a/.github/workflows/pr-pytest-apps.yml b/.github/workflows/pr-pytest-apps.yml
@@ -1,8 +1,8 @@
 name: pull-request-pytest-apps
 
 on:
-  pull_request:
-    branches: [ main ]
+  # pull_request:
+    # branches: [ main ]
 
 jobs:
 

diff --git a/.github/workflows/pr-pytest.yml b/.github/workflows/pr-pytest.yml
@@ -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
@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.10']
+        python-version: ['3.10', '3.11', '3.12']
 
     steps:
       - uses: actions/checkout@v4
@@ -81,94 +81,94 @@ 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 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
diff --git a/.github/workflows/pr-type-lint-format.yml b/.github/workflows/pr-type-lint-format.yml
@@ -1,8 +1,8 @@
 name: pull-request-type-lint-format
 
 on:
-  pull_request:
-    branches: [ main ]
+  # pull_request:
+    # branches: [ main ]
 
 jobs:
 

diff --git a/pynetdicom/tests/test_assoc.py b/pynetdicom/tests/test_assoc.py
@@ -7592,5 +7592,7 @@ def test_set_timer_resolution(self):
 
         scp.shutdown()
 
+        time.sleep(1)
+
         min_val, max_val, post_timer = self.get_timer_info()
         assert post_timer > during_timer