Skip to content

Commit 6c96c7e

Browse files
authored
Fix conda tests (#1337)
1 parent c2873cf commit 6c96c7e

9 files changed

+37
-0
lines changed

doc/conftest.py

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
# hvplot.save() with bokeh
3737
collect_ignore_glob += [
3838
'user_guide/Viewing.ipynb',
39+
'user_guide/NetworkX.ipynb',
3940
]
4041
finally:
4142
webdriver_control.cleanup()

envs/py3.10-tests.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ dependencies:
2222
- datashader>=0.6.5
2323
- fiona
2424
- fugue
25+
- fugue-sql-antlr>=0.2.0
2526
- geodatasets>=2023.12.0
2627
- geopandas
2728
- geoviews-core>=1.9.0
@@ -31,6 +32,7 @@ dependencies:
3132
- intake-xarray>=0.5.0
3233
- intake<2.0.0,>=0.6.5
3334
- ipywidgets
35+
- jinja2
3436
- matplotlib
3537
- nbval
3638
- networkx>=2.6.3
@@ -53,6 +55,7 @@ dependencies:
5355
- pytest
5456
- pytest-cov
5557
- pytest-xdist
58+
- qpd>=0.4.4
5659
- rasterio
5760
- rioxarray
5861
- ruff
@@ -63,6 +66,7 @@ dependencies:
6366
- selenium>=3.141.0
6467
- setuptools_scm>=6
6568
- spatialpandas>=0.4.3
69+
- sqlglot
6670
- streamz>=0.3.0
6771
- xarray
6872
- xarray>=0.18.2

envs/py3.11-docs.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ dependencies:
2121
- datashader>=0.6.5
2222
- fiona
2323
- fugue
24+
- fugue-sql-antlr>=0.2.0
2425
- geodatasets>=2023.12.0
2526
- geopandas
2627
- geoviews-core>=1.9.0
@@ -30,6 +31,7 @@ dependencies:
3031
- intake-xarray>=0.5.0
3132
- intake<2.0.0,>=0.6.5
3233
- ipywidgets
34+
- jinja2
3335
- matplotlib
3436
- nbsite>=0.8.4
3537
- networkx>=2.6.3
@@ -46,6 +48,7 @@ dependencies:
4648
- pooch>=1.6.0
4749
- pygraphviz
4850
- pyproj
51+
- qpd>=0.4.4
4952
- rasterio
5053
- rioxarray
5154
- s3fs>=2022.1.0
@@ -55,6 +58,7 @@ dependencies:
5558
- setuptools_scm>=6
5659
- spatialpandas>=0.4.3
5760
- sphinxext-rediraffe
61+
- sqlglot
5862
- streamz>=0.3.0
5963
- xarray>=0.18.2
6064
- xyzservices>=2022.9.0

envs/py3.11-tests.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ dependencies:
2222
- datashader>=0.6.5
2323
- fiona
2424
- fugue
25+
- fugue-sql-antlr>=0.2.0
2526
- geodatasets>=2023.12.0
2627
- geopandas
2728
- geoviews-core>=1.9.0
@@ -31,6 +32,7 @@ dependencies:
3132
- intake-xarray>=0.5.0
3233
- intake<2.0.0,>=0.6.5
3334
- ipywidgets
35+
- jinja2
3436
- matplotlib
3537
- nbval
3638
- networkx>=2.6.3
@@ -53,6 +55,7 @@ dependencies:
5355
- pytest
5456
- pytest-cov
5557
- pytest-xdist
58+
- qpd>=0.4.4
5659
- rasterio
5760
- rioxarray
5861
- ruff
@@ -63,6 +66,7 @@ dependencies:
6366
- selenium>=3.141.0
6467
- setuptools_scm>=6
6568
- spatialpandas>=0.4.3
69+
- sqlglot
6670
- streamz>=0.3.0
6771
- xarray
6872
- xarray>=0.18.2

envs/py3.12-tests.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ dependencies:
2222
- datashader>=0.6.5
2323
- fiona
2424
- fugue
25+
- fugue-sql-antlr>=0.2.0
2526
- geodatasets>=2023.12.0
2627
- geopandas
2728
- geoviews-core>=1.9.0
@@ -31,6 +32,7 @@ dependencies:
3132
- intake-xarray>=0.5.0
3233
- intake<2.0.0,>=0.6.5
3334
- ipywidgets
35+
- jinja2
3436
- matplotlib
3537
- nbval
3638
- networkx>=2.6.3
@@ -53,6 +55,7 @@ dependencies:
5355
- pytest
5456
- pytest-cov
5557
- pytest-xdist
58+
- qpd>=0.4.4
5659
- rasterio
5760
- rioxarray
5861
- ruff
@@ -63,6 +66,7 @@ dependencies:
6366
- selenium>=3.141.0
6467
- setuptools_scm>=6
6568
- spatialpandas>=0.4.3
69+
- sqlglot
6670
- streamz>=0.3.0
6771
- xarray
6872
- xarray>=0.18.2

envs/py3.8-tests.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ dependencies:
2222
- datashader>=0.6.5
2323
- fiona
2424
- fugue
25+
- fugue-sql-antlr>=0.2.0
2526
- geodatasets>=2023.12.0
2627
- geopandas
2728
- geoviews-core>=1.9.0
@@ -31,6 +32,7 @@ dependencies:
3132
- intake-xarray>=0.5.0
3233
- intake<2.0.0,>=0.6.5
3334
- ipywidgets
35+
- jinja2
3436
- matplotlib
3537
- nbval
3638
- networkx>=2.6.3
@@ -53,6 +55,7 @@ dependencies:
5355
- pytest
5456
- pytest-cov
5557
- pytest-xdist
58+
- qpd>=0.4.4
5659
- rasterio
5760
- rioxarray
5861
- ruff
@@ -63,6 +66,7 @@ dependencies:
6366
- selenium>=3.141.0
6467
- setuptools_scm>=6
6568
- spatialpandas>=0.4.3
69+
- sqlglot
6670
- streamz>=0.3.0
6771
- xarray
6872
- xarray>=0.18.2

envs/py3.9-tests.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ dependencies:
2222
- datashader>=0.6.5
2323
- fiona
2424
- fugue
25+
- fugue-sql-antlr>=0.2.0
2526
- geodatasets>=2023.12.0
2627
- geopandas
2728
- geoviews-core>=1.9.0
@@ -31,6 +32,7 @@ dependencies:
3132
- intake-xarray>=0.5.0
3233
- intake<2.0.0,>=0.6.5
3334
- ipywidgets
35+
- jinja2
3436
- matplotlib
3537
- nbval
3638
- networkx>=2.6.3
@@ -53,6 +55,7 @@ dependencies:
5355
- pytest
5456
- pytest-cov
5557
- pytest-xdist
58+
- qpd>=0.4.4
5659
- rasterio
5760
- rioxarray
5861
- ruff
@@ -63,6 +66,7 @@ dependencies:
6366
- selenium>=3.141.0
6467
- setuptools_scm>=6
6568
- spatialpandas>=0.4.3
69+
- sqlglot
6670
- streamz>=0.3.0
6771
- xarray
6872
- xarray>=0.18.2

hvplot/tests/testfugue.py

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
try:
1111
import fugue.api as fa
12+
import fugue_sql_antlr # noqa: F401
1213
import hvplot.fugue # noqa: F401
1314
except ImportError:
1415
pytest.skip(allow_module_level=True)

pyproject.toml

+11
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,19 @@ tests-core = [
7373
tests = [
7474
"hvplot[tests-core]",
7575
"fugue[sql]",
76+
"hvplot[fugue-sql]",
77+
# end fugue
7678
"ibis-framework[duckdb]", # ibis-duckdb on conda
7779
"polars",
7880
]
81+
# In 0.9 fugue added the sql extra but didn't add a fugue-sql package, removing the sql deps from fugue
82+
# Adding them manually here
83+
fugue-sql = [
84+
"qpd >=0.4.4",
85+
"fugue-sql-antlr >=0.2.0",
86+
"sqlglot",
87+
"jinja2",
88+
]
7989
geo = [
8090
"cartopy",
8191
"fiona",
@@ -95,6 +105,7 @@ examples = [
95105
"dask[dataframe] >=2021.3.0",
96106
"datashader >=0.6.5",
97107
"fugue[sql]",
108+
"hvplot[fugue-sql]",
98109
"ibis-framework[duckdb]", # ibis-duckdb on conda
99110
"intake-parquet >=0.2.3",
100111
"intake-xarray >=0.5.0",

0 commit comments

Comments
 (0)