Skip to content

Commit

Permalink
General maintenance (#5955)
Browse files Browse the repository at this point in the history
  • Loading branch information
hoxbro authored Oct 25, 2023
1 parent bb81fe0 commit 345dd00
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ repos:
- id: check-json
- id: detect-private-key
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.1.0
rev: v0.1.2
hooks:
- id: ruff
args: [holoviews]
Expand Down
12 changes: 6 additions & 6 deletions examples/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
import pandas as pd
from packaging.version import Version

system = platform.system()
py_version = sys.version_info[:2]
PD2 = Version(pd.__version__) >= Version("2.0")

# Having "OMP_NUM_THREADS"=1, set as an environment variable, can be needed
Expand All @@ -24,20 +26,18 @@

# 2023-07-14 with following error:
# ValueError: Buffer dtype mismatch, expected 'const int64_t' but got 'int'
if PD2 and platform.system() == "Windows":
if PD2 and system == "Windows":
collect_ignore_glob += [
"gallery/demos/bokeh/point_draw_triangulate.ipynb",
"reference/elements/*/TriMesh.ipynb",
"user_guide/15-Large_Data.ipynb",
]


# 2023-07-14 with following error:
# 'from matplotlib.cbook import get_sample_data' cannot find file
if sys.version_info[:2] == (3, 8) and platform.system() == "Linux":
# 2023-10-25, flaky on CI with timeout
if system == "Darwin":
collect_ignore_glob += [
"gallery/demos/*/bachelors_degrees_by_gender.ipynb",
"gallery/demos/*/topographic_hillshading.ipynb",
"user_guide/16-Streaming_Data.ipynb",
]


Expand Down
7 changes: 0 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,18 +103,11 @@

extras_require["examples_tests"] = extras_require["examples"] + extras_require['tests_nb']

# Extra third-party libraries
extras_require["extras"] = extras_require["examples"] + [
"pscript ==0.7.1",
]

# Not used in tox.ini or elsewhere, kept for backwards compatibility.
extras_require["unit_tests"] = extras_require["examples"] + extras_require["tests"] + extras_require['lint']

extras_require['doc'] = extras_require['examples'] + [
'nbsite >=0.8.2,<0.9.0',
'mpl_sample_data >=3.1.3',
'pscript',
'graphviz',
'bokeh >=3.1',
'pooch',
Expand Down

0 comments on commit 345dd00

Please sign in to comment.