Merge branch 'branch-23.08' of github.com:rapidsai/cuxfilter into add…

…-pip-wheels
rapidsai · Jul 11, 2023 · fd70ca3 · fd70ca3
1 parent d1c8604
commit fd70ca3
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 19 deletions.
diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -9,12 +9,12 @@ dependencies:
 - bokeh>=2.4.2,<=2.5
 - cuda-version=11.8
 - cudatoolkit
-- cudf==23.08.*
-- cugraph==23.08.*
+- cudf==23.8.*
+- cugraph==23.8.*
 - cupy>=12.0.0
-- cuspatial==23.08.*
-- dask-cuda==23.08.*
-- dask-cudf==23.08.*
+- cuspatial==23.8.*
+- dask-cuda==23.8.*
+- dask-cudf==23.8.*
 - datashader>=0.15
 - geopandas>=0.11.0
 - holoviews>=1.15.0,<=1.15.4

diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml
@@ -8,12 +8,12 @@ channels:
 dependencies:
 - bokeh>=2.4.2,<=2.5
 - cuda-version=12.0
-- cudf==23.08.*
-- cugraph==23.08.*
+- cudf==23.8.*
+- cugraph==23.8.*
 - cupy>=12.0.0
-- cuspatial==23.08.*
-- dask-cuda==23.08.*
-- dask-cudf==23.08.*
+- cuspatial==23.8.*
+- dask-cuda==23.8.*
+- dask-cudf==23.8.*
 - datashader>=0.15
 - geopandas>=0.11.0
 - holoviews>=1.15.0,<=1.15.4

diff --git a/conda/recipes/cuxfilter/meta.yaml b/conda/recipes/cuxfilter/meta.yaml
@@ -1,6 +1,7 @@
 # Copyright (c) 2018-2023, NVIDIA CORPORATION.
 
 {% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') %}
+{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
 {% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %}
 {% set cuda_major = cuda_version.split('.')[0] %}
 {% set py_version = environ['CONDA_PY'] %}

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -125,7 +125,7 @@ dependencies:
           - notebook>=0.5.0
       - output_types: [conda]
         packages:
-          - cugraph==23.08.*
+          - cugraph==23.8.*
   py_version:
     specific:
       - output_types: conda
@@ -146,10 +146,10 @@ dependencies:
       - output_types: [conda, requirements, pyproject]
         packages:
           - bokeh>=2.4.2,<=2.5
-          - cudf==23.08.*
-          - cuspatial==23.08.*
-          - dask-cuda==23.08.*
-          - dask-cudf==23.08.*
+          - cudf==23.8.*
+          - cuspatial==23.8.*
+          - dask-cuda==23.8.*
+          - dask-cudf==23.8.*
           - datashader>=0.15
           - geopandas>=0.11.0
           - holoviews>=1.15.0,<=1.15.4

diff --git a/python/pyproject.toml b/python/pyproject.toml
@@ -19,11 +19,11 @@ license = { text = "Apache 2.0" }
 requires-python = ">=3.9"
 dependencies = [
     "bokeh>=2.4.2,<=2.5",
-    "cudf==23.08.*",
+    "cudf==23.8.*",
     "cupy-cuda11x>=12.0.0",
-    "cuspatial==23.08.*",
-    "dask-cuda==23.08.*",
-    "dask-cudf==23.08.*",
+    "cuspatial==23.8.*",
+    "dask-cuda==23.8.*",
+    "dask-cudf==23.8.*",
     "datashader>=0.15",
     "geopandas>=0.11.0",
     "holoviews>=1.15.0,<=1.15.4",