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

Re-enable cuspatial tests and dependency. #1253

Merged
Merged
Show file tree
Hide file tree
Changes from 3 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
1 change: 1 addition & 0 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -442,3 +442,4 @@ dependencies:
- pytest-cov
- pytest-xdist
- geopandas>=0.11.0
- cuspatial=23.10.*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- cuspatial=23.10.*
- cuspatial==23.10.*

And re-run pre-commit.

10 changes: 3 additions & 7 deletions python/cuproj/cuproj/tests/test_transform.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@

import cupy as cp
# import geopandas as gpd
import geopandas as gpd
import numpy as np
import pytest
from cupy.testing import assert_allclose
from pyproj import Transformer
from pyproj.enums import TransformDirection
from shapely.geometry import Point

# import cuspatial
import cuspatial
from cuproj import Transformer as cuTransformer

# from shapely.geometry import Point


valid_crs_combos = [
(4326, 32756),
(32756, 4326),
Expand Down Expand Up @@ -178,7 +176,6 @@ def test_wgs84_to_utm_grid(dtype, container_type,
dtype, container_type, min_corner, max_corner, crs_to)


""" Temporary fix to repair 23.08 -> 23.10 automerge
# test __cuda_array_interface__ support by using cuspatial geoseries as input
def test_geoseries_input():
s = gpd.GeoSeries(
Expand All @@ -200,4 +197,3 @@ def test_geoseries_input():

assert_allclose(cuproj_x, pyproj_x)
assert_allclose(cuproj_y, pyproj_y)
"""
1 change: 1 addition & 0 deletions python/cuproj/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ classifiers = [

[project.optional-dependencies]
test = [
"cuspatial=23.10.*",
"geopandas>=0.11.0",
"pytest",
"pytest-cov",
Expand Down