Skip to content

Commit

Permalink
Require HoloViews>=1.19.0, bump other dependencies, and drop Python 3…
Browse files Browse the repository at this point in the history
….8 (#1355)
  • Loading branch information
maximlt authored Jun 24, 2024
1 parent 3699aeb commit a56c997
Show file tree
Hide file tree
Showing 23 changed files with 69 additions and 341 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jobs:
with:
python-version: ${{ env.PYTHON_VERSION }}
- name: install
run: pip install ."[doc, examples, geo]"
run: pip install -v --prefer-binary -e ."[doc, examples, geo]"
- name: install dev nbsite
run: pip install --pre -U nbsite
- name: pip list
Expand Down
15 changes: 5 additions & 10 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ jobs:
run: |
MATRIX=$(jq -nsc '{
"os": ["ubuntu-latest", "macos-latest", "windows-latest"],
"python-version": ["3.8", "3.12"],
"python-version": ["3.9", "3.12"],
"exclude": [
{
"python-version": "3.8",
"python-version": "3.9",
"os": "macos-latest"
}
]
Expand All @@ -74,7 +74,7 @@ jobs:
run: |
MATRIX=$(jq -nsc '{
"os": ["ubuntu-latest", "macos-latest", "windows-latest"],
"python-version": ["3.8", "3.12"],
"python-version": ["3.9", "3.12"],
"include": [
{
"python-version": "3.9",
Expand All @@ -91,7 +91,7 @@ jobs:
],
"exclude": [
{
"python-version": "3.8",
"python-version": "3.9",
"os": "macos-latest"
}
]
Expand Down Expand Up @@ -159,13 +159,8 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: upgrade pip / setuptools
run: pip install -U pip setuptools
- name: install without geo
# Because cartopy cannot be installed on Python 3.8 on these platforms
if: matrix.python-version == '3.8' && contains(fromJSON('["ubuntu-latest", "windows-latest"]'), matrix.os)
run: pip install -ve '.[tests, examples-tests, hvdev, dev-extras]'
- name: install with geo
if: matrix.python-version != '3.8' || !contains(fromJSON('["ubuntu-latest", "windows-latest"]'), matrix.os)
run: pip install -ve '.[tests, examples-tests, geo, hvdev, hvdev-geo, dev-extras]'
run: pip install -v --prefer-binary -e '.[tests, examples-tests, geo, hvdev, hvdev-geo, dev-extras]'
- name: pip list
run: pip list
- name: bokeh sampledata
Expand Down
2 changes: 1 addition & 1 deletion doc/developer_guide/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ source .venv/bin/activate
Install the test dependencies:

``` bash
pip install -e '.[tests, examples-tests, geo, hvdev, hvdev-geo, dev-extras]'
pip install --prefer-binary -e '.[tests, examples-tests, geo, hvdev, hvdev-geo, dev-extras]'
```

:::
Expand Down
2 changes: 1 addition & 1 deletion doc/getting_started/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
| Latest release | [![Github release](https://img.shields.io/github/release/holoviz/hvplot.svg?label=tag&colorB=11ccbb)](https://github.com/holoviz/hvplot/releases) [![PyPI version](https://img.shields.io/pypi/v/hvplot.svg?colorB=cc77dd)](https://pypi.python.org/pypi/hvplot) [![hvplot version](https://img.shields.io/conda/v/pyviz/hvplot.svg?colorB=4488ff&style=flat)](https://anaconda.org/pyviz/hvplot) [![conda-forge version](https://img.shields.io/conda/v/conda-forge/hvplot.svg?label=conda%7Cconda-forge&colorB=4488ff)](https://anaconda.org/conda-forge/hvplot) [![defaults version](https://img.shields.io/conda/v/anaconda/hvplot.svg?label=conda%7Cdefaults&style=flat&colorB=4488ff)](https://anaconda.org/anaconda/hvplot) |
| Python | [![Python support](https://img.shields.io/pypi/pyversions/hvplot.svg)](https://pypi.org/project/hvplot/) |

hvPlot supports Python 3.8 and above on Linux, Windows, or Mac. hvPlot can be installed with [conda](https://conda.io/en/latest/):
hvPlot supports Python 3.9 and above on Linux, Windows, or Mac. hvPlot can be installed with [conda](https://conda.io/en/latest/):

conda install hvplot

Expand Down
2 changes: 1 addition & 1 deletion doc/user_guide/NetworkX.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
"print(\"source vertex {target:length, }\")\n",
"for v in G.nodes():\n",
" spl = dict(nx.single_source_shortest_path_length(G, v))\n",
" print('{} {} '.format(v, spl))\n",
" print(f'{v} {spl} ')\n",
" for p in spl:\n",
" pathlengths.append(spl[p])\n",
"\n",
Expand Down
10 changes: 5 additions & 5 deletions envs/py3.10-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ channels:
- conda-forge
dependencies:
- python=3.10
- bokeh>=1.0.0
- bokeh>=3.1
- cartopy
- colorcet>=2
- dask
Expand All @@ -26,7 +26,7 @@ dependencies:
- geodatasets>=2023.12.0
- geopandas
- geoviews-core>=1.9.0
- holoviews>=1.11.0
- holoviews>=1.19.0
- ibis-duckdb
- intake-parquet>=0.2.3
- intake-xarray>=0.5.0
Expand All @@ -38,10 +38,10 @@ dependencies:
- networkx>=2.6.3
- notebook>=5.4
- numba>=0.51.0
- numpy>=1.15
- numpy>=1.21
- packaging
- pandas
- panel>=0.11.0
- pandas>=1.3
- panel>=1.0
- param<3.0,>=1.12.0
- parameterized
- pillow>=8.2.0
Expand Down
10 changes: 5 additions & 5 deletions envs/py3.11-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ channels:
- conda-forge
dependencies:
- python=3.11
- bokeh>=1.0.0
- bokeh>=3.1
- cartopy
- colorcet>=2
- dask>=2021.3.0
Expand All @@ -25,7 +25,7 @@ dependencies:
- geodatasets>=2023.12.0
- geopandas
- geoviews-core>=1.9.0
- holoviews>=1.11.0
- holoviews>=1.19.0
- ibis-duckdb
- intake-parquet>=0.2.3
- intake-xarray>=0.5.0
Expand All @@ -37,10 +37,10 @@ dependencies:
- networkx>=2.6.3
- notebook>=5.4
- numba>=0.51.0
- numpy>=1.15
- numpy>=1.21
- packaging
- pandas
- panel>=0.11.0
- pandas>=1.3
- panel>=1.0
- param<3.0,>=1.12.0
- pillow>=8.2.0
- plotly
Expand Down
10 changes: 5 additions & 5 deletions envs/py3.11-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ channels:
- conda-forge
dependencies:
- python=3.11
- bokeh>=1.0.0
- bokeh>=3.1
- cartopy
- colorcet>=2
- dask
Expand All @@ -26,7 +26,7 @@ dependencies:
- geodatasets>=2023.12.0
- geopandas
- geoviews-core>=1.9.0
- holoviews>=1.11.0
- holoviews>=1.19.0
- ibis-duckdb
- intake-parquet>=0.2.3
- intake-xarray>=0.5.0
Expand All @@ -38,10 +38,10 @@ dependencies:
- networkx>=2.6.3
- notebook>=5.4
- numba>=0.51.0
- numpy>=1.15
- numpy>=1.21
- packaging
- pandas
- panel>=0.11.0
- pandas>=1.3
- panel>=1.0
- param<3.0,>=1.12.0
- parameterized
- pillow>=8.2.0
Expand Down
10 changes: 5 additions & 5 deletions envs/py3.12-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ channels:
- conda-forge
dependencies:
- python=3.12
- bokeh>=1.0.0
- bokeh>=3.1
- cartopy
- colorcet>=2
- dask
Expand All @@ -26,7 +26,7 @@ dependencies:
- geodatasets>=2023.12.0
- geopandas
- geoviews-core>=1.9.0
- holoviews>=1.11.0
- holoviews>=1.19.0
- ibis-duckdb
- intake-parquet>=0.2.3
- intake-xarray>=0.5.0
Expand All @@ -38,10 +38,10 @@ dependencies:
- networkx>=2.6.3
- notebook>=5.4
- numba>=0.51.0
- numpy>=1.15
- numpy>=1.21
- packaging
- pandas
- panel>=0.11.0
- pandas>=1.3
- panel>=1.0
- param<3.0,>=1.12.0
- parameterized
- pillow>=8.2.0
Expand Down
76 changes: 0 additions & 76 deletions envs/py3.8-tests.yaml

This file was deleted.

10 changes: 5 additions & 5 deletions envs/py3.9-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ channels:
- conda-forge
dependencies:
- python=3.9
- bokeh>=1.0.0
- bokeh>=3.1
- cartopy
- colorcet>=2
- dask
Expand All @@ -26,7 +26,7 @@ dependencies:
- geodatasets>=2023.12.0
- geopandas
- geoviews-core>=1.9.0
- holoviews>=1.11.0
- holoviews>=1.19.0
- ibis-duckdb
- intake-parquet>=0.2.3
- intake-xarray>=0.5.0
Expand All @@ -38,10 +38,10 @@ dependencies:
- networkx>=2.6.3
- notebook>=5.4
- numba>=0.51.0
- numpy>=1.15
- numpy>=1.21
- packaging
- pandas
- panel>=0.11.0
- pandas>=1.3
- panel>=1.0
- param<3.0,>=1.12.0
- parameterized
- pillow>=8.2.0
Expand Down
Loading

0 comments on commit a56c997

Please sign in to comment.