Skip to content

Commit 08e9d1e

Browse files
ncclementicpcloud
andauthored
chore: add env for arm64 and xfail geospatial tests (#8371)
Co-authored-by: Phillip Cloud <417981+cpcloud@users.noreply.github.com>
1 parent 361a92e commit 08e9d1e

File tree

11 files changed

+138
-15
lines changed

11 files changed

+138
-15
lines changed

conda/environment-arm64.yml

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
name: ibis-dev
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
# runtime dependencies
6+
- python =3.10
7+
- atpublic >=2.3
8+
- bidict >=0.22.1
9+
- clickhouse-connect >=0.5.23
10+
- dask >=2022.9.1
11+
- datafusion >=0.6
12+
- db-dtypes >=0.3.0,<2
13+
- deltalake
14+
- duckdb-engine <1,>=0.1.8
15+
- filelock >=3.7.0,<4
16+
- fsspec >=2022.1.0
17+
- gcsfs
18+
- geoalchemy2 >=0.6.3
19+
- geopandas >=0.6
20+
- google-cloud-bigquery >=3,<4
21+
- google-cloud-bigquery-storage >=2,<3
22+
- impyla >=0.17
23+
- multipledispatch >=0.6,<2
24+
- numpy >=1.15,<2
25+
- oracledb >=1.3.1
26+
- packaging >=21.3
27+
- pandas >=1.2.5
28+
- parsy >=2
29+
- pins >=0.8.2
30+
- poetry-core >=1.0.0
31+
- poetry-dynamic-versioning >=0.18.0
32+
- polars >=0.19
33+
- psycopg2 >=2.8.4
34+
- pyarrow >=2
35+
- pyarrow-hotfix >=0.4
36+
- pydata-google-auth
37+
- pydruid >=0.6.5
38+
- pymssql >=2.2.5
39+
- pymysql >=1
40+
- pyspark >=3
41+
- python-dateutil >=2.8.2
42+
- python-duckdb >=0.8.1
43+
- python-graphviz >=0.16
44+
- pytz >=2022.7
45+
- regex >=2021.7.6
46+
- requests >=2
47+
- rich >=12.4.4
48+
- snowflake-connector-python >=3.0.2
49+
- snowflake-sqlalchemy >=1.4.1
50+
- sqlalchemy <3,>=1.4
51+
- sqlalchemy-risingwave >=1.0.0
52+
- sqlalchemy-views <1,>=0.3.1
53+
- sqlalchemy_exasol >=4.6.0
54+
- sqlglot >=18.7.0,<=20.11
55+
- toolz >=0.11
56+
- trino-python-client >=0.321
57+
# geospatial
58+
- leafmap >=0.29.6
59+
# streaming
60+
- kafka-python
61+
# test dependencies
62+
- filelock >=3.7.0,<4
63+
- hypothesis >=6.58.0,<7
64+
- pytest >=7.0.0,<9
65+
- pytest-benchmark >=3.4.1,<5
66+
- pytest-clarity >=1.0.1,<2
67+
- pytest-cov >=3.0.0,<5
68+
- pytest-httpserver >=1.0.5,<2
69+
- pytest-mock >=3.6.1,<4
70+
- pytest-randomly >=3.10.1,<4
71+
- pytest-repeat >=0.9.1,<0.10
72+
- pytest-snapshot >=0.9.0,<1
73+
- pytest-xdist >=2.3.0,<4
74+
- requests >=2,<3
75+
# docs
76+
- altair >=5.0.1
77+
- distributed >=2022.9.1
78+
- ipykernel >=6.25.1
79+
- itables >=1.6.3
80+
- nbclient >=0.8.0
81+
- plotly >=5.16.1
82+
- plotnine >=0.12.2
83+
- py-cpuinfo >=9
84+
- quartodoc >=0.6.1
85+
- seaborn
86+
# dev utilities
87+
- codespell >=2.2.6
88+
- ipython
89+
- poetry-plugin-export
90+
- pre-commit
91+
- prettier
92+
- pydeps >=1.12.7
93+
- pyinstrument
94+
- ruff >=0.1.8
95+
- taplo
96+
- tqdm >=4.66.1
97+
- just
98+
- pip
99+
- pip:
100+
- shapely>=2,<3
101+
- apache-flink>=1.18.1
File renamed without changes.

ibis/backends/duckdb/tests/snapshots/test_geospatial/test_literal_geospatial_inferred/shp8-0_0_1_1_2_2/out.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ SELECT
22
ST_ASWKB("result") AS result
33
FROM (
44
SELECT
5-
ST_GEOMFROMTEXT('MULTIPOINT (0 0, 1 1, 2 2)') AS "result"
5+
ST_GEOMFROMTEXT('MULTIPOINT ((0 0), (1 1), (2 2))') AS "result"
66
)

ibis/backends/duckdb/tests/test_geospatial.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,14 @@ def test_literal_geospatial_explicit(con, expr, snapshot):
281281
(shp_polygon_0, "((0 0, 1 1, 2 2, 0 0))"),
282282
(shp_multipolygon_0, "(((0 0, 1 1, 2 2, 0 0)))"),
283283
(shp_multilinestring_0, "((0 0, 1 1, 2 2), (2 2, 1 1, 0 0))"),
284-
(shp_multipoint_0, "(0 0, 1 1, 2 2)"),
284+
param(
285+
shp_multipoint_0,
286+
"((0 0), (1 1), (2 2))",
287+
marks=pytest.mark.xfail(
288+
raises=AssertionError,
289+
reason="Bug-fix change in GEOS 3.12 see shapely issue #1992",
290+
),
291+
),
285292
],
286293
)
287294
def test_literal_geospatial_inferred(con, shp, expected, snapshot):
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SELECT
2-
ST_ASEWKB("t0"."<MULTIPOINT (10 40, 40 30, 20 20, 30 10)>") AS "<MULTIPOINT (10 40, 40 30, 20 20, 30 10)>"
2+
ST_ASEWKB("t0"."<MULTIPOINT ((10 40), (40 30), (20 20), (30 10))>") AS "<MULTIPOINT ((10 40), (40 30), (20 20), (30 10))>"
33
FROM (
44
SELECT
5-
ST_GEOMFROMTEXT('MULTIPOINT (10 40, 40 30, 20 20, 30 10)', 4326) AS "<MULTIPOINT (10 40, 40 30, 20 20, 30 10)>"
5+
ST_GEOMFROMTEXT('MULTIPOINT ((10 40), (40 30), (20 20), (30 10))', 4326) AS "<MULTIPOINT ((10 40), (40 30), (20 20), (30 10))>"
66
) AS "t0"
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SELECT
2-
ST_ASEWKB("t0"."<MULTIPOINT (10 40, 40 30, 20 20, 30 10)>") AS "<MULTIPOINT (10 40, 40 30, 20 20, 30 10)>"
2+
ST_ASEWKB("t0"."<MULTIPOINT ((10 40), (40 30), (20 20), (30 10))>") AS "<MULTIPOINT ((10 40), (40 30), (20 20), (30 10))>"
33
FROM (
44
SELECT
5-
ST_GEOMFROMTEXT('MULTIPOINT (10 40, 40 30, 20 20, 30 10)', 4326) AS "<MULTIPOINT (10 40, 40 30, 20 20, 30 10)>"
5+
ST_GEOMFROMTEXT('MULTIPOINT ((10 40), (40 30), (20 20), (30 10))', 4326) AS "<MULTIPOINT ((10 40), (40 30), (20 20), (30 10))>"
66
) AS "t0"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SELECT
2-
ST_ASEWKB("t0"."<MULTIPOINT (10 40, 40 30, 20 20, 30 10)>") AS "<MULTIPOINT (10 40, 40 30, 20 20, 30 10)>"
2+
ST_ASEWKB("t0"."<MULTIPOINT ((10 40), (40 30), (20 20), (30 10))>") AS "<MULTIPOINT ((10 40), (40 30), (20 20), (30 10))>"
33
FROM (
44
SELECT
5-
ST_GEOMFROMTEXT('MULTIPOINT (10 40, 40 30, 20 20, 30 10)') AS "<MULTIPOINT (10 40, 40 30, 20 20, 30 10)>"
5+
ST_GEOMFROMTEXT('MULTIPOINT ((10 40), (40 30), (20 20), (30 10))') AS "<MULTIPOINT ((10 40), (40 30), (20 20), (30 10))>"
66
) AS "t0"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SELECT
2-
ST_ASEWKB("t0"."<MULTIPOINT (10 40, 40 30, 20 20, 30 10)>") AS "<MULTIPOINT (10 40, 40 30, 20 20, 30 10)>"
2+
ST_ASEWKB("t0"."<MULTIPOINT ((10 40), (40 30), (20 20), (30 10))>") AS "<MULTIPOINT ((10 40), (40 30), (20 20), (30 10))>"
33
FROM (
44
SELECT
5-
ST_GEOMFROMTEXT('MULTIPOINT (10 40, 40 30, 20 20, 30 10)', 4326) AS "<MULTIPOINT (10 40, 40 30, 20 20, 30 10)>"
5+
ST_GEOMFROMTEXT('MULTIPOINT ((10 40), (40 30), (20 20), (30 10))', 4326) AS "<MULTIPOINT ((10 40), (40 30), (20 20), (30 10))>"
66
) AS "t0"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SELECT
2-
ST_ASEWKB("t0"."<MULTIPOINT (0 0, 1 1, 2 2)>") AS "<MULTIPOINT (0 0, 1 1, 2 2)>"
2+
ST_ASEWKB("t0"."<MULTIPOINT ((0 0), (1 1), (2 2))>") AS "<MULTIPOINT ((0 0), (1 1), (2 2))>"
33
FROM (
44
SELECT
5-
ST_GEOMFROMTEXT('MULTIPOINT (0 0, 1 1, 2 2)') AS "<MULTIPOINT (0 0, 1 1, 2 2)>"
5+
ST_GEOMFROMTEXT('MULTIPOINT ((0 0), (1 1), (2 2))') AS "<MULTIPOINT ((0 0), (1 1), (2 2))>"
66
) AS "t0"

ibis/backends/postgres/tests/test_geospatial.py

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,13 @@ def test_literal_geospatial_explicit(con, expr, snapshot):
8181
shp_polygon_0,
8282
shp_multipolygon_0,
8383
shp_multilinestring_0,
84-
shp_multipoint_0,
84+
param(
85+
shp_multipoint_0,
86+
marks=pytest.mark.xfail(
87+
raises=AssertionError,
88+
reason="Bug-fix change in GEOS 3.12 see shapely issue #1992",
89+
),
90+
),
8591
],
8692
)
8793
def test_literal_geospatial_inferred(con, shp, snapshot):
@@ -387,7 +393,15 @@ def test_geo_dataframe(geotable):
387393
id="polygon_single",
388394
),
389395
# Multipart geometries (2D)
390-
param("multipoint", ((10, 40), (40, 30), (20, 20), (30, 10)), id="multipoint"),
396+
param(
397+
"multipoint",
398+
((10, 40), (40, 30), (20, 20), (30, 10)),
399+
id="multipoint",
400+
marks=pytest.mark.xfail(
401+
raises=AssertionError,
402+
reason="Bug-fix change in GEOS 3.12 see shapely issue #1992",
403+
),
404+
),
391405
param(
392406
"multilinestring",
393407
(((10, 10), (20, 20), (10, 40)), ((40, 40), (30, 30), (40, 20), (30, 10))),
@@ -409,7 +423,6 @@ def test_geo_dataframe(geotable):
409423
def test_geo_literals_smoke(con, shape, value, modifier, snapshot):
410424
"""Smoke tests for geo spatial literals."""
411425
expr = ibis.literal(value, type=getattr(dt, shape).copy(**modifier))
412-
413426
snapshot.assert_match(con.compile(expr), "out.sql")
414427

415428

pyproject.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,8 @@ filterwarnings = [
270270
"ignore:Possible nested set at position:FutureWarning",
271271
'ignore:\s+You did not provide metadata:UserWarning',
272272
"ignore:Minimal version of pyarrow will soon be increased:FutureWarning",
273+
# Dask deprecation warning - switch to dask-expr
274+
"ignore:The current Dask DataFrame implementation is deprecated:DeprecationWarning",
273275
# numpy by way of dask
274276
'ignore:np\.find_common_type is deprecated:DeprecationWarning',
275277
# pandas

0 commit comments

Comments
 (0)