-
-
Notifications
You must be signed in to change notification settings - Fork 77
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into fix_annotators
- Loading branch information
Showing
31 changed files
with
179 additions
and
123 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ name: tests | |
| on: | ||
| push: | ||
| branches: | ||
| - master | ||
| - main | ||
| pull_request: | ||
| branches: | ||
| - '*' | ||
|
|
@@ -11,88 +11,80 @@ on: | |
| - cron: '0 18 * * SUN' | ||
|
|
||
| jobs: | ||
| pre_commit: | ||
| name: Run pre-commit hooks | ||
| 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 }} | ||
| needs: [pre_commit] | ||
| runs-on: ${{ matrix.os }} | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] | ||
| python-version: ['3.7', '3.8', '3.9', '3.10'] | ||
| # Run on the full set on schedule, workflow_dispatch and push&tags events, otherwise on a subset. | ||
| python-version: ${{ ( github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || ( github.event_name == 'push' && github.ref_type == 'tag' ) ) && fromJSON('["3.7", "3.8", "3.9", "3.10", "3.11"]') || fromJSON('["3.7", "3.9", "3.11"]') }} | ||
| timeout-minutes: 60 | ||
| defaults: | ||
| run: | ||
| shell: bash -l {0} | ||
| shell: bash -l {0} | ||
| env: | ||
| DISPLAY: ":99.0" | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| MAMBA_NO_BANNER: 1 | ||
| SETUPTOOLS_ENABLE_FEATURES: "legacy-editable" | ||
| USE_PYGEOS: '0' | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| with: | ||
| fetch-depth: "100" | ||
| - uses: actions/setup-python@v2 | ||
| - uses: pyviz-dev/holoviz_tasks/[email protected] | ||
| with: | ||
| name: unit_test_suite | ||
| python-version: ${{ matrix.python-version }} | ||
| - uses: conda-incubator/setup-miniconda@v2 | ||
| with: | ||
| miniconda-version: "latest" | ||
| - name: Fetch unshallow | ||
| run: git fetch --prune --tags --unshallow | ||
| - name: conda setup | ||
| run: | | ||
| conda install -n base -c defaults "conda>=4.12" | ||
| conda install -n base -c conda-forge mamba --no-update-deps | ||
| conda install -c conda-forge "nodejs=15.3.0" --no-update-deps | ||
| conda config --prepend channels nodefaults | ||
| conda config --prepend channels conda-forge | ||
| conda config --prepend channels pyviz/label/dev | ||
| conda config --remove channels defaults | ||
| conda create -n test-environment python=${{ matrix.python-version }} pyctdev | ||
| - name: doit develop_install | ||
| run: | | ||
| eval "$(conda shell.bash hook)" | ||
| conda activate test-environment | ||
| doit develop_install -o tests -o examples -o recommended --conda-mode=mamba | ||
| channel-priority: strict | ||
| channels: pyviz/label/dev,conda-forge,nodefaults | ||
| envs: "-o tests -o examples -o recommended" | ||
| cache: true | ||
| conda-update: true | ||
| conda-mamba: mamba | ||
| nodejs: true | ||
| id: install | ||
| - name: patch fiona/geostack on Python 3.7 / Macos | ||
| if: contains(matrix.os, 'macos') && matrix.python-version == '3.7' | ||
| if: steps.install.outputs.cache-hit != 'true' && contains(matrix.os, 'macos') && matrix.python-version == '3.7' | ||
| run: | | ||
| eval "$(conda shell.bash hook)" | ||
| conda activate test-environment | ||
| mamba install "fiona=1.8" "gdal=3.3" | ||
| - name: doit env_capture | ||
| run: | | ||
| eval "$(conda shell.bash hook)" | ||
| conda activate test-environment | ||
| doit env_capture | ||
| - name: download test data | ||
| run: | | ||
| eval "$(conda shell.bash hook)" | ||
| conda activate test-environment | ||
| bokeh sampledata | ||
| geoviews fetch-data --path=examples | ||
| - name: git describe | ||
| run: | | ||
| git describe | ||
| - name: doit test_flakes | ||
| run: | | ||
| eval "$(conda shell.bash hook)" | ||
| conda activate test-environment | ||
| doit test_flakes | ||
| - name: doit test_unit | ||
| run: | | ||
| eval "$(conda shell.bash hook)" | ||
| conda activate test-environment | ||
| doit test_unit | ||
| - name: test examples | ||
| run: | | ||
| eval "$(conda shell.bash hook)" | ||
| conda activate test-environment | ||
| doit test_examples | ||
| - name: codecov | ||
| if: github.event_name == 'push' | ||
| run: | | ||
| eval "$(conda shell.bash hook)" | ||
| conda activate test-environment | ||
| codecov | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| # This is the configuration for pre-commit, a local framework for managing pre-commit hooks | ||
| # Check out the docs at: https://pre-commit.com/ | ||
|
|
||
| default_stages: [commit] | ||
| repos: | ||
| - repo: https://github.com/pre-commit/pre-commit-hooks | ||
| rev: v4.2.0 | ||
| hooks: | ||
| - id: check-builtin-literals | ||
| - id: check-case-conflict | ||
| - id: check-docstring-first | ||
| - id: check-executables-have-shebangs | ||
| - id: check-toml | ||
| - id: detect-private-key | ||
| - id: end-of-file-fixer | ||
| exclude: (\.min\.js$|\.svg$) | ||
| - id: trailing-whitespace | ||
| exclude: \.svg$ | ||
| - repo: https://github.com/PyCQA/flake8 | ||
| rev: 4.0.1 | ||
| hooks: | ||
| - id: flake8 # See 'setup.cfg' for args | ||
| args: [geoviews] | ||
| files: geoviews/ | ||
| - repo: https://github.com/hoxbro/clean_notebook | ||
| rev: 0.1.5 | ||
| hooks: | ||
| - id: clean-notebook |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.