From d7bf91f401b32ab17629d0911ad6845dcaf80774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Sat, 16 Sep 2023 13:30:03 +0200 Subject: [PATCH 1/2] Update pre-commit and fixes (#5889) --- .pre-commit-config.yaml | 4 ++-- holoviews/core/data/grid.py | 2 +- pyproject.toml | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e1d5c48d7a..524281a259 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,13 +17,13 @@ repos: exclude: \.min\.js$ - id: trailing-whitespace - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.0.284 + rev: v0.0.290 hooks: - id: ruff args: [holoviews] files: holoviews/ - repo: https://github.com/hoxbro/clean_notebook - rev: v0.1.10 + rev: v0.1.11 hooks: - id: clean-notebook - repo: https://github.com/codespell-project/codespell diff --git a/holoviews/core/data/grid.py b/holoviews/core/data/grid.py index a92c779142..df39e6217d 100644 --- a/holoviews/core/data/grid.py +++ b/holoviews/core/data/grid.py @@ -131,7 +131,7 @@ def init(cls, eltype, data, kdims, vdims): 'match the expected dimensionality indicated ' 'by the key dimensions. Expected %d-D array, ' 'found %d-D array.' % (vdim, len(expected), len(shape))) - elif any((s!=e and (s+1)!=e) for s, e in zip(shape, valid_shape)): + elif any((e not in (s, s + 1)) for s, e in zip(shape, valid_shape)): raise error(f'Key dimension values and value array {vdim} ' f'shapes do not match. Expected shape {valid_shape}, ' f'actual shape: {shape}', cls) diff --git a/pyproject.toml b/pyproject.toml index 77097111cc..c78d5ef341 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -68,7 +68,6 @@ ignore = [ "E731", # Do not assign a lambda expression, use a def "E741", # Ambiguous variable name "F405", # From star imports - "PLC1901", # empty string is falsey "PLE0604", # Invalid object in `__all__`, must contain only strings "PLE0605", # Invalid format for `__all__` "PLR091", # Too many arguments/branches/statements From 0b76098a082c4e209b95d90c41fddde6e6b16f2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Sun, 17 Sep 2023 13:43:05 +0200 Subject: [PATCH 2/2] Ignore Kernel died failures in example tests (#5892) --- .github/workflows/test.yaml | 72 ++++++++++++++------------------ examples/conftest.py | 20 +++++++++ scripts/check_latest_packages.py | 4 +- 3 files changed, 53 insertions(+), 43 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index d440decd59..401f6c4f88 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -14,6 +14,20 @@ concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true +env: + SETUPTOOLS_ENABLE_FEATURES: "legacy-editable" + DISPLAY: ":99.0" + PYTHONIOENCODING: "utf-8" + MPLBACKEND: "Agg" + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + OMP_NUM_THREADS: 1 + OPENBLAS_NUM_THREADS: 1 + MKL_NUM_THREADS: 1 + VECLIB_MAXIMUM_THREADS: 1 + NUMEXPR_NUM_THREADS: 1 + NUMBA_NUM_THREADS: 1 + PYDEVD_DISABLE_FILE_VALIDATION: 1 + jobs: pre_commit: name: Run pre-commit hooks @@ -30,8 +44,8 @@ jobs: key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }} - name: pre-commit uses: pre-commit/action@v3.0.0 - test_suite: - name: Pytest on ${{ matrix.python-version }}, Bokeh ${{ matrix.bokeh-version }}, ${{ matrix.os }} + unit_test_suite: + name: Unit tests on Python ${{ matrix.python-version }}, ${{ matrix.os }} needs: [pre_commit] runs-on: ${{ matrix.os }} strategy: @@ -39,34 +53,26 @@ jobs: matrix: os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] python-version: ['3.8', '3.11'] - bokeh-version: ['3'] + include: + - os: 'ubuntu-latest' + python-version: '3.9' + - os: 'ubuntu-latest' + python-version: '3.10' timeout-minutes: 120 defaults: run: shell: bash -el {0} env: - DESC: "Python ${{ matrix.python-version }} - Bokeh ${{ matrix.bokeh-version }} tests" + DESC: "Python ${{ matrix.python-version }}, ${{ matrix.os }} unit tests" PYTHON_VERSION: ${{ matrix.python-version }} - SETUPTOOLS_ENABLE_FEATURES: "legacy-editable" - DISPLAY: ":99.0" - PYTHONIOENCODING: "utf-8" - MPLBACKEND: "Agg" - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - OMP_NUM_THREADS: 1 - OPENBLAS_NUM_THREADS: 1 - MKL_NUM_THREADS: 1 - VECLIB_MAXIMUM_THREADS: 1 - NUMEXPR_NUM_THREADS: 1 - NUMBA_NUM_THREADS: 1 - PYDEVD_DISABLE_FILE_VALIDATION: 1 steps: - uses: holoviz-dev/holoviz_tasks/install@v0.1a15 with: - name: unit_test_suite_bokeh${{ matrix.bokeh-version }} + name: unit_test_suite python-version: ${{ matrix.python-version }} channel-priority: strict channels: pyviz/label/dev,conda-forge,nodefaults - envs: "-o flakes -o tests -o examples_tests -o bokeh${{ matrix.bokeh-version }}" + envs: "-o flakes -o tests -o examples_tests" cache: true conda-update: true id: install @@ -81,31 +87,27 @@ jobs: - name: test examples run: | conda activate test-environment - mkdir -p ~/.jupyter/ - echo "c.ExecutePreprocessor.startup_timeout=600" >> ~/.jupyter/jupyter_nbconvert_config.py doit test_examples - name: codecov run: | conda activate test-environment codecov ui_test_suite: - name: UI tests on ${{ matrix.os }} with Python 3.9 + name: UI tests on Python ${{ matrix.python-version }}, ${{ matrix.os }} needs: [pre_commit] runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: os: ['ubuntu-latest'] + python-version: ['3.9'] timeout-minutes: 60 defaults: run: shell: bash -el {0} env: - DESC: "Python ${{ matrix.python-version }} tests" - PYTHONIOENCODING: "utf-8" + DESC: "Python ${{ matrix.python-version }}, ${{ matrix.os }} UI tests" PANEL_LOG_LEVEL: info - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SETUPTOOLS_ENABLE_FEATURES: "legacy-editable" # Without this env var `doit env_create ...` uses by default # the `pyviz` channel, except that we don't want to configure # it as one of the sources. @@ -114,7 +116,7 @@ jobs: - uses: holoviz-dev/holoviz_tasks/install@v0.1a15 with: name: ui_test_suite - python-version: 3.9 + python-version: ${{ matrix.python-version }} channels: pyviz/label/dev,bokeh,conda-forge,nodefaults envs: "-o recommended -o tests -o build" cache: true @@ -134,8 +136,8 @@ jobs: files: ./coverage.xml flags: ui-tests fail_ci_if_error: false # optional (default = false) - core_tests: - name: Core tests on ${{ matrix.python-version }}, ${{ matrix.os }} + core_test_suite: + name: Core tests on Python ${{ matrix.python-version }}, ${{ matrix.os }} needs: [pre_commit] runs-on: ${{ matrix.os }} strategy: @@ -148,20 +150,8 @@ jobs: run: shell: bash -el {0} env: - DESC: "Python ${{ matrix.python-version }} core tests" + DESC: "Python ${{ matrix.python-version }}, ${{ matrix.os }} core tests" PYTHON_VERSION: ${{ matrix.python-version }} - SETUPTOOLS_ENABLE_FEATURES: "legacy-editable" - DISPLAY: ":99.0" - PYTHONIOENCODING: "utf-8" - MPLBACKEND: "Agg" - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - OMP_NUM_THREADS: 1 - OPENBLAS_NUM_THREADS: 1 - MKL_NUM_THREADS: 1 - VECLIB_MAXIMUM_THREADS: 1 - NUMEXPR_NUM_THREADS: 1 - NUMBA_NUM_THREADS: 1 - PYDEVD_DISABLE_FILE_VALIDATION: 1 steps: - uses: holoviz-dev/holoviz_tasks/install@v0.1a15 with: diff --git a/examples/conftest.py b/examples/conftest.py index 5617e8ba05..4550c5e4c6 100644 --- a/examples/conftest.py +++ b/examples/conftest.py @@ -38,3 +38,23 @@ "gallery/demos/*/bachelors_degrees_by_gender.ipynb", "gallery/demos/*/topographic_hillshading.ipynb", ] + + +def pytest_runtest_makereport(item, call): + """ + Skip tests that fail because "the kernel died before replying to kernel_info" + this is a common error when running the example tests in CI. + + Inspired from: https://stackoverflow.com/questions/32451811 + + """ + from _pytest.runner import pytest_runtest_makereport + tr = pytest_runtest_makereport(item, call) + + if call.excinfo is not None: + msg = "Kernel died before replying to kernel_info" + if call.excinfo.type == RuntimeError and call.excinfo.value.args[0] == msg: + tr.outcome = 'skipped' + tr.wasxfail = f"reason: {msg}" + + return tr diff --git a/scripts/check_latest_packages.py b/scripts/check_latest_packages.py index 3b4249e0e8..b864435ae3 100644 --- a/scripts/check_latest_packages.py +++ b/scripts/check_latest_packages.py @@ -6,7 +6,7 @@ def main(*packages): - allowed_date = date.today() - timedelta(days=2) + allowed_date = date.today() - timedelta(days=5) is_latest = True for package in sorted(packages): url = f"https://pypi.org/pypi/{package}/json" @@ -23,7 +23,7 @@ def main(*packages): version_check = Version(current) >= Version(latest) date_check = allowed_date >= latest_release_date - is_latest &= version_check and date_check + is_latest &= version_check or date_check print( f"Package: {package:<10} Current: {current:<7} ({current_release_date})\tLatest: {latest:<7} ({latest_release_date})"