From 76de4daa1a1fef3b61724cf808398673a86dd441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Tue, 26 Sep 2023 09:09:24 +0200 Subject: [PATCH 1/6] Fail if data is not downloaded --- scripts/download_data.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/download_data.sh b/scripts/download_data.sh index 8f982033..539d61d6 100755 --- a/scripts/download_data.sh +++ b/scripts/download_data.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -eux pipefail + bokeh sampledata HERE=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) From 911617e4d5b647dcd40b6a993bd6d7581a0e64a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Tue, 26 Sep 2023 09:13:10 +0200 Subject: [PATCH 2/6] Update test.yaml --- .github/workflows/test.yaml | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index a5b6f2b9..142d1857 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -16,22 +16,12 @@ concurrency: jobs: pre_commit: - name: Run pre-commit hooks + name: Run pre-commit runs-on: 'ubuntu-latest' steps: - - uses: actions/checkout@v3 - with: - fetch-depth: "1" - - name: set PY - run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV - - uses: actions/cache@v3 - with: - path: ~/.cache/pre-commit - 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.os }} with Python ${{ matrix.python-version }} + - uses: holoviz-dev/holoviz_tasks/pre-commit@v0.1a16 + unit_test_suite: + name: Unit tests on Python ${{ matrix.python-version }}, ${{ matrix.os }} needs: [pre_commit] runs-on: ${{ matrix.os }} strategy: @@ -50,7 +40,7 @@ jobs: SETUPTOOLS_ENABLE_FEATURES: "legacy-editable" USE_PYGEOS: '0' steps: - - uses: holoviz-dev/holoviz_tasks/install@v0.1a15 + - uses: holoviz-dev/holoviz_tasks/install@v0.1a16 with: name: unit_test_suite python-version: ${{ matrix.python-version }} From de21d2fb935097042003a1e325eb70e5e1a72a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Tue, 26 Sep 2023 09:16:13 +0200 Subject: [PATCH 3/6] update pre-commit --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 74635594..16b02f65 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,13 +17,13 @@ repos: - id: trailing-whitespace exclude: \.svg$ - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.0.283 + rev: v0.0.291 hooks: - id: ruff args: [geoviews] files: geoviews/ - 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 From f9fc53c71ebf27cc5f23b800a50538492b9e1a74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Tue, 26 Sep 2023 09:23:35 +0200 Subject: [PATCH 4/6] Try dev pre-commit --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 142d1857..39a11ef7 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -19,7 +19,7 @@ jobs: name: Run pre-commit runs-on: 'ubuntu-latest' steps: - - uses: holoviz-dev/holoviz_tasks/pre-commit@v0.1a16 + - uses: holoviz-dev/holoviz_tasks/pre-commit@save_after_pre_commit unit_test_suite: name: Unit tests on Python ${{ matrix.python-version }}, ${{ matrix.os }} needs: [pre_commit] From 654a9d141964490d7008b5d39692c6a6dbf38625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Tue, 26 Sep 2023 09:29:28 +0200 Subject: [PATCH 5/6] Move download data into else --- scripts/download_data.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/download_data.sh b/scripts/download_data.sh index 539d61d6..613ff481 100755 --- a/scripts/download_data.sh +++ b/scripts/download_data.sh @@ -10,8 +10,9 @@ geoviews fetch-data --path="$HERE/../examples" python -c " try: import geodatasets as gds - gds.get_path('geoda airbnb') - gds.get_path('nybb') except ImportError: pass +else: + gds.get_path('geoda airbnb') + gds.get_path('nybb') " From 4e307f2020aaad8bfdb027c7a00220a642fc9471 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Tue, 26 Sep 2023 09:32:19 +0200 Subject: [PATCH 6/6] Update tag version --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 39a11ef7..d0e8959f 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -19,7 +19,7 @@ jobs: name: Run pre-commit runs-on: 'ubuntu-latest' steps: - - uses: holoviz-dev/holoviz_tasks/pre-commit@save_after_pre_commit + - uses: holoviz-dev/holoviz_tasks/pre-commit@v0.1a17 unit_test_suite: name: Unit tests on Python ${{ matrix.python-version }}, ${{ matrix.os }} needs: [pre_commit] @@ -40,7 +40,7 @@ jobs: SETUPTOOLS_ENABLE_FEATURES: "legacy-editable" USE_PYGEOS: '0' steps: - - uses: holoviz-dev/holoviz_tasks/install@v0.1a16 + - uses: holoviz-dev/holoviz_tasks/install@v0.1a17 with: name: unit_test_suite python-version: ${{ matrix.python-version }}