From 6163a60198a531aff8e748cac1b1b180e9138809 Mon Sep 17 00:00:00 2001 From: Ogi Moore Date: Sat, 1 May 2021 14:23:28 -0700 Subject: [PATCH 1/3] Remove pytest-xdist --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4782e8da..6ae85a3d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -72,7 +72,7 @@ jobs: pip install --upgrade pip pip install ${{ matrix.qt-version }} numpy${{ matrix.numpy-version }} scipy pyopengl h5py matplotlib numba pip install . - pip install pytest pytest-cov pytest-xdist coverage + pip install pytest pytest-cov coverage - name: "Install Linux VirtualDisplay" if: runner.os == 'Linux' run: | @@ -107,7 +107,6 @@ jobs: run: | mkdir $SCREENSHOT_DIR pytest pyqtgraph examples -v \ - -n auto \ --junitxml pytest.xml \ --cov pyqtgraph --cov-report=xml --cov-report=html shell: bash From cb48ce054839b4084ebc97c2da2184ca39805de4 Mon Sep 17 00:00:00 2001 From: Ogi Moore Date: Sat, 1 May 2021 14:23:33 -0700 Subject: [PATCH 2/3] Remove pytest-cov --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6ae85a3d..83924218 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -72,7 +72,7 @@ jobs: pip install --upgrade pip pip install ${{ matrix.qt-version }} numpy${{ matrix.numpy-version }} scipy pyopengl h5py matplotlib numba pip install . - pip install pytest pytest-cov coverage + pip install pytest - name: "Install Linux VirtualDisplay" if: runner.os == 'Linux' run: | @@ -108,7 +108,6 @@ jobs: mkdir $SCREENSHOT_DIR pytest pyqtgraph examples -v \ --junitxml pytest.xml \ - --cov pyqtgraph --cov-report=xml --cov-report=html shell: bash - name: Upload Screenshots uses: actions/upload-artifact@v2 From 2fd533721589cebecf26f2761ccf5eb8db4b94dd Mon Sep 17 00:00:00 2001 From: Ogi Moore Date: Sat, 1 May 2021 18:05:33 -0700 Subject: [PATCH 3/3] Run processEvents twice to make sure plot is redrawn --- pyqtgraph/graphicsItems/tests/test_ErrorBarItem.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pyqtgraph/graphicsItems/tests/test_ErrorBarItem.py b/pyqtgraph/graphicsItems/tests/test_ErrorBarItem.py index f28c681a..ae5a9606 100644 --- a/pyqtgraph/graphicsItems/tests/test_ErrorBarItem.py +++ b/pyqtgraph/graphicsItems/tests/test_ErrorBarItem.py @@ -13,18 +13,21 @@ def test_ErrorBarItem_defer_data(): curve = pg.PlotCurveItem(x=x, y=x) plot.addItem(curve) app.processEvents() + app.processEvents() r_no_ebi = plot.viewRect() # ErrorBarItem with no data shouldn't affect the view rect err = pg.ErrorBarItem() plot.addItem(err) app.processEvents() + app.processEvents() r_empty_ebi = plot.viewRect() assert r_no_ebi.height() == r_empty_ebi.height() err.setData(x=x, y=x, bottom=x, top=x) app.processEvents() + app.processEvents() r_ebi = plot.viewRect() assert r_ebi.height() > r_empty_ebi.height() @@ -32,6 +35,7 @@ def test_ErrorBarItem_defer_data(): # unset data, ErrorBarItem disappears and view rect goes back to original err.setData(x=None, y=None) app.processEvents() + app.processEvents() r_clear_ebi = plot.viewRect() assert r_clear_ebi.height() == r_empty_ebi.height()