Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small maintenance #675

Merged
merged 6 commits into from
Sep 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 5 additions & 15 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
test_suite:
name: Pytest on ${{ matrix.os }} with Python ${{ matrix.python-version }}
- uses: holoviz-dev/holoviz_tasks/[email protected]
unit_test_suite:
name: Unit tests on Python ${{ matrix.python-version }}, ${{ matrix.os }}
needs: [pre_commit]
runs-on: ${{ matrix.os }}
strategy:
Expand All @@ -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.1a17
with:
name: unit_test_suite
python-version: ${{ matrix.python-version }}
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions scripts/download_data.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/usr/bin/env bash

set -eux pipefail

bokeh sampledata

HERE=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
Expand All @@ -8,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')
"