Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HEP1 - Drop support for Python 3.7 #5695

Merged
merged 3 commits into from
Jun 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jobs:
shell: bash -l {0}
env:
CHANS_DEV: "-c pyviz/label/dev -c bokeh"
PKG_TEST_PYTHON: "--test-python=py37"
PYTHON_VERSION: "3.7"
PKG_TEST_PYTHON: "--test-python=py38"
PYTHON_VERSION: "3.8"
CHANS: "-c pyviz"
MPLBACKEND: "Agg"
CONDA_UPLOAD_TOKEN: ${{ secrets.CONDA_UPLOAD_TOKEN }}
Expand All @@ -32,7 +32,7 @@ jobs:
- uses: conda-incubator/setup-miniconda@v2
with:
miniconda-version: "latest"
python-version: 3.8
python-version: 3.9
- name: Fetch unshallow
run: git fetch --prune --tags --unshallow -f
- name: Set output
Expand Down Expand Up @@ -60,8 +60,8 @@ jobs:
shell: bash -l {0}
env:
CHANS_DEV: "-c pyviz/label/dev -c bokeh"
PKG_TEST_PYTHON: "--test-python=py37"
PYTHON_VERSION: "3.7"
PKG_TEST_PYTHON: "--test-python=py38"
PYTHON_VERSION: "3.8"
CHANS: "-c pyviz"
MPLBACKEND: "Agg"
PPU: ${{ secrets.PPU }}
Expand All @@ -74,7 +74,7 @@ jobs:
- uses: conda-incubator/setup-miniconda@v2
with:
miniconda-version: "latest"
python-version: 3.8
python-version: 3.9
- name: Fetch unshallow
run: git fetch --prune --tags --unshallow -f
- name: conda setup
Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,8 @@ jobs:
fail-fast: false
matrix:
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
python-version: ['3.7', '3.8', '3.11']
python-version: ['3.8', '3.11']
bokeh-version: ['2', '3']
exclude:
# Bokeh 3 does not support Python 3.7
- bokeh-version: '3'
python-version: '3.7'
- bokeh-version: '2'
python-version: '3.8'
timeout-minutes: 120
defaults:
run:
Expand Down
4 changes: 2 additions & 2 deletions holoviews/core/data/ibis.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
from .util import cached


@lru_cache()
@lru_cache
def ibis_version():
import ibis
return Version(ibis.__version__)


@lru_cache()
@lru_cache
def ibis4():
return ibis_version() >= Version("4.0")

Expand Down
2 changes: 0 additions & 2 deletions holoviews/plotting/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -557,8 +557,6 @@ def mplcmap_to_palette(cmap, ncolors=None, categorical=False):
cmap = cmap.replace('Category', 'tab')

if Version(mpl.__version__) < Version("3.5"):
# This will stop working and can be removed
# when we do not support python 3.7
from matplotlib import cm
try:
cmap = cm.get_cmap(cmap)
Expand Down
2 changes: 1 addition & 1 deletion holoviews/tests/plotting/test_plotutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ def test_mpl_colormap_instance(self):
cmap = colormaps.get('Greys')
except ImportError:
# This will stop working and can be removed
# when we do not support python 3.7
# when we only support Matplotlib >= 3.5
from matplotlib.cm import get_cmap
cmap = get_cmap('Greys')

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ filterwarnings = [
run.concurrency = ["greenlet"]

[tool.ruff]
target-version = "py37"
target-version = "py38"

select = [
"E",
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ def get_setup_version(reponame):
dict(
name="holoviews",
version=get_setup_version("holoviews"),
python_requires=">=3.7",
python_requires=">=3.8",
install_requires=install_requires,
extras_require=extras_require,
description="Stop plotting your data - annotate your data and let it visualize itself.",
Expand All @@ -176,7 +176,6 @@ def get_setup_version(reponame):
classifiers=[
"License :: OSI Approved :: BSD License",
"Development Status :: 5 - Production/Stable",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

[tox]
# python version test group extra envs extra commands
envlist = {py37,py38,py39,py310,py311}-{unit,ui,examples,all_recommended,simple}-{default}-{dev,pkg}
envlist = {py38,py39,py310,py311}-{unit,ui,examples,all_recommended,simple}-{default}-{dev,pkg}

[_simple]
description = Install holoviews without any optional dependencies
Expand Down