Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into dash_support
Browse files Browse the repository at this point in the history
  • Loading branch information
jonmmease committed Nov 4, 2020
2 parents 772b9ed + a795949 commit 7221f64
Show file tree
Hide file tree
Showing 30 changed files with 658 additions and 227 deletions.
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
18 changes: 5 additions & 13 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 @@ -69,23 +68,21 @@ jobs:
- doit env_create $CHANS_DEV --python=$PYTHON_VERSION
- source activate test-environment
- travis_wait 30 doit develop_install $CHANS_DEV -o $HV_REQUIREMENTS
- 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
- 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 Expand Up @@ -164,16 +161,11 @@ jobs:
- source activate test-environment
- travis_wait 30 doit develop_install $CHANS_DEV -o unit_tests && pip uninstall -y holoviews
- doit pip_on_conda
- if [ "$PYTHON_VERSION" == "3.7" ]; then conda uninstall matplotlib matplotlib-base --force; conda install $CHANS_DEV matplotlib=3.0.3 --no-deps; fi;
- doit ecosystem=pip package_build
script: doit ecosystem=pip package_upload -u $TPPU -p $TPPP -r ${PYPI}

- <<: *pip_pkg
stage: pip_package
env: PYPI="https://upload.pypi.org/legacy/" TRAVIS_NOCACHE=$TRAVIS_JOB_ID
install:
- doit env_create $CHANS_DEV --python=$PYTHON_VERSION
- source activate test-environment
- travis_wait 30 doit develop_install $CHANS_DEV -o unit_tests && pip uninstall -y holoviews
- doit pip_on_conda
- doit ecosystem=pip package_build
script: doit ecosystem=pip package_upload -u $PPU -p $PPP -r ${PYPI}
42 changes: 42 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,45 @@
Version 1.13.5
==============

This version contains numerous bug fixes and a number of enhancements.
Many thanks for contribution by @bryevdv, @jbednar, @jlstevens,
@jonmmease, @kcpevey and @philippjfr.

Bug fixes:

- Improvements to iteration over Series in CuDF data backend
([#4624](https://github.com/holoviz/holoviews/pull/4624))
- Added .values_host calls needed for iteraction in CuDF backend
([#4646](https://github.com/holoviz/holoviews/pull/4646))
- Fixed bug resetting ranges
([#4654](https://github.com/holoviz/holoviews/pull/4654))
- Fix bug matching elements to subplots in `DynamicMap` (#4649)
([#4649](https://github.com/holoviz/holoviews/pull/4649))
- Ensure consistent split `Violin` color assignment
([#4650](https://github.com/holoviz/holoviews/pull/4650))
- Ensure `PolyDrawCallback` always has vdim data
([#4644](https://github.com/holoviz/holoviews/pull/4644))
- Set default align in bokeh correctly
([#4637](https://github.com/holoviz/holoviews/pull/4637))
- Fixed deserialization of polygon/multi_line CDS data in bokeh backend
([#4631](https://github.com/holoviz/holoviews/pull/4631))

Enhancements:

- Refactor of link selections streams
([#4572](https://github.com/holoviz/holoviews/pull/4572))
- Add ability to listen to dataset linked_selection
([#4547](https://github.com/holoviz/holoviews/pull/4547))
- Added `selected` parameter to Bokeh PathPlot
([#4641](https://github.com/holoviz/holoviews/pull/4641))

Documentation:

- Improved `Bars` reference example, demonstrating the dataframe constructor
([#4656](https://github.com/holoviz/holoviews/pull/4656))
- Various documentation fixes
([#4628](https://github.com/holoviz/holoviews/pull/4628))

Version 1.13.4
==============

Expand Down
46 changes: 44 additions & 2 deletions doc/releases.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,48 @@ Release notes
Version 1.13
~~~~~~~~~~~~

Version 1.13.5
**************

This version contains numerous bug fixes and a number of enhancements.
Many thanks for contribution by @bryevdv, @jbednar, @jlstevens,
@jonmmease, @kcpevey and @philippjfr.

Bug fixes:

- Improvements to iteration over Series in CuDF data backend
(`#4624 <https://github.com/holoviz/holoviews/pull/4624>`_)
- Added .values_host calls needed for iteraction in CuDF backend
(`#4646 <https://github.com/holoviz/holoviews/pull/4646>`_)
- Fixed bug resetting ranges
(`#4654 <https://github.com/holoviz/holoviews/pull/4654>`_)
- Fix bug matching elements to subplots in `DynamicMap` (#4649)
(`#4649 <https://github.com/holoviz/holoviews/pull/4649>`_)
- Ensure consistent split `Violin` color assignment
(`#4650 <https://github.com/holoviz/holoviews/pull/4650>`_)
- Ensure `PolyDrawCallback` always has vdim data
(`#4644 <https://github.com/holoviz/holoviews/pull/4644>`_)
- Set default align in bokeh correctly
(`#4637 <https://github.com/holoviz/holoviews/pull/4637>`_)
- Fixed deserialization of polygon/multi_line CDS data in bokeh backend
(`#4631 <https://github.com/holoviz/holoviews/pull/4631>`_)

Enhancements:

- Refactor of link selections streams
(`#4572 <https://github.com/holoviz/holoviews/pull/4572>`_)
- Add ability to listen to dataset linked_selection
(`#4547 <https://github.com/holoviz/holoviews/pull/4547>`_)
- Added `selected` parameter to Bokeh PathPlot
(`#4641 <https://github.com/holoviz/holoviews/pull/4641>`_)

Documentation:

- Improved `Bars` reference example, demonstrating the dataframe constructor
(`#4656 <https://github.com/holoviz/holoviews/pull/4656>`_)
- Various documentation fixes
(`#4628 <https://github.com/holoviz/holoviews/pull/4628>`_)

Version 1.13.4
**************

Expand Down Expand Up @@ -460,7 +502,7 @@ Bug fixes:
* Ensure elements cannot be constructed with wrong number of columns
(`#4040 <https://github.com/pyviz/holoviews/issues/#4040>`_)
* Ensure streaming data works on bokeh server
(`#4041 <https://github.com/pyviz/holoviews/issues/4041>`_)
(`#4041 <https://github.com/pyviz/holoviews/issues/4041>`_)

Compatibility:

Expand Down Expand Up @@ -573,7 +615,7 @@ Bug fixes:
- Ensure that bokeh backend handles Cycle of markers
(`#3706 <https://github.com/pyviz/holoviews/issues/3706>`_)
- Fix for using opts method on DynamicMap
(`#3691 <https://github.com/pyviz/holoviews/issues/3691>`_)
(`#3691 <https://github.com/pyviz/holoviews/issues/3691>`_)
- Ensure that bokeh backend handles DynamicMaps with variable length
NdOverlay (`#3696 <https://github.com/pyviz/holoviews/issues/3696>`_)
- Fix default width/height setting for HeatMap
Expand Down
31 changes: 27 additions & 4 deletions examples/reference/elements/bokeh/Bars.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"outputs": [],
"source": [
"import numpy as np\n",
"import pandas as pd\n",
"import holoviews as hv\n",
"hv.extension('bokeh')"
]
Expand All @@ -44,6 +45,16 @@
"bars"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"We can achieve the same plot using a Pandas DataFrame:\n",
"```\n",
"hv.Bars(pd.DataFrame(data, columns=['Car occupants','Count']))\n",
"```"
]
},
{
"cell_type": "markdown",
"metadata": {},
Expand Down Expand Up @@ -84,7 +95,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"``Bars`` support nested categorical groupings, e.g. here we will create a random sample of pets sub-divided by male and female:"
"``Bars`` also supports nested categorical groupings. Next we'll use a Pandas DataFrame to construct a random sample of pets sub-divided by male and female:"
]
},
{
Expand All @@ -100,8 +111,19 @@
"\n",
"pets_sample = np.random.choice(pets, samples)\n",
"gender_sample = np.random.choice(genders, samples)\n",
"count = np.random.randint(1, 5, size=samples)\n",
"\n",
"bars = hv.Bars((pets_sample, gender_sample, np.ones(samples)), ['Pets', 'Gender']).aggregate(function=np.sum)\n",
"df = pd.DataFrame({'Pets': pets_sample, 'Gender': gender_sample, 'Count': count})\n",
"df.head(2)"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
"bars = hv.Bars(df, kdims=['Pets', 'Gender']).aggregate(function=np.sum)\n",
"\n",
"bars.opts(width=500)"
]
Expand All @@ -110,6 +132,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"\n",
"Just as before we can provide an explicit ordering by declaring the `Dimension.values`. Alternatively we can also make use of the `.sort` method, internally `Bars` will use topological sorting to ensure consistent ordering."
]
},
Expand Down Expand Up @@ -158,7 +181,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"For full documentation and the available style and plot options, use ``hv.help(hv.Bars).``"
"For full documentation and the available style and plot options, use ``hv.help(hv.Bars)``."
]
}
],
Expand All @@ -169,5 +192,5 @@
}
},
"nbformat": 4,
"nbformat_minor": 2
"nbformat_minor": 4
}
Loading

0 comments on commit 7221f64

Please sign in to comment.