Revert "Move trajectory into sub-package"

This reverts commit 0700863.
rapidsai · rapids-bot · Aug 23, 2022 · Aug 15, 2022 · Aug 15, 2022 · Aug 15, 2022
commit 5915ce9f8384520180389c8225a2fb2554bb3f88
@@ -1,5 +1,5 @@
 from ._version import get_versions
-from .core.trajectory import interpolate
+from .core import interpolate
 from .core.gis import (
     directed_hausdorff_distance,
     haversine_distance,
@@ -10,7 +10,7 @@
     pairwise_linestring_distance,
 )
 from .core.indexing import quadtree_on_points
-from .core.trajectory import CubicSpline
+from .core.interpolate import CubicSpline
 from .core.spatial_join import (
     join_quadtree_and_bounding_boxes,
     quadtree_point_in_polygon,

diff --git a/.../cuspatial/core/trajectory/interpolate.py → ...n/cuspatial/cuspatial/core/interpolate.py b/.../cuspatial/core/trajectory/interpolate.py → ...n/cuspatial/cuspatial/core/interpolate.py
diff --git a/...tial/cuspatial/core/trajectory/generic.py → ...on/cuspatial/cuspatial/core/trajectory.py b/...tial/cuspatial/core/trajectory/generic.py → ...on/cuspatial/cuspatial/core/trajectory.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2022, NVIDIA CORPORATION.
+# Copyright (c) 2019, NVIDIA CORPORATION.
 
 import numpy as np
 

diff --git a/python/cuspatial/cuspatial/core/trajectory/__init__.py b/python/cuspatial/cuspatial/core/trajectory/__init__.py
diff --git a/...tial/tests/trajectory/test_interpolate.py → ...patial/cuspatial/tests/test_spline_fit.py b/...tial/tests/trajectory/test_interpolate.py → ...patial/cuspatial/tests/test_spline_fit.py
diff --git a/...atial/tests/trajectory/test_trajectory.py → ...patial/cuspatial/tests/test_trajectory.py b/...atial/tests/trajectory/test_trajectory.py → ...patial/cuspatial/tests/test_trajectory.py