From 593090622e9d7148f8f5b2a44d6df74f234776a4 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Thu, 3 Sep 2020 09:39:58 -0500 Subject: [PATCH 01/78] initial for testing --- .github/workflows/test.yml | 56 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000000..fa8f71303a --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,56 @@ +# things not included +# git depth (not an issue with gh actions) +# languaage +# notifications - no email notifications set up +# completely lost on stages name/if section + + +name: pytest +on: + pull_request: + branches: + - '*' +jobs: + env: + PKG_TEST_PYTHON: "--test-python=py37 --test-python=py27" + CHANS_DEV: "-c pyviz/label/dev -c bokeh" + CHANS: "-c pyviz" + MPLBACKEND: "Agg" + PYTHON_VERSION: 3.7 + default: + name: Pytest on ${{ matrix.python-version }}, ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: ['ubuntu-latest'] + python-version: [3.7] + timeout-minutes: 30 + env: + DESC: "Python 3.6 tests" # f strings? is this even necessary? + HV_REQUIREMENTS: "unit_tests" + PYTHON_VERSION: ${{ matrix.os }} + steps: + - uses: actions/checkout@v2 + - name: pre_install + run: | + pip install pyctdev && doit miniconda_install && pip uninstall -y doit pyctdev + export PATH="$HOME/miniconda/bin:$PATH" && hash -r + conda config --set always_yes True + conda install -c pyviz "pyctdev>=0.5" && doit ecosystem_setup + - name: install + run: | + doit env_create $CHANS_DEV --python=$PYTHON_VERSION + source activate test-environment + doit develop_install $CHANS_DEV -o $HV_REQUIREMENTS + doit env_capture + - name: conda config + shell: bash -l {0} + run: conda config --show + - name: conda list + shell: bash -l {0} + run: conda list + - name: test_all_recommended + run: doit test_all_recommended + - name: coveralls # todo add if statement - if success coveralls, if fail, sleep 10 + run: coveralls \ No newline at end of file From c47bc2d4bf7125be2a5c2ea8e1212e53cc95c99a Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Thu, 3 Sep 2020 09:47:51 -0500 Subject: [PATCH 02/78] syntax fix [ci skip] --- .github/workflows/test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fa8f71303a..bd6c693091 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -39,11 +39,11 @@ jobs: conda config --set always_yes True conda install -c pyviz "pyctdev>=0.5" && doit ecosystem_setup - name: install - run: | - doit env_create $CHANS_DEV --python=$PYTHON_VERSION - source activate test-environment - doit develop_install $CHANS_DEV -o $HV_REQUIREMENTS - doit env_capture + run: | + doit env_create $CHANS_DEV --python=$PYTHON_VERSION + source activate test-environment + doit develop_install $CHANS_DEV -o $HV_REQUIREMENTS + doit env_capture - name: conda config shell: bash -l {0} run: conda config --show From c6abf977cfcef3dc46162d581e66e263c4568cc4 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Thu, 3 Sep 2020 09:51:26 -0500 Subject: [PATCH 03/78] syntax fix [ci skip] --- .github/workflows/test.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bd6c693091..56f304a55e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,12 +11,6 @@ on: branches: - '*' jobs: - env: - PKG_TEST_PYTHON: "--test-python=py37 --test-python=py27" - CHANS_DEV: "-c pyviz/label/dev -c bokeh" - CHANS: "-c pyviz" - MPLBACKEND: "Agg" - PYTHON_VERSION: 3.7 default: name: Pytest on ${{ matrix.python-version }}, ${{ matrix.os }} runs-on: ${{ matrix.os }} @@ -30,6 +24,11 @@ jobs: DESC: "Python 3.6 tests" # f strings? is this even necessary? HV_REQUIREMENTS: "unit_tests" PYTHON_VERSION: ${{ matrix.os }} + PKG_TEST_PYTHON: "--test-python=py37 --test-python=py27" + CHANS_DEV: "-c pyviz/label/dev -c bokeh" + CHANS: "-c pyviz" + MPLBACKEND: "Agg" + PYTHON_VERSION: 3.7 steps: - uses: actions/checkout@v2 - name: pre_install From c6f4c388886e9baf25f3a887a642d5f27739b8f2 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Thu, 3 Sep 2020 09:52:03 -0500 Subject: [PATCH 04/78] syntax fix [ci skip] --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 56f304a55e..da109a9406 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,7 +28,6 @@ jobs: CHANS_DEV: "-c pyviz/label/dev -c bokeh" CHANS: "-c pyviz" MPLBACKEND: "Agg" - PYTHON_VERSION: 3.7 steps: - uses: actions/checkout@v2 - name: pre_install From 36c2fd798f1a75527ae4f9b37a8be12faee6de3e Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Thu, 3 Sep 2020 09:57:05 -0500 Subject: [PATCH 05/78] syntax fix [ci skip] --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index da109a9406..db6ce57c20 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@v2 - name: pre_install run: | - pip install pyctdev && doit miniconda_install && pip uninstall -y doit pyctdev + pip install pyctdev && pip install wheel && doit miniconda_install && pip uninstall -y doit pyctdev export PATH="$HOME/miniconda/bin:$PATH" && hash -r conda config --set always_yes True conda install -c pyviz "pyctdev>=0.5" && doit ecosystem_setup From ed58069cfb0a81ecf249f3197e9ffe82a88dd199 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Thu, 3 Sep 2020 09:58:07 -0500 Subject: [PATCH 06/78] install pip wheel [ci skip] --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index db6ce57c20..68d992d81e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@v2 - name: pre_install run: | - pip install pyctdev && pip install wheel && doit miniconda_install && pip uninstall -y doit pyctdev + pip install wheel && pip install pyctdev && doit miniconda_install && pip uninstall -y doit pyctdev export PATH="$HOME/miniconda/bin:$PATH" && hash -r conda config --set always_yes True conda install -c pyviz "pyctdev>=0.5" && doit ecosystem_setup From a10d31d61141489d26644feb18a3cefa67fe03f9 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Thu, 3 Sep 2020 10:25:19 -0500 Subject: [PATCH 07/78] add print statements [ci skip] --- .github/workflows/test.yml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 68d992d81e..60990d3c54 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -32,10 +32,23 @@ jobs: - uses: actions/checkout@v2 - name: pre_install run: | - pip install wheel && pip install pyctdev && doit miniconda_install && pip uninstall -y doit pyctdev - export PATH="$HOME/miniconda/bin:$PATH" && hash -r + echo "install wheel" + pip install wheel + echo "install pyctdev" + pip install pyctdev + echo "first doit use" + doit miniconda_install + echo "miniconda installed" + pip uninstall -y doit pyctdev + pip list + - name: conda setup + run: | + export PATH="$HOME/miniconda/bin:$PATH" + hash -r conda config --set always_yes True - conda install -c pyviz "pyctdev>=0.5" && doit ecosystem_setup + conda install -c pyviz "pyctdev>=0.5" + echo "second doit use" + doit ecosystem_setup - name: install run: | doit env_create $CHANS_DEV --python=$PYTHON_VERSION From ac802f7482d8e39a76ed780fe9a58835fd93e089 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Thu, 3 Sep 2020 10:45:58 -0500 Subject: [PATCH 08/78] add pip update [ci skip] --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 60990d3c54..a0eebf1ad6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -32,15 +32,16 @@ jobs: - uses: actions/checkout@v2 - name: pre_install run: | + python -m pip install --upgrade pip echo "install wheel" pip install wheel echo "install pyctdev" pip install pyctdev + pip list echo "first doit use" doit miniconda_install echo "miniconda installed" pip uninstall -y doit pyctdev - pip list - name: conda setup run: | export PATH="$HOME/miniconda/bin:$PATH" From 0ff983077a2dc47c76a5eb74b0466c3d9b493095 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Thu, 3 Sep 2020 10:51:42 -0500 Subject: [PATCH 09/78] add python [ci skip] --- .github/workflows/test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a0eebf1ad6..cca13aa4d2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,6 +30,9 @@ jobs: MPLBACKEND: "Agg" steps: - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python }} - name: pre_install run: | python -m pip install --upgrade pip From d83ea8b1fd4501ffb6ee2f0981d07164943c18ea Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Thu, 3 Sep 2020 10:53:08 -0500 Subject: [PATCH 10/78] syntax [ci skip] --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cca13aa4d2..d1444c7a5c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,8 +31,8 @@ jobs: steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python }} + with: + python-version: ${{ matrix.python }} - name: pre_install run: | python -m pip install --upgrade pip From 9ada51818d7f4491ca71eec025003aaf1da73ca1 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Thu, 3 Sep 2020 10:59:23 -0500 Subject: [PATCH 11/78] death by a thousand mistakes [ci skip] --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d1444c7a5c..e5fbffb2a0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 with: - python-version: ${{ matrix.python }} + python-version: ${{ matrix.python-version }} - name: pre_install run: | python -m pip install --upgrade pip From c6316f6cf762eb37a865b83e183948f21395f749 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Thu, 3 Sep 2020 11:29:02 -0500 Subject: [PATCH 12/78] cleanup [ci skip] --- .github/workflows/test.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e5fbffb2a0..6c240a54b4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ jobs: env: DESC: "Python 3.6 tests" # f strings? is this even necessary? HV_REQUIREMENTS: "unit_tests" - PYTHON_VERSION: ${{ matrix.os }} + PYTHON_VERSION: ${{ matrix.python-version }} PKG_TEST_PYTHON: "--test-python=py37 --test-python=py27" CHANS_DEV: "-c pyviz/label/dev -c bokeh" CHANS: "-c pyviz" @@ -36,14 +36,9 @@ jobs: - name: pre_install run: | python -m pip install --upgrade pip - echo "install wheel" pip install wheel - echo "install pyctdev" pip install pyctdev - pip list - echo "first doit use" doit miniconda_install - echo "miniconda installed" pip uninstall -y doit pyctdev - name: conda setup run: | @@ -53,8 +48,11 @@ jobs: conda install -c pyviz "pyctdev>=0.5" echo "second doit use" doit ecosystem_setup + - name: conda list + run: conda list - name: install run: | + pip list doit env_create $CHANS_DEV --python=$PYTHON_VERSION source activate test-environment doit develop_install $CHANS_DEV -o $HV_REQUIREMENTS From 911bf6045b1867dce8a82049a0d6862894c73b8b Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Thu, 3 Sep 2020 15:46:46 -0500 Subject: [PATCH 13/78] trial and error debug [ci skip] --- .github/workflows/test.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6c240a54b4..931a61aa9c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,10 +36,10 @@ jobs: - name: pre_install run: | python -m pip install --upgrade pip - pip install wheel pip install pyctdev doit miniconda_install pip uninstall -y doit pyctdev + which doit - name: conda setup run: | export PATH="$HOME/miniconda/bin:$PATH" @@ -47,12 +47,13 @@ jobs: conda config --set always_yes True conda install -c pyviz "pyctdev>=0.5" echo "second doit use" + which doit doit ecosystem_setup - name: conda list run: conda list - name: install run: | - pip list + which doit doit env_create $CHANS_DEV --python=$PYTHON_VERSION source activate test-environment doit develop_install $CHANS_DEV -o $HV_REQUIREMENTS From 576e0df1f0ea47f9966aefa8ad93a819053e6bc5 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Thu, 3 Sep 2020 16:00:21 -0500 Subject: [PATCH 14/78] rm hash -r [ci skip] --- .github/workflows/test.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 931a61aa9c..f89911f9db 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -39,21 +39,17 @@ jobs: pip install pyctdev doit miniconda_install pip uninstall -y doit pyctdev - which doit - name: conda setup run: | export PATH="$HOME/miniconda/bin:$PATH" - hash -r conda config --set always_yes True conda install -c pyviz "pyctdev>=0.5" echo "second doit use" - which doit doit ecosystem_setup - name: conda list run: conda list - name: install run: | - which doit doit env_create $CHANS_DEV --python=$PYTHON_VERSION source activate test-environment doit develop_install $CHANS_DEV -o $HV_REQUIREMENTS From c2ca1d2ea97e794f61dfe935d6a4d92e7a19bd6f Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Thu, 3 Sep 2020 16:03:18 -0500 Subject: [PATCH 15/78] rm the rm of doit [ci skip] --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f89911f9db..bd38fe1ce5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -38,7 +38,6 @@ jobs: python -m pip install --upgrade pip pip install pyctdev doit miniconda_install - pip uninstall -y doit pyctdev - name: conda setup run: | export PATH="$HOME/miniconda/bin:$PATH" From 58ee94324aefc160f25f8bea07b14a927ec57c50 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Thu, 3 Sep 2020 16:06:38 -0500 Subject: [PATCH 16/78] use conda activate [ci skip] --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bd38fe1ce5..1ed0d528dc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,7 +50,7 @@ jobs: - name: install run: | doit env_create $CHANS_DEV --python=$PYTHON_VERSION - source activate test-environment + conda activate test-environment doit develop_install $CHANS_DEV -o $HV_REQUIREMENTS doit env_capture - name: conda config From e298fdf017b097e5d25fe1732599b6627ab7f354 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Thu, 3 Sep 2020 16:16:54 -0500 Subject: [PATCH 17/78] fix conda activate [ci skip] --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1ed0d528dc..2dcf4fdfe3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,6 +50,7 @@ jobs: - name: install run: | doit env_create $CHANS_DEV --python=$PYTHON_VERSION + eval "$(conda shell.bash hook)" conda activate test-environment doit develop_install $CHANS_DEV -o $HV_REQUIREMENTS doit env_capture From b3a87b9b4ef87a363946bb64c9abfba6958a50c9 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Thu, 3 Sep 2020 16:23:01 -0500 Subject: [PATCH 18/78] add flake8 [ci skip] --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2dcf4fdfe3..952be743e4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,7 +36,7 @@ jobs: - name: pre_install run: | python -m pip install --upgrade pip - pip install pyctdev + pip install pyctdev flake8 doit miniconda_install - name: conda setup run: | @@ -52,6 +52,7 @@ jobs: doit env_create $CHANS_DEV --python=$PYTHON_VERSION eval "$(conda shell.bash hook)" conda activate test-environment + doit develop_install $CHANS_DEV -o $HV_REQUIREMENTS doit env_capture - name: conda config From 12d7849b431e0471f307908b882414bb04dcea88 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Fri, 4 Sep 2020 07:48:18 -0500 Subject: [PATCH 19/78] test individually[ci skip] --- .github/workflows/test.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 952be743e4..8dcd9b6be9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -45,8 +45,6 @@ jobs: conda install -c pyviz "pyctdev>=0.5" echo "second doit use" doit ecosystem_setup - - name: conda list - run: conda list - name: install run: | doit env_create $CHANS_DEV --python=$PYTHON_VERSION @@ -55,13 +53,18 @@ jobs: doit develop_install $CHANS_DEV -o $HV_REQUIREMENTS doit env_capture - - name: conda config - shell: bash -l {0} - run: conda config --show - name: conda list shell: bash -l {0} run: conda list - - name: test_all_recommended - run: doit test_all_recommended + + - name: flake8 + run: doit test_flakes + + - name: unit tests + run: doit test_unit + - name: test examples + run: doit test_examples + # - name: test_all_recommended + # run: doit test_all_recommended - name: coveralls # todo add if statement - if success coveralls, if fail, sleep 10 run: coveralls \ No newline at end of file From 476c65d53a492bb5452837b14086a89642233529 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Fri, 4 Sep 2020 08:06:45 -0500 Subject: [PATCH 20/78] flake fixes [ci skip] --- holoviews/core/element.py | 2 +- holoviews/core/layout.py | 2 +- holoviews/element/tabular.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/holoviews/core/element.py b/holoviews/core/element.py index 5f3b8c41c8..fc9f4d5dae 100644 --- a/holoviews/core/element.py +++ b/holoviews/core/element.py @@ -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" % diff --git a/holoviews/core/layout.py b/holoviews/core/layout.py index 50efcb31e0..aa24b2335c 100644 --- a/holoviews/core/layout.py +++ b/holoviews/core/layout.py @@ -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 diff --git a/holoviews/element/tabular.py b/holoviews/element/tabular.py index bff59938b3..a4cf236f40 100644 --- a/holoviews/element/tabular.py +++ b/holoviews/element/tabular.py @@ -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) From e714afa0e56bce0450c0ddcbfe5821de7933cde5 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Fri, 4 Sep 2020 09:00:21 -0500 Subject: [PATCH 21/78] add nose [ci skip] --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8dcd9b6be9..40eb9c0f47 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,7 +36,7 @@ jobs: - name: pre_install run: | python -m pip install --upgrade pip - pip install pyctdev flake8 + pip install pyctdev flake8 nose doit miniconda_install - name: conda setup run: | From 626fbaaa04ac1959b7e61deba1ac11e9dbbe1e8b Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Fri, 4 Sep 2020 13:10:20 -0500 Subject: [PATCH 22/78] add hash -r[ci skip] --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 40eb9c0f47..768ea7e846 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,7 +40,7 @@ jobs: doit miniconda_install - name: conda setup run: | - export PATH="$HOME/miniconda/bin:$PATH" + export PATH="$HOME/miniconda/bin:$PATH" && hash -r conda config --set always_yes True conda install -c pyviz "pyctdev>=0.5" echo "second doit use" From 26e17c1108bc81030d5ebbe233681072dc43662e Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Fri, 4 Sep 2020 13:19:43 -0500 Subject: [PATCH 23/78] syntax around env vars [ci skip] --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 768ea7e846..0159719f74 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -47,11 +47,11 @@ jobs: doit ecosystem_setup - name: install run: | - doit env_create $CHANS_DEV --python=$PYTHON_VERSION + doit env_create ${CHANS_DEV} --python=${{ matrix.python-version }} eval "$(conda shell.bash hook)" conda activate test-environment - doit develop_install $CHANS_DEV -o $HV_REQUIREMENTS + doit develop_install ${CHANS_DEV} -o ${HV_REQUIREMENTS} doit env_capture - name: conda list shell: bash -l {0} From 46d3f032112e4c5ba2238aa673565360f350fd7f Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Fri, 4 Sep 2020 13:30:22 -0500 Subject: [PATCH 24/78] reactivate env [ci skip] --- .github/workflows/test.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0159719f74..2e2df1ba32 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -53,15 +53,17 @@ jobs: doit develop_install ${CHANS_DEV} -o ${HV_REQUIREMENTS} doit env_capture - - name: conda list - shell: bash -l {0} - run: conda list + conda list - name: flake8 run: doit test_flakes - name: unit tests - run: doit test_unit + run: | + conda list + conda activate test-environment + conda list + doit test_unit - name: test examples run: doit test_examples # - name: test_all_recommended From 729c17a29294f6c4eba6f19e204b8cb911f941fc Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Fri, 4 Sep 2020 13:38:06 -0500 Subject: [PATCH 25/78] run in together [ci skip] --- .github/workflows/test.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2e2df1ba32..f17dafca25 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -45,8 +45,7 @@ jobs: conda install -c pyviz "pyctdev>=0.5" echo "second doit use" doit ecosystem_setup - - name: install - run: | + doit env_create ${CHANS_DEV} --python=${{ matrix.python-version }} eval "$(conda shell.bash hook)" conda activate test-environment @@ -55,14 +54,12 @@ jobs: doit env_capture conda list - - name: flake8 - run: doit test_flakes - - name: unit tests - run: | - conda list - conda activate test-environment - conda list + doit test_flakes + + + # conda activate test-environment + # conda list doit test_unit - name: test examples run: doit test_examples From 3c24317c0e4979a26752ac1345b0774bd8e8f52d Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Fri, 4 Sep 2020 13:39:38 -0500 Subject: [PATCH 26/78] stupid yml syntax [ci skip] --- .github/workflows/test.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f17dafca25..c0c410dac3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -57,13 +57,8 @@ jobs: doit test_flakes - - # conda activate test-environment - # conda list doit test_unit - name: test examples run: doit test_examples - # - name: test_all_recommended - # run: doit test_all_recommended - name: coveralls # todo add if statement - if success coveralls, if fail, sleep 10 run: coveralls \ No newline at end of file From 2f524a636bc24b1677f9b6a5e5b8282b0e8c3002 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Fri, 18 Sep 2020 12:48:41 -0500 Subject: [PATCH 27/78] break doit steps up into gh action steps --- .github/workflows/test.yml | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c0c410dac3..5e31939a69 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,22 +43,35 @@ jobs: export PATH="$HOME/miniconda/bin:$PATH" && hash -r conda config --set always_yes True conda install -c pyviz "pyctdev>=0.5" - echo "second doit use" doit ecosystem_setup - doit env_create ${CHANS_DEV} --python=${{ matrix.python-version }} eval "$(conda shell.bash hook)" conda activate test-environment - + - name: doit develop_install + run: | + ##vso[task.prependpath]($HOME)/miniconda3/bin doit develop_install ${CHANS_DEV} -o ${HV_REQUIREMENTS} + - name: doit env_capture + run: | + ##vso[task.prependpath]($HOME)/miniconda3/bin doit env_capture + - name: conda list + run: | + ##vso[task.prependpath]($HOME)/miniconda3/bin conda list - - + - name: doit test_flakes + run: | + ##vso[task.prependpath]($HOME)/miniconda3/bin doit test_flakes - + - name: doit test_unit + run: | + ##vso[task.prependpath]($HOME)/miniconda3/bin doit test_unit - name: test examples - run: doit test_examples - - name: coveralls # todo add if statement - if success coveralls, if fail, sleep 10 - run: coveralls \ No newline at end of file + run: | + ##vso[task.prependpath]($HOME)/miniconda3/bin + doit test_examples + - name: coveralls + run: | + ##vso[task.prependpath]($HOME)/miniconda3/bin + coveralls From 08a71015880c41e4180c1f4e12bcb8a58043fd2d Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Fri, 18 Sep 2020 13:04:04 -0500 Subject: [PATCH 28/78] point to different conda location [ci skip] --- .github/workflows/test.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5e31939a69..471b9e863e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -49,29 +49,30 @@ jobs: conda activate test-environment - name: doit develop_install run: | - ##vso[task.prependpath]($HOME)/miniconda3/bin + ##vso[task.prependpath]($HOME)/miniconda/bin + conda list doit develop_install ${CHANS_DEV} -o ${HV_REQUIREMENTS} - name: doit env_capture run: | - ##vso[task.prependpath]($HOME)/miniconda3/bin + ##vso[task.prependpath]($HOME)/miniconda/bin doit env_capture - name: conda list run: | - ##vso[task.prependpath]($HOME)/miniconda3/bin + ##vso[task.prependpath]($HOME)/miniconda/bin conda list - name: doit test_flakes run: | - ##vso[task.prependpath]($HOME)/miniconda3/bin + ##vso[task.prependpath]($HOME)/miniconda/bin doit test_flakes - name: doit test_unit run: | - ##vso[task.prependpath]($HOME)/miniconda3/bin + ##vso[task.prependpath]($HOME)/miniconda/bin doit test_unit - name: test examples run: | - ##vso[task.prependpath]($HOME)/miniconda3/bin + ##vso[task.prependpath]($HOME)/miniconda/bin doit test_examples - name: coveralls run: | - ##vso[task.prependpath]($HOME)/miniconda3/bin + ##vso[task.prependpath]($HOME)/miniconda/bin coveralls From 27c376dbcb373ad01ff694d04438d4740c88b441 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Fri, 18 Sep 2020 13:07:47 -0500 Subject: [PATCH 29/78] activate env in each step [ci skip] --- .github/workflows/test.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 471b9e863e..eb33674608 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,29 +50,36 @@ jobs: - name: doit develop_install run: | ##vso[task.prependpath]($HOME)/miniconda/bin + conda activate test-environment conda list doit develop_install ${CHANS_DEV} -o ${HV_REQUIREMENTS} - name: doit env_capture run: | ##vso[task.prependpath]($HOME)/miniconda/bin + conda activate test-environment doit env_capture - name: conda list run: | ##vso[task.prependpath]($HOME)/miniconda/bin + conda activate test-environment conda list - name: doit test_flakes run: | ##vso[task.prependpath]($HOME)/miniconda/bin + conda activate test-environment doit test_flakes - name: doit test_unit run: | ##vso[task.prependpath]($HOME)/miniconda/bin + conda activate test-environment doit test_unit - name: test examples run: | ##vso[task.prependpath]($HOME)/miniconda/bin + conda activate test-environment doit test_examples - name: coveralls run: | ##vso[task.prependpath]($HOME)/miniconda/bin + conda activate test-environment coveralls From 316fb9edbb0174b883e12b987085e6854961faf0 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Fri, 18 Sep 2020 13:28:33 -0500 Subject: [PATCH 30/78] append path syntax [ci skip] --- .github/workflows/test.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index eb33674608..5695b54d70 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -49,37 +49,37 @@ jobs: conda activate test-environment - name: doit develop_install run: | - ##vso[task.prependpath]($HOME)/miniconda/bin + echo "::add-path::$HOME/miniconda3/bin" conda activate test-environment conda list doit develop_install ${CHANS_DEV} -o ${HV_REQUIREMENTS} - name: doit env_capture run: | - ##vso[task.prependpath]($HOME)/miniconda/bin + echo "::add-path::$HOME/miniconda3/bin" conda activate test-environment doit env_capture - name: conda list run: | - ##vso[task.prependpath]($HOME)/miniconda/bin + echo "::add-path::$HOME/miniconda3/bin" conda activate test-environment conda list - name: doit test_flakes run: | - ##vso[task.prependpath]($HOME)/miniconda/bin + echo "::add-path::$HOME/miniconda3/bin" conda activate test-environment doit test_flakes - name: doit test_unit run: | - ##vso[task.prependpath]($HOME)/miniconda/bin + echo "::add-path::$HOME/miniconda3/bin" conda activate test-environment doit test_unit - name: test examples run: | - ##vso[task.prependpath]($HOME)/miniconda/bin + echo "::add-path::$HOME/miniconda3/bin" conda activate test-environment doit test_examples - name: coveralls run: | - ##vso[task.prependpath]($HOME)/miniconda/bin + echo "::add-path::$HOME/miniconda3/bin" conda activate test-environment coveralls From 6f09377d14ea10c40ec18226ed1b665faf81d76e Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Fri, 18 Sep 2020 14:36:34 -0500 Subject: [PATCH 31/78] set global shell [ci skip] --- .github/workflows/test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5695b54d70..81b7aba367 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,9 +1,6 @@ # things not included -# git depth (not an issue with gh actions) -# languaage +# language # notifications - no email notifications set up -# completely lost on stages name/if section - name: pytest on: @@ -11,7 +8,7 @@ on: branches: - '*' jobs: - default: + test_suite: name: Pytest on ${{ matrix.python-version }}, ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: @@ -20,6 +17,9 @@ jobs: os: ['ubuntu-latest'] python-version: [3.7] timeout-minutes: 30 + defaults: + run: + shell: bash -l {0} env: DESC: "Python 3.6 tests" # f strings? is this even necessary? HV_REQUIREMENTS: "unit_tests" From 2029ca1a4f27f7a82db63da535ae059c771340a5 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Fri, 18 Sep 2020 14:41:32 -0500 Subject: [PATCH 32/78] set shell on individual steps [ci skip] --- .github/workflows/test.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 81b7aba367..6668716f12 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,11 +34,13 @@ jobs: with: python-version: ${{ matrix.python-version }} - name: pre_install + shell: bash -l {0} run: | python -m pip install --upgrade pip pip install pyctdev flake8 nose doit miniconda_install - name: conda setup + shell: bash -l {0} run: | export PATH="$HOME/miniconda/bin:$PATH" && hash -r conda config --set always_yes True @@ -48,37 +50,44 @@ jobs: eval "$(conda shell.bash hook)" conda activate test-environment - name: doit develop_install + shell: bash -l {0} run: | echo "::add-path::$HOME/miniconda3/bin" conda activate test-environment conda list doit develop_install ${CHANS_DEV} -o ${HV_REQUIREMENTS} - name: doit env_capture + shell: bash -l {0} run: | echo "::add-path::$HOME/miniconda3/bin" conda activate test-environment doit env_capture - name: conda list + shell: bash -l {0} run: | echo "::add-path::$HOME/miniconda3/bin" conda activate test-environment conda list - name: doit test_flakes + shell: bash -l {0} run: | echo "::add-path::$HOME/miniconda3/bin" conda activate test-environment doit test_flakes - name: doit test_unit + shell: bash -l {0} run: | echo "::add-path::$HOME/miniconda3/bin" conda activate test-environment doit test_unit - name: test examples + shell: bash -l {0} run: | echo "::add-path::$HOME/miniconda3/bin" conda activate test-environment doit test_examples - name: coveralls + shell: bash -l {0} run: | echo "::add-path::$HOME/miniconda3/bin" conda activate test-environment From e6d583c9c1f14cc62eb41e4e6a848d2575e3a119 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Fri, 18 Sep 2020 14:50:02 -0500 Subject: [PATCH 33/78] conda init [ci skip] --- .github/workflows/test.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6668716f12..1beccbf064 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -39,6 +39,7 @@ jobs: python -m pip install --upgrade pip pip install pyctdev flake8 nose doit miniconda_install + conda init - name: conda setup shell: bash -l {0} run: | @@ -52,43 +53,29 @@ jobs: - name: doit develop_install shell: bash -l {0} run: | - echo "::add-path::$HOME/miniconda3/bin" - conda activate test-environment conda list doit develop_install ${CHANS_DEV} -o ${HV_REQUIREMENTS} - name: doit env_capture shell: bash -l {0} run: | - echo "::add-path::$HOME/miniconda3/bin" - conda activate test-environment doit env_capture - name: conda list shell: bash -l {0} run: | - echo "::add-path::$HOME/miniconda3/bin" - conda activate test-environment conda list - name: doit test_flakes shell: bash -l {0} run: | - echo "::add-path::$HOME/miniconda3/bin" - conda activate test-environment doit test_flakes - name: doit test_unit shell: bash -l {0} run: | - echo "::add-path::$HOME/miniconda3/bin" - conda activate test-environment doit test_unit - name: test examples shell: bash -l {0} run: | - echo "::add-path::$HOME/miniconda3/bin" - conda activate test-environment doit test_examples - name: coveralls shell: bash -l {0} run: | - echo "::add-path::$HOME/miniconda3/bin" - conda activate test-environment coveralls From d9c43d45995e90582c073f940cb06700a273e452 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Fri, 18 Sep 2020 14:55:57 -0500 Subject: [PATCH 34/78] conda activate [ci skip] --- .github/workflows/test.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1beccbf064..5542f2f8a1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -53,29 +53,36 @@ jobs: - name: doit develop_install shell: bash -l {0} run: | + conda activate test-environment conda list doit develop_install ${CHANS_DEV} -o ${HV_REQUIREMENTS} - name: doit env_capture shell: bash -l {0} run: | + conda activate test-environment doit env_capture - name: conda list shell: bash -l {0} run: | + conda activate test-environment conda list - name: doit test_flakes shell: bash -l {0} run: | + conda activate test-environment doit test_flakes - name: doit test_unit shell: bash -l {0} run: | + conda activate test-environment doit test_unit - name: test examples shell: bash -l {0} run: | + conda activate test-environment doit test_examples - name: coveralls shell: bash -l {0} run: | + conda activate test-environment coveralls From 8b3e6757a5eb8a4696147509a33218666d24c98a Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Fri, 18 Sep 2020 15:36:43 -0500 Subject: [PATCH 35/78] hook conda commands [ci skip] --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5542f2f8a1..2e275ff4fc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,6 +40,7 @@ jobs: pip install pyctdev flake8 nose doit miniconda_install conda init + eval "$(conda shell.bash hook)" - name: conda setup shell: bash -l {0} run: | @@ -48,7 +49,6 @@ jobs: conda install -c pyviz "pyctdev>=0.5" doit ecosystem_setup doit env_create ${CHANS_DEV} --python=${{ matrix.python-version }} - eval "$(conda shell.bash hook)" conda activate test-environment - name: doit develop_install shell: bash -l {0} From ed98584aaeef45a1c5ce1db9acb5f2a29e604a4e Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Wed, 30 Sep 2020 14:21:17 -0500 Subject: [PATCH 36/78] source bashrc --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2e275ff4fc..1fc969a9ea 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -39,7 +39,8 @@ jobs: python -m pip install --upgrade pip pip install pyctdev flake8 nose doit miniconda_install - conda init + conda init bash + source ~/.bashrc eval "$(conda shell.bash hook)" - name: conda setup shell: bash -l {0} From 01b8e7c70f9e127e64608e7e916e2f78dda4233e Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Wed, 30 Sep 2020 14:26:35 -0500 Subject: [PATCH 37/78] add source to second step --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1fc969a9ea..629e04f942 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -45,6 +45,7 @@ jobs: - name: conda setup shell: bash -l {0} run: | + source ~/.bashrc export PATH="$HOME/miniconda/bin:$PATH" && hash -r conda config --set always_yes True conda install -c pyviz "pyctdev>=0.5" From da6e46cc7864bcd3a596c488e99b80adb00ffcec Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Wed, 7 Oct 2020 08:18:31 -0500 Subject: [PATCH 38/78] Adapt CI to run conda activate [ci skip] --- .github/workflows/test.yml | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 629e04f942..bdc572d87f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,6 +7,10 @@ on: pull_request: branches: - '*' + push: + branches: + - '*' + jobs: test_suite: name: Pytest on ${{ matrix.python-version }}, ${{ matrix.os }} @@ -34,57 +38,50 @@ jobs: with: python-version: ${{ matrix.python-version }} - name: pre_install - shell: bash -l {0} run: | python -m pip install --upgrade pip pip install pyctdev flake8 nose - doit miniconda_install - conda init bash - source ~/.bashrc - eval "$(conda shell.bash hook)" - name: conda setup - shell: bash -l {0} run: | - source ~/.bashrc - export PATH="$HOME/miniconda/bin:$PATH" && hash -r conda config --set always_yes True conda install -c pyviz "pyctdev>=0.5" doit ecosystem_setup doit env_create ${CHANS_DEV} --python=${{ matrix.python-version }} + eval "$(conda shell.bash hook)" conda activate test-environment - name: doit develop_install - shell: bash -l {0} run: | + eval "$(conda shell.bash hook)" conda activate test-environment conda list doit develop_install ${CHANS_DEV} -o ${HV_REQUIREMENTS} - name: doit env_capture - shell: bash -l {0} run: | + eval "$(conda shell.bash hook)" conda activate test-environment doit env_capture - name: conda list - shell: bash -l {0} run: | + eval "$(conda shell.bash hook)" conda activate test-environment conda list - name: doit test_flakes - shell: bash -l {0} run: | + eval "$(conda shell.bash hook)" conda activate test-environment doit test_flakes - name: doit test_unit - shell: bash -l {0} run: | + eval "$(conda shell.bash hook)" conda activate test-environment doit test_unit - name: test examples - shell: bash -l {0} run: | + eval "$(conda shell.bash hook)" conda activate test-environment doit test_examples - name: coveralls - shell: bash -l {0} run: | + eval "$(conda shell.bash hook)" conda activate test-environment coveralls From 8d3049d1209142ce58bf2db85e79df27b6e38148 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Wed, 7 Oct 2020 12:20:01 -0500 Subject: [PATCH 39/78] remove push to branch runs --- .github/workflows/test.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bdc572d87f..dce8fb69b9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,9 +7,6 @@ on: pull_request: branches: - '*' - push: - branches: - - '*' jobs: test_suite: From 9af5001f602fd68db9e4e960f5d303237ee73d61 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Wed, 14 Oct 2020 14:17:46 -0500 Subject: [PATCH 40/78] job env vars are workflow vars, not bash vars --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dce8fb69b9..be3d9960fe 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,7 +22,7 @@ jobs: run: shell: bash -l {0} env: - DESC: "Python 3.6 tests" # f strings? is this even necessary? + DESC: "Python 3.7 tests" # f strings? is this even necessary? HV_REQUIREMENTS: "unit_tests" PYTHON_VERSION: ${{ matrix.python-version }} PKG_TEST_PYTHON: "--test-python=py37 --test-python=py27" @@ -43,7 +43,7 @@ jobs: conda config --set always_yes True conda install -c pyviz "pyctdev>=0.5" doit ecosystem_setup - doit env_create ${CHANS_DEV} --python=${{ matrix.python-version }} + doit env_create ${{ env.CHANS_DEV}} --python=${{ matrix.python-version }} eval "$(conda shell.bash hook)" conda activate test-environment - name: doit develop_install @@ -51,7 +51,7 @@ jobs: eval "$(conda shell.bash hook)" conda activate test-environment conda list - doit develop_install ${CHANS_DEV} -o ${HV_REQUIREMENTS} + doit develop_install ${{ env.CHANS_DEV}} -o ${{ env.HV_REQUIREMENTS }} - name: doit env_capture run: | eval "$(conda shell.bash hook)" From 17fd40be8af414501d6512c142454f4d4fb6ded3 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Wed, 14 Oct 2020 15:30:51 -0500 Subject: [PATCH 41/78] test all recommended --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index be3d9960fe..0ba4b354a6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -67,11 +67,11 @@ jobs: eval "$(conda shell.bash hook)" conda activate test-environment doit test_flakes - - name: doit test_unit + - name: doit test_all_recommended run: | eval "$(conda shell.bash hook)" conda activate test-environment - doit test_unit + doit test_all_recommended - name: test examples run: | eval "$(conda shell.bash hook)" From 2bcb4091edee691b705226265578d40c6f305582 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Fri, 16 Oct 2020 09:08:09 -0500 Subject: [PATCH 42/78] fetch depth [ci skip] --- .github/workflows/test.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0ba4b354a6..3d904629ff 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,7 +22,7 @@ jobs: run: shell: bash -l {0} env: - DESC: "Python 3.7 tests" # f strings? is this even necessary? + DESC: "Python 3.7 tests" # is this even necessary ? HV_REQUIREMENTS: "unit_tests" PYTHON_VERSION: ${{ matrix.python-version }} PKG_TEST_PYTHON: "--test-python=py37 --test-python=py27" @@ -31,13 +31,17 @@ jobs: MPLBACKEND: "Agg" steps: - uses: actions/checkout@v2 + with: + fetch-depth: "100" - uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} + - name: Fetch unshallow + run: git fetch --prune --tags --unshallow - name: pre_install run: | python -m pip install --upgrade pip - pip install pyctdev flake8 nose + python -m pip install pyctdev flake8 nose - name: conda setup run: | conda config --set always_yes True @@ -52,6 +56,11 @@ jobs: 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: doit env_capture run: | eval "$(conda shell.bash hook)" @@ -81,4 +90,4 @@ jobs: run: | eval "$(conda shell.bash hook)" conda activate test-environment - coveralls + coveralls \ No newline at end of file From 4158c39457567233e56dc227305c4509f42052ee Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Mon, 19 Oct 2020 13:07:12 -0500 Subject: [PATCH 43/78] move to coveralls action [ci skip] --- .github/workflows/test.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3d904629ff..647fe2b3f7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -87,7 +87,6 @@ jobs: conda activate test-environment doit test_examples - name: coveralls - run: | - eval "$(conda shell.bash hook)" - conda activate test-environment - coveralls \ No newline at end of file + uses: coverallsapp/github-action@master + with: + github-token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From 68e0ddc3bf0e12d2f2ca4bef2fe781c7dfa7ebb4 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Wed, 21 Oct 2020 07:52:57 -0500 Subject: [PATCH 44/78] run coveralls [ci skip] --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 647fe2b3f7..d257ffae11 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -89,4 +89,5 @@ jobs: - name: coveralls uses: coverallsapp/github-action@master with: - github-token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + github-token: ${{ secrets.GITHUB_TOKEN }} + run: coveralls From c1455ba0899b6a4ca1e79930ee3fb61c9d31993f Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Wed, 21 Oct 2020 14:30:17 -0500 Subject: [PATCH 45/78] run coveralls [ci skip] --- .github/workflows/test.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d257ffae11..b33234cc85 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,6 +29,7 @@ jobs: CHANS_DEV: "-c pyviz/label/dev -c bokeh" CHANS: "-c pyviz" MPLBACKEND: "Agg" + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v2 with: @@ -86,8 +87,13 @@ jobs: eval "$(conda shell.bash hook)" conda activate test-environment doit test_examples + - name: run coveralls + run: | + eval "$(conda shell.bash hook)" + conda activate test-environment + coveralls - name: coveralls uses: coverallsapp/github-action@master with: github-token: ${{ secrets.GITHUB_TOKEN }} - run: coveralls + From 82ee6d16892f7f4dff8622550e0c8ed670c2949e Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Wed, 21 Oct 2020 18:56:26 -0500 Subject: [PATCH 46/78] move github token to indiv step [ci skip] --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b33234cc85..2bdf8ccaef 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,7 +29,6 @@ jobs: CHANS_DEV: "-c pyviz/label/dev -c bokeh" CHANS: "-c pyviz" MPLBACKEND: "Agg" - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v2 with: @@ -88,6 +87,8 @@ jobs: conda activate test-environment doit test_examples - name: run coveralls + with: + github-token: ${{ secrets.GITHUB_TOKEN }} run: | eval "$(conda shell.bash hook)" conda activate test-environment @@ -96,4 +97,3 @@ jobs: uses: coverallsapp/github-action@master with: github-token: ${{ secrets.GITHUB_TOKEN }} - From 8d5f3517a246be64a73f61f956eb41b762ad9578 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Wed, 21 Oct 2020 19:15:53 -0500 Subject: [PATCH 47/78] move github token to indiv step [ci skip] --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2bdf8ccaef..dada84e88d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -87,7 +87,7 @@ jobs: conda activate test-environment doit test_examples - name: run coveralls - with: + env: github-token: ${{ secrets.GITHUB_TOKEN }} run: | eval "$(conda shell.bash hook)" From 41c26c7f19338a0cea87c288c1b9c2c8cdfe855c Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Fri, 30 Oct 2020 07:45:08 -0500 Subject: [PATCH 48/78] fix matplotlib version in test, open up platforms and py versions --- .github/workflows/test.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dada84e88d..e5414417df 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,8 +15,8 @@ jobs: strategy: fail-fast: false matrix: - os: ['ubuntu-latest'] - python-version: [3.7] + os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] + python-version: [3.6 3.7 3.8] timeout-minutes: 30 defaults: run: @@ -50,6 +50,7 @@ jobs: doit env_create ${{ env.CHANS_DEV}} --python=${{ matrix.python-version }} eval "$(conda shell.bash hook)" conda activate test-environment + conda uninstall matplotlib matplotlib-base --force; conda install -c conda-forge matplotlib=3.0.3 --no-deps; - name: doit develop_install run: | eval "$(conda shell.bash hook)" From 745f458c8ff84d805257049c264022867c34f42d Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Fri, 30 Oct 2020 07:57:20 -0500 Subject: [PATCH 49/78] commas are important --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e5414417df..2f7c94856d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] - python-version: [3.6 3.7 3.8] + python-version: [3.6, 3.7, 3.8] timeout-minutes: 30 defaults: run: From 92a3f788686e560de8e31d24f45ba6a33f2e82e3 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Fri, 30 Oct 2020 08:26:58 -0500 Subject: [PATCH 50/78] github token fix [ci skip] --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2f7c94856d..6ebeb8a368 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] + os: ['ubuntu-latest'] python-version: [3.6, 3.7, 3.8] timeout-minutes: 30 defaults: @@ -89,7 +89,7 @@ jobs: doit test_examples - name: run coveralls env: - github-token: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | eval "$(conda shell.bash hook)" conda activate test-environment @@ -97,4 +97,4 @@ jobs: - name: coveralls uses: coverallsapp/github-action@master with: - github-token: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From e7a8d1d227cfb9a72d7b926ff9a5e3c09487194c Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Fri, 30 Oct 2020 11:58:54 -0500 Subject: [PATCH 51/78] github token revert [ci skip] --- .github/workflows/test.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6ebeb8a368..eec94068cd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,6 +29,7 @@ jobs: CHANS_DEV: "-c pyviz/label/dev -c bokeh" CHANS: "-c pyviz" MPLBACKEND: "Agg" + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v2 with: @@ -89,7 +90,7 @@ jobs: doit test_examples - name: run coveralls env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + github-token: ${{ secrets.GITHUB_TOKEN }} run: | eval "$(conda shell.bash hook)" conda activate test-environment @@ -97,4 +98,4 @@ jobs: - name: coveralls uses: coverallsapp/github-action@master with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + github-token: ${{ secrets.GITHUB_TOKEN }} From f7bb80de3bd991f279f09d07b65a6790d0addad3 Mon Sep 17 00:00:00 2001 From: Kim Pevey Date: Fri, 30 Oct 2020 15:26:10 -0500 Subject: [PATCH 52/78] test regex for python version --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index eec94068cd..d6b1992e25 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,10 +22,10 @@ jobs: run: shell: bash -l {0} env: - DESC: "Python 3.7 tests" # is this even necessary ? + DESC: "Python ${{ matrix.python-version }} tests" HV_REQUIREMENTS: "unit_tests" PYTHON_VERSION: ${{ matrix.python-version }} - PKG_TEST_PYTHON: "--test-python=py37 --test-python=py27" + PKG_TEST_PYTHON: echo --test-python=py${{ matrix.python-version }} | tr -d '.' CHANS_DEV: "-c pyviz/label/dev -c bokeh" CHANS: "-c pyviz" MPLBACKEND: "Agg" From 1c0b6e305b60ee36c33b9f58bc45dab369b5adc8 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Mon, 2 Nov 2020 13:34:57 +0100 Subject: [PATCH 53/78] Drop 3.8 build for now --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d6b1992e25..576fde0fca 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: os: ['ubuntu-latest'] - python-version: [3.6, 3.7, 3.8] + python-version: [3.6, 3.7] timeout-minutes: 30 defaults: run: From c6e41767c76b359abf9a62fc4dcdfc669e860ad7 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Mon, 2 Nov 2020 13:37:50 +0100 Subject: [PATCH 54/78] Drop superfluous coveralls action --- .github/workflows/test.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 576fde0fca..b85a939720 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -95,7 +95,3 @@ jobs: eval "$(conda shell.bash hook)" conda activate test-environment coveralls - - name: coveralls - uses: coverallsapp/github-action@master - with: - github-token: ${{ secrets.GITHUB_TOKEN }} From deb8b61ed861e7fbd8841f72692db438cce7f347 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Mon, 2 Nov 2020 14:13:42 +0100 Subject: [PATCH 55/78] Remove unused PKG TEST env var --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b85a939720..de0488a9ee 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,7 +25,6 @@ jobs: DESC: "Python ${{ matrix.python-version }} tests" HV_REQUIREMENTS: "unit_tests" PYTHON_VERSION: ${{ matrix.python-version }} - PKG_TEST_PYTHON: echo --test-python=py${{ matrix.python-version }} | tr -d '.' CHANS_DEV: "-c pyviz/label/dev -c bokeh" CHANS: "-c pyviz" MPLBACKEND: "Agg" From 222913f95602e54db42f2724d76f9d290fc0fa55 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Mon, 2 Nov 2020 14:25:23 +0100 Subject: [PATCH 56/78] Enable 2.7 build --- .github/workflows/test.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index de0488a9ee..c7981c3269 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: os: ['ubuntu-latest'] - python-version: [3.6, 3.7] + python-version: [2.7, 3.6, 3.7] timeout-minutes: 30 defaults: run: @@ -50,7 +50,12 @@ jobs: doit env_create ${{ env.CHANS_DEV}} --python=${{ matrix.python-version }} eval "$(conda shell.bash hook)" conda activate test-environment + - name: matplotlib patch + run: | + eval "$(conda shell.bash hook)" + conda activate test-environment conda uninstall matplotlib matplotlib-base --force; conda install -c conda-forge matplotlib=3.0.3 --no-deps; + if: ${{matrix.python-version}} == 3.6 || ${{matrix.python-version}} == 3.7 - name: doit develop_install run: | eval "$(conda shell.bash hook)" From 8e8198071fb3acf3fc4ef30b919c831da0cb8f5c Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Mon, 2 Nov 2020 14:28:49 +0100 Subject: [PATCH 57/78] Fix condition --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c7981c3269..322e8af72c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -55,7 +55,7 @@ jobs: eval "$(conda shell.bash hook)" conda activate test-environment conda uninstall matplotlib matplotlib-base --force; conda install -c conda-forge matplotlib=3.0.3 --no-deps; - if: ${{matrix.python-version}} == 3.6 || ${{matrix.python-version}} == 3.7 + if: startsWith(${{matrix.python-version}}, "3.") - name: doit develop_install run: | eval "$(conda shell.bash hook)" From 8ffcc54a37d00c89052fced16eee25086535f10f Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Mon, 2 Nov 2020 14:34:42 +0100 Subject: [PATCH 58/78] Try to fix condition --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 322e8af72c..0189201f4d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -51,11 +51,11 @@ jobs: eval "$(conda shell.bash hook)" conda activate test-environment - 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 -c conda-forge matplotlib=3.0.3 --no-deps; - if: startsWith(${{matrix.python-version}}, "3.") - name: doit develop_install run: | eval "$(conda shell.bash hook)" From 33fca79c158b3659e026c88f036ea490ee636570 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Mon, 2 Nov 2020 14:35:50 +0100 Subject: [PATCH 59/78] Another attempt --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0189201f4d..e9a8d58626 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -51,7 +51,7 @@ jobs: eval "$(conda shell.bash hook)" conda activate test-environment - name: matplotlib patch - if: startsWith(matrix.python-version, "3.") + if: startsWith(matrix.python-version, 3.) run: | eval "$(conda shell.bash hook)" conda activate test-environment From f2d8a8ed95b05b5b0442c70d8ce37c772c80e2ee Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Mon, 2 Nov 2020 15:04:39 +0100 Subject: [PATCH 60/78] Add coveralls token --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e9a8d58626..9fd7ef6b3c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,6 +29,7 @@ jobs: CHANS: "-c pyviz" MPLBACKEND: "Agg" GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }} steps: - uses: actions/checkout@v2 with: From 41a780d4ce974a872b7a20c133a33cdd1995d042 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Mon, 2 Nov 2020 16:07:59 +0100 Subject: [PATCH 61/78] Try to fix coveralls --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9fd7ef6b3c..32a8a9bafa 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,6 +30,8 @@ jobs: MPLBACKEND: "Agg" GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }} + COVERALLS_SERVICE_NAME: "Github Actions" + COVERALLS_GIT_BRANCH: ${{ github.ref }} steps: - uses: actions/checkout@v2 with: From ba2b8b883d0322114e6511d7a1de1c423364041e Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Mon, 2 Nov 2020 16:17:25 +0100 Subject: [PATCH 62/78] Only run example tests once --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 32a8a9bafa..c049c99da4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -85,11 +85,11 @@ jobs: eval "$(conda shell.bash hook)" conda activate test-environment doit test_flakes - - name: doit test_all_recommended + - name: doit test_unit run: | eval "$(conda shell.bash hook)" conda activate test-environment - doit test_all_recommended + doit test_unit - name: test examples run: | eval "$(conda shell.bash hook)" From a0b344903be92e32dd50c02597105f5e2e199431 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Mon, 2 Nov 2020 17:07:58 +0100 Subject: [PATCH 63/78] Skip coveralls on py2.7 --- .github/workflows/test.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c049c99da4..9bb46d13eb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,9 +29,6 @@ jobs: CHANS: "-c pyviz" MPLBACKEND: "Agg" GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }} - COVERALLS_SERVICE_NAME: "Github Actions" - COVERALLS_GIT_BRANCH: ${{ github.ref }} steps: - uses: actions/checkout@v2 with: @@ -98,6 +95,7 @@ jobs: - 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 From bd8016665737224ea7ec6c2d31ddf7b917d0aef7 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Mon, 2 Nov 2020 17:22:54 +0100 Subject: [PATCH 64/78] Add windows and mac to matrix --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9bb46d13eb..3ce353a9d4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - os: ['ubuntu-latest'] + os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] python-version: [2.7, 3.6, 3.7] timeout-minutes: 30 defaults: From 5601dd1a2c309dd17348899f1145a9fd9c025fde Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Mon, 2 Nov 2020 17:26:35 +0100 Subject: [PATCH 65/78] Attempt to fix windows and OSX builds --- .github/workflows/test.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3ce353a9d4..8a642f5341 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,10 +40,11 @@ jobs: run: git fetch --prune --tags --unshallow - name: pre_install run: | - python -m pip install --upgrade pip - python -m pip install pyctdev flake8 nose + python -m pip install --upgrade --user pip + python -m pip install --user pyctdev flake8 nose - name: conda setup run: | + doit miniconda_install conda config --set always_yes True conda install -c pyviz "pyctdev>=0.5" doit ecosystem_setup From 5eedd40cd79686cfdd7393eed5e305c8ebd0404c Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Mon, 2 Nov 2020 17:34:42 +0100 Subject: [PATCH 66/78] Remove miniconda-install --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8a642f5341..3720bde6a3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -44,7 +44,6 @@ jobs: python -m pip install --user pyctdev flake8 nose - name: conda setup run: | - doit miniconda_install conda config --set always_yes True conda install -c pyviz "pyctdev>=0.5" doit ecosystem_setup From 20fd4e194e81313ec1d9ddcdf9bd9d91e5f2ba40 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Mon, 2 Nov 2020 17:41:46 +0100 Subject: [PATCH 67/78] Remove --user --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3720bde6a3..d9483ba349 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,8 +40,8 @@ jobs: run: git fetch --prune --tags --unshallow - name: pre_install run: | - python -m pip install --upgrade --user pip - python -m pip install --user pyctdev flake8 nose + python -m pip install --upgrade pip setuptools wheel + python -m pip install pyctdev flake8 nose - name: conda setup run: | conda config --set always_yes True From 2d25d6def88acd235578dc83d9ab944a89a9f1e1 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Mon, 2 Nov 2020 17:49:31 +0100 Subject: [PATCH 68/78] Use setup-miniconda action --- .github/workflows/test.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d9483ba349..d162f5d0fe 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,12 +36,11 @@ jobs: - 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: pre_install - run: | - python -m pip install --upgrade pip setuptools wheel - python -m pip install pyctdev flake8 nose - name: conda setup run: | conda config --set always_yes True From 0e847b77b85804259dedacdeafb28a66d50c0414 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Mon, 2 Nov 2020 17:53:19 +0100 Subject: [PATCH 69/78] Reorder steps --- .github/workflows/test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d162f5d0fe..68ab099014 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -49,12 +49,6 @@ jobs: doit env_create ${{ env.CHANS_DEV}} --python=${{ matrix.python-version }} eval "$(conda shell.bash hook)" conda activate test-environment - - 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 -c conda-forge matplotlib=3.0.3 --no-deps; - name: doit develop_install run: | eval "$(conda shell.bash hook)" @@ -66,6 +60,12 @@ jobs: 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 -c conda-forge matplotlib=3.0.3 --no-deps; - name: doit env_capture run: | eval "$(conda shell.bash hook)" From 9dfbeee7783bea8092dada9c73fbfb64b573974d Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Mon, 2 Nov 2020 18:09:21 +0100 Subject: [PATCH 70/78] Print matplotlib version --- .github/workflows/test.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 68ab099014..412deea366 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -66,16 +66,12 @@ jobs: eval "$(conda shell.bash hook)" conda activate test-environment conda uninstall matplotlib matplotlib-base --force; conda install -c conda-forge 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: conda list - run: | - eval "$(conda shell.bash hook)" - conda activate test-environment - conda list - name: doit test_flakes run: | eval "$(conda shell.bash hook)" From 24437a99d5cd5973039c979dacee755b029143e9 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Mon, 2 Nov 2020 18:12:39 +0100 Subject: [PATCH 71/78] Use setup-miniconda v2 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 412deea366..9a03b92cb2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,7 +36,7 @@ jobs: - uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - uses: goanpeca/setup-miniconda@v1 + - uses: goanpeca/setup-miniconda@v2 with: miniconda-version: "latest" - name: Fetch unshallow From 3c4071861932a41f54eaa5df718e992e440bdcfe Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Mon, 2 Nov 2020 18:20:01 +0100 Subject: [PATCH 72/78] Install matplotlib from main channel --- .github/workflows/test.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9a03b92cb2..5bcfe1789d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -47,8 +47,6 @@ jobs: conda install -c pyviz "pyctdev>=0.5" doit ecosystem_setup doit env_create ${{ env.CHANS_DEV}} --python=${{ matrix.python-version }} - eval "$(conda shell.bash hook)" - conda activate test-environment - name: doit develop_install run: | eval "$(conda shell.bash hook)" @@ -65,7 +63,8 @@ jobs: run: | eval "$(conda shell.bash hook)" conda activate test-environment - conda uninstall matplotlib matplotlib-base --force; conda install -c conda-forge matplotlib=3.0.3 --no-deps; + conda uninstall matplotlib matplotlib-base --force + conda install matplotlib=3.0.3 python -c "import matplotlib; print(matplotlib._version__);" - name: doit env_capture run: | From 822eaaf49e2ce93741ca437c3c9a29b20cf3810a Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Mon, 2 Nov 2020 18:21:29 +0100 Subject: [PATCH 73/78] Switch back to setup-minicona v1 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5bcfe1789d..9729332554 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,7 +36,7 @@ jobs: - uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - uses: goanpeca/setup-miniconda@v2 + - uses: goanpeca/setup-miniconda@v1 with: miniconda-version: "latest" - name: Fetch unshallow From 2dedb920877a106204677b323962234c56f3af06 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Mon, 2 Nov 2020 18:24:09 +0100 Subject: [PATCH 74/78] Remove tests from .travis.yml and appveyor --- .appveyor.yml | 31 ------------------------------- .travis.yml | 10 +--------- 2 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 .appveyor.yml diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 6ff145589b..0000000000 --- a/.appveyor.yml +++ /dev/null @@ -1,31 +0,0 @@ -environment: - global: - CHANS_DEV: "-c pyviz/label/dev -c conda-forge -c bokeh/label/dev" - matrix: - - PY: "3.6" - CONDA: "C:\\Miniconda36-x64" - -init: - - cmd: set PATH=%CONDA%;%CONDA%\Scripts;%CONDA%\Library\bin;%PATH% - - cmd: echo %path% - -install: - - "conda install -y -c pyviz pyctdev && doit ecosystem_setup" - - - - "doit env_create %CHANS_DEV% --name=test --python=%PY%" - - "activate test" - - "doit develop_install %CHANS_DEV% -o unit_tests" - - "doit env_capture" - -build: false -skip_branch_with_pr: true # only do one run per commit -clone_depth: 5 -skip_tags: true - -before_test: - - cmd: for /f %%i in ('python -c "import matplotlib; print(matplotlib.matplotlib_fname())"') do set matplotlibrc=%%i - - cmd: 'echo backend : Agg > %matplotlibrc%' - -test_script: - - "doit test_flakes" - - "doit test_unit" diff --git a/.travis.yml b/.travis.yml index 37a3f696fa..8f084735ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,6 @@ env: - MOZ_HEADLESS=1 stages: - - test - name: extra_tests if: type = cron - name: conda_dev_package @@ -58,8 +57,6 @@ jobs: ########## Test Stage ########## - &default - stage: test - 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 - export PATH="$HOME/miniconda/bin:$PATH" && hash -r @@ -72,21 +69,16 @@ jobs: - if [ "$PYTHON_VERSION" == "3.6" ]; then conda uninstall matplotlib matplotlib-base --force; conda install $CHANS_DEV matplotlib=3.0.3 --no-deps; fi; - doit env_capture - hash -r - script: - - doit test_all_recommended 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 ########## From b1e95f8c20c5729077e80d99827a24593c852b90 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Mon, 2 Nov 2020 18:28:13 +0100 Subject: [PATCH 75/78] Attempt to fix matplotlib patch --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9729332554..9e0d8d8749 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -64,8 +64,8 @@ jobs: eval "$(conda shell.bash hook)" conda activate test-environment conda uninstall matplotlib matplotlib-base --force - conda install matplotlib=3.0.3 - python -c "import matplotlib; print(matplotlib._version__);" + 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)" From 60bdc757b42dabadc2725ad5232831240ea3bb08 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Mon, 2 Nov 2020 19:56:49 +0100 Subject: [PATCH 76/78] Readd env vars --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8f084735ec..733764a81d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,6 +57,8 @@ jobs: ########## Test Stage ########## - &default + 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 - export PATH="$HOME/miniconda/bin:$PATH" && hash -r From e303cf38fea158acb91e3c3f9fd5742efbc12b79 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Mon, 2 Nov 2020 20:17:58 +0100 Subject: [PATCH 77/78] Readd flake check to .travis --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 733764a81d..e5f7f92600 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,6 +71,8 @@ jobs: - if [ "$PYTHON_VERSION" == "3.6" ]; then conda uninstall matplotlib matplotlib-base --force; conda install $CHANS_DEV matplotlib=3.0.3 --no-deps; fi; - doit env_capture - hash -r + script: + - doit test_flakes after_success: coveralls after_failure: sleep 10 From 992c6afcccda57535657bbddf2675422669034fd Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Mon, 2 Nov 2020 21:12:48 +0100 Subject: [PATCH 78/78] Exclude windows/py2.7 --- .github/workflows/test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9e0d8d8749..39d099a77e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,6 +17,9 @@ jobs: 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: