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

[WIP] Move to GH Actions #4592

Merged
merged 82 commits into from
Nov 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
5930906
initial for testing
kcpevey Sep 3, 2020
c47bc2d
syntax fix [ci skip]
kcpevey Sep 3, 2020
c6abf97
syntax fix [ci skip]
kcpevey Sep 3, 2020
c6f4c38
syntax fix [ci skip]
kcpevey Sep 3, 2020
36c2fd7
syntax fix [ci skip]
kcpevey Sep 3, 2020
ed58069
install pip wheel [ci skip]
kcpevey Sep 3, 2020
a10d31d
add print statements [ci skip]
kcpevey Sep 3, 2020
ac802f7
add pip update [ci skip]
kcpevey Sep 3, 2020
0ff9830
add python [ci skip]
kcpevey Sep 3, 2020
d83ea8b
syntax [ci skip]
kcpevey Sep 3, 2020
9ada518
death by a thousand mistakes [ci skip]
kcpevey Sep 3, 2020
c6316f6
cleanup [ci skip]
kcpevey Sep 3, 2020
911bf60
trial and error debug [ci skip]
kcpevey Sep 3, 2020
576e0df
rm hash -r [ci skip]
kcpevey Sep 3, 2020
c2ca1d2
rm the rm of doit [ci skip]
kcpevey Sep 3, 2020
58ee943
use conda activate [ci skip]
kcpevey Sep 3, 2020
e298fdf
fix conda activate [ci skip]
kcpevey Sep 3, 2020
b3a87b9
add flake8 [ci skip]
kcpevey Sep 3, 2020
12d7849
test individually[ci skip]
kcpevey Sep 4, 2020
476c65d
flake fixes [ci skip]
kcpevey Sep 4, 2020
e714afa
add nose [ci skip]
kcpevey Sep 4, 2020
626fbaa
add hash -r[ci skip]
kcpevey Sep 4, 2020
26e17c1
syntax around env vars [ci skip]
kcpevey Sep 4, 2020
46d3f03
reactivate env [ci skip]
kcpevey Sep 4, 2020
729c17a
run in together [ci skip]
kcpevey Sep 4, 2020
3c24317
stupid yml syntax [ci skip]
kcpevey Sep 4, 2020
5a39007
Merge branch 'master' into add_gh_actions
kcpevey Sep 18, 2020
2f524a6
break doit steps up into gh action steps
kcpevey Sep 18, 2020
08a7101
point to different conda location [ci skip]
kcpevey Sep 18, 2020
27c376d
activate env in each step [ci skip]
kcpevey Sep 18, 2020
316fb9e
append path syntax [ci skip]
kcpevey Sep 18, 2020
6f09377
set global shell [ci skip]
kcpevey Sep 18, 2020
2029ca1
set shell on individual steps [ci skip]
kcpevey Sep 18, 2020
e6d583c
conda init [ci skip]
kcpevey Sep 18, 2020
d9c43d4
conda activate [ci skip]
kcpevey Sep 18, 2020
8b3e675
hook conda commands [ci skip]
kcpevey Sep 18, 2020
ed98584
source bashrc
kcpevey Sep 30, 2020
01b8e7c
add source to second step
kcpevey Sep 30, 2020
da6e46c
Adapt CI to run conda activate [ci skip]
kcpevey Oct 7, 2020
f7e91d7
Merge branch 'master' into add_gh_actions
kcpevey Oct 7, 2020
8d3049d
remove push to branch runs
kcpevey Oct 7, 2020
9af5001
job env vars are workflow vars, not bash vars
kcpevey Oct 14, 2020
17fd40b
test all recommended
kcpevey Oct 14, 2020
2bcb409
fetch depth [ci skip]
kcpevey Oct 16, 2020
d9dd6b9
Merge branch 'master' into add_gh_actions
kcpevey Oct 19, 2020
4158c39
move to coveralls action [ci skip]
kcpevey Oct 19, 2020
68e0ddc
run coveralls [ci skip]
kcpevey Oct 21, 2020
c1455ba
run coveralls [ci skip]
kcpevey Oct 21, 2020
82ee6d1
move github token to indiv step [ci skip]
kcpevey Oct 21, 2020
8d5f351
move github token to indiv step [ci skip]
kcpevey Oct 22, 2020
451b2ea
Merge branch 'master' into add_gh_actions
kcpevey Oct 26, 2020
41c26c7
fix matplotlib version in test, open up platforms and py versions
kcpevey Oct 30, 2020
745f458
commas are important
kcpevey Oct 30, 2020
92a3f78
github token fix [ci skip]
kcpevey Oct 30, 2020
e7a8d1d
github token revert [ci skip]
kcpevey Oct 30, 2020
f7bb80d
test regex for python version
kcpevey Oct 30, 2020
1c0b6e3
Drop 3.8 build for now
philippjfr Nov 2, 2020
c6e4176
Drop superfluous coveralls action
philippjfr Nov 2, 2020
deb8b61
Remove unused PKG TEST env var
philippjfr Nov 2, 2020
222913f
Enable 2.7 build
philippjfr Nov 2, 2020
8e81980
Fix condition
philippjfr Nov 2, 2020
8ffcc54
Try to fix condition
philippjfr Nov 2, 2020
33fca79
Another attempt
philippjfr Nov 2, 2020
f2d8a8e
Add coveralls token
philippjfr Nov 2, 2020
41a780d
Try to fix coveralls
philippjfr Nov 2, 2020
ba2b8b8
Only run example tests once
philippjfr Nov 2, 2020
a0b3449
Skip coveralls on py2.7
philippjfr Nov 2, 2020
bd80166
Add windows and mac to matrix
philippjfr Nov 2, 2020
5601dd1
Attempt to fix windows and OSX builds
philippjfr Nov 2, 2020
5eedd40
Remove miniconda-install
philippjfr Nov 2, 2020
20fd4e1
Remove --user
philippjfr Nov 2, 2020
2d25d6d
Use setup-miniconda action
philippjfr Nov 2, 2020
0e847b7
Reorder steps
philippjfr Nov 2, 2020
9dfbeee
Print matplotlib version
philippjfr Nov 2, 2020
24437a9
Use setup-miniconda v2
philippjfr Nov 2, 2020
3c40718
Install matplotlib from main channel
philippjfr Nov 2, 2020
822eaaf
Switch back to setup-minicona v1
philippjfr Nov 2, 2020
2dedb92
Remove tests from .travis.yml and appveyor
philippjfr Nov 2, 2020
b1e95f8
Attempt to fix matplotlib patch
philippjfr Nov 2, 2020
60bdc75
Readd env vars
philippjfr Nov 2, 2020
e303cf3
Readd flake check to .travis
philippjfr Nov 2, 2020
992c6af
Exclude windows/py2.7
philippjfr Nov 2, 2020
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
31 changes: 0 additions & 31 deletions .appveyor.yml

This file was deleted.

99 changes: 99 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
# things not included
# language
# notifications - no email notifications set up

name: pytest
on:
pull_request:
branches:
- '*'

jobs:
test_suite:
name: Pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
python-version: [2.7, 3.6, 3.7]
exclude:
- os: windows-latest
python-version: 2.7
timeout-minutes: 30
defaults:
run:
shell: bash -l {0}
env:
DESC: "Python ${{ matrix.python-version }} tests"
HV_REQUIREMENTS: "unit_tests"
PYTHON_VERSION: ${{ matrix.python-version }}
CHANS_DEV: "-c pyviz/label/dev -c bokeh"
CHANS: "-c pyviz"
MPLBACKEND: "Agg"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v2
with:
fetch-depth: "100"
- uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- uses: goanpeca/setup-miniconda@v1
with:
miniconda-version: "latest"
- name: Fetch unshallow
run: git fetch --prune --tags --unshallow
- name: conda setup
run: |
conda config --set always_yes True
conda install -c pyviz "pyctdev>=0.5"
doit ecosystem_setup
doit env_create ${{ env.CHANS_DEV}} --python=${{ matrix.python-version }}
- name: doit develop_install
run: |
eval "$(conda shell.bash hook)"
conda activate test-environment
conda list
doit develop_install ${{ env.CHANS_DEV}} -o ${{ env.HV_REQUIREMENTS }}
python -c "from param import version; print(version.Version.setup_version('.', 'holoviews', archive_commit='$Format:%h$'))"
echo "-----"
git describe
echo "======"
conda list
- name: matplotlib patch
if: startsWith(matrix.python-version, 3.)
run: |
eval "$(conda shell.bash hook)"
conda activate test-environment
conda uninstall matplotlib matplotlib-base --force
conda install matplotlib=3.0.3 --no-deps
python -c "import matplotlib; print(matplotlib.__version__);"
- name: doit env_capture
run: |
eval "$(conda shell.bash hook)"
conda activate test-environment
doit env_capture
- 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: run coveralls
env:
github-token: ${{ secrets.GITHUB_TOKEN }}
if: startsWith(matrix.python-version, 3.)
run: |
eval "$(conda shell.bash hook)"
conda activate test-environment
coveralls
10 changes: 3 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ env:
- MOZ_HEADLESS=1

stages:
- test
- name: extra_tests
if: type = cron
- name: conda_dev_package
Expand Down Expand Up @@ -58,7 +57,7 @@ jobs:
########## Test Stage ##########

- &default
stage: test
stage: env_setup
env: DESC="Python 3.6 tests" HV_REQUIREMENTS="unit_tests" PYTHON_VERSION=3.6
before_install:
- pip install pyctdev && doit miniconda_install && pip uninstall -y doit pyctdev
Expand All @@ -73,20 +72,17 @@ jobs:
- doit env_capture
- hash -r
script:
- doit test_all_recommended
- doit test_flakes
after_success: coveralls
after_failure: sleep 10

- <<: *default
env: DESC="Python 2.7 tests" PYTHON_VERSION=2.7 HV_REQUIREMENTS="unit_tests"

- &basic_deps
<<: *default
stage: extra_tests
env: DESC="Basic dependencies" HV_REQUIREMENTS="basic_tests"
after_success: echo "Success"
script:
- doit test_unit
after_success: echo "Success"

########## DOCS ##########

Expand Down
2 changes: 1 addition & 1 deletion holoviews/core/element.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def hist(self, dimension=None, num_bins=20, bin_range=None,


def __getitem__(self, key):
if key is ():
if key == ():
return self
else:
raise NotImplementedError("%s currently does not support getitem" %
Expand Down
2 changes: 1 addition & 1 deletion holoviews/core/layout.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ def dimension_values(self, dimension, expanded=True, flat=True):

def __getitem__(self, key):
"Index into the AdjointLayout by index or label"
if key is ():
if key == ():
return self

data_slice = None
Expand Down
2 changes: 1 addition & 1 deletion holoviews/element/tabular.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def __getitem__(self, heading):
"""
Get the value associated with the given heading (key).
"""
if heading is ():
if heading == ():
return self
if heading not in self.vdims:
raise KeyError("%r not in available headings." % heading)
Expand Down