Merge pull request #249 from rapidsai/branch-0.18

rapidsai · Feb 24, 2021 · e78ad1a · e78ad1a
2 parents 340129d + 236aa39
commit e78ad1a
Show file tree

Hide file tree

Showing 80 changed files with 2,676 additions and 2,414 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -0,0 +1,16 @@
+# https://github.com/actions/labeler#common-examples
+# Adapted from https://github.com/rapidsai/cuxfilter/blob/main/.github/CODEOWNERS
+# Labels culled from https://github.com/rapidsai/cuxfilter/labels
+
+Python:
+ - 'python/**'
+ - 'notebooks/**'
+
+gpuCI:
+   - 'ci/**'
+
+conda:
+   - 'conda/**'
+
+doc:
+   - 'docs/**'
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -0,0 +1,11 @@
+name: "Pull Request Labeler"
+on:
+- pull_request_target
+
+jobs:
+ triage:
+   runs-on: ubuntu-latest
+   steps:
+   - uses: actions/labeler@main
+     with:
+       repo-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml
@@ -0,0 +1,57 @@
+name: Mark inactive issues and pull requests
+
+on:
+  schedule:
+    - cron: "0 * * * *"
+
+jobs:
+  mark-inactive-30d:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Mark 30 day inactive issues and pull requests
+        uses: actions/stale@v3
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          stale-issue-message: >
+            This issue has been labeled `inactive-30d` due to no recent activity in the past 30 days.
+            Please close this issue if no further response or action is needed.
+            Otherwise, please respond with a comment indicating any updates or changes to the original issue and/or confirm this issue still needs to be addressed.
+            This issue will be labeled `inactive-90d` if there is no activity in the next 60 days.
+          stale-issue-label: "inactive-30d"
+          exempt-issue-labels: "0 - Blocked,0 - Backlog,good first issue"
+          days-before-issue-stale: 30
+          days-before-issue-close: -1
+          stale-pr-message: >
+            This PR has been labeled `inactive-30d` due to no recent activity in the past 30 days.
+            Please close this PR if it is no longer required.
+            Otherwise, please respond with a comment indicating any updates.
+            This PR will be labeled `inactive-90d` if there is no activity in the next 60 days.
+          stale-pr-label: "inactive-30d"
+          exempt-pr-labels: "0 - Blocked,0 - Backlog,good first issue"
+          days-before-pr-stale: 30
+          days-before-pr-close: -1
+          operations-per-run: 50
+  mark-inactive-90d:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Mark 90 day inactive issues and pull requests
+        uses: actions/stale@v3
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          stale-issue-message: >
+            This issue has been labeled `inactive-90d` due to no recent activity in the past 90 days.
+            Please close this issue if no further response or action is needed.
+            Otherwise, please respond with a comment indicating any updates or changes to the original issue and/or confirm this issue still needs to be addressed.
+          stale-issue-label: "inactive-90d"
+          exempt-issue-labels: "0 - Blocked,0 - Backlog,good first issue"
+          days-before-issue-stale: 90
+          days-before-issue-close: -1
+          stale-pr-message: >
+            This PR has been labeled `inactive-90d` due to no recent activity in the past 90 days.
+            Please close this PR if it is no longer required.
+            Otherwise, please respond with a comment indicating any updates.
+          stale-pr-label: "inactive-90d"
+          exempt-pr-labels: "0 - Blocked,0 - Backlog,good first issue"
+          days-before-pr-stale: 90
+          days-before-pr-close: -1
+          operations-per-run: 50
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,27 @@
+# cuXfilter 0.18.0 (24 Feb 2021)
+
+## Bug Fixes 🐛
+
+- Add static html (#238) @AjayThorve
+
+## Documentation 📖
+
+- Update docs (#236) @AjayThorve
+
+## Improvements 🛠️
+
+- Update stale GHA with exemptions &amp; new labels (#247) @mike-wendt
+- Add GHA to mark issues/prs as stale/rotten (#244) @Ethyling
+- Pin Node version (#239) @ajschmidt8
+- fix state preserving issue for lasso-select callbacks (#231) @AjayThorve
+- Prepare Changelog for Automation (#229) @ajschmidt8
+- New charts - Number &amp; Card (#228) @AjayThorve
+- Refactor themes (#227) @AjayThorve
+- Updated templates using Panel template + React-grid-layout (#226) @AjayThorve
+- Auto-label PRs based on their content (#223) @jolorunyomi
+- Fix forward-merger conflicts for #218 (#221) @ajschmidt8
+- Branch 0.18 merge 0.17 - fix auto merge conflicts (#219) @AjayThorve
+
 # cuXfilter 0.17.0 (10 Dec 2020)
 
 ## New Features

diff --git a/README.md b/README.md
@@ -126,36 +126,50 @@ Troubleshooting help can be found [on our troubleshooting page](https://docs.rap
 - pyppeteer
 - jupyter-server-proxy
 
+## Quick Start
+
+Please see the [Demo Docker Repository](https://hub.docker.com/r/rapidsai/rapidsai/), choosing a tag based on the NVIDIA CUDA version you’re running. This provides a ready to run Docker container with example notebooks and data, showcasing how you can utilize cuxfilter, cuDF and other RAPIDS libraries.
 
 ## Installation
 
-### Conda
 
-For the most customized way of installing RAPIDS and cuxfilter, visit the selector on the RAPIDS [Get Started Page](https://rapids.ai/start.html#rapids-release-selector).
+### CUDA/GPU requirements
 
-*cuxfilter conda example installation:*
+* CUDA 10.1+
+* NVIDIA driver 418.39+
+* Pascal architecture or better (Compute Capability >=6.0)
 
-```bash
-# ex. for CUDA 10.2
-conda install -c rapidsai -c nvidia -c conda-forge \
-    -c defaults cuxfilter=0.15 python=3.6 cudatoolkit=10.2
-```
+### Conda
 
-### Docker container
+cuxfilter can be installed with conda ([miniconda](https://conda.io/miniconda.html), or the full [Anaconda distribution](https://www.anaconda.com/download)) from the `rapidsai` channel:
 
-For the most customized way of installing RAPIDS and cuxfilter, visit the selector on the RAPIDS [Get Started Page](https://rapids.ai/start.html#rapids-release-selector).
+For `cuxfilter version == 0.18` :
+```bash
+# for CUDA 10.1
+conda install -c rapidsai -c nvidia -c numba -c conda-forge \
+    cuxfilter=0.18 python=3.7 cudatoolkit=10.1
+
+# or, for CUDA 10.2
+conda install -c rapidsai -c nvidia -c numba -c conda-forge \
+    cuxfilter=0.18 python=3.7 cudatoolkit=10.2
 
-*cuxfilter docker example installation:*
+```
 
+For the nightly version of `cuxfilter` :
 ```bash
-# ex. for CUDA 10.2
-docker pull rapidsai/rapidsai:cuda10.2-runtime-ubuntu16.04
-docker run --gpus all --rm -it -p 8888:8888 -p 8787:8787 -p 8786:8786 \
-    rapidsai/rapidsai:cuda10.2-runtime-ubuntu16.04
+# for CUDA 10.1
+conda install -c rapidsai-nightly -c nvidia -c numba -c conda-forge \
+    cuxfilter python=3.7 cudatoolkit=10.1
 
-# open http://localhost:8888
+# or, for CUDA 10.2
+conda install -c rapidsai-nightly -c nvidia -c numba -c conda-forge \
+    cuxfilter python=3.7 cudatoolkit=10.2
 ```
 
+Note: cuxfilter is supported only on Linux, and with Python versions 3.7 and later.
+
+See the [Get RAPIDS version picker](https://rapids.ai/start.html) for more OS and version info. 
+
 
 ### Build/Install from Source
 See [build instructions](CONTRIBUTING.md#setting-up-your-build-environment).
@@ -215,7 +229,7 @@ Currently supported layout templates and example code can be found on the [layou
 | ------------- | ------------- |
 | bokeh  | bar, line  |
 | datashader  | scatter, scatter_geo, line, stacked_lines, heatmap, graph |
-| panel_widgets  | range_slider, date_range_slider, float_slider, int_slider, drop_down, multi_select  |
+| panel_widgets  | range_slider, date_range_slider, float_slider, int_slider, drop_down, multi_select, card, number  |
 | custom    | view_dataframe |
 | pydeck    | choropleth(3d and 2d)   |
 

diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh
@@ -58,7 +58,6 @@ conda install "cudf=$MINOR_VERSION.*" "cudatoolkit=$CUDA_REL" \
                "cuspatial=$MINOR_VERSION.*" \
                "dask-cudf=$MINOR_VERSION.*" "dask-cuda=$MINOR_VERSION.*" \
                "numba>=0.51.2" \
-               "panel<=0.9.7" \
                "bokeh<=2.2.3" \
                "rapids-build-env=$MINOR_VERSION.*" \
                "rapids-notebook-env=$MINOR_VERSION.*"

diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
@@ -50,7 +50,14 @@ function sed_runner() {
 sed_runner 's/version = .*/version = '"'${NEXT_SHORT_TAG}'"'/g' docs/source/conf.py
 sed_runner 's/release = .*/release = '"'${NEXT_FULL_TAG}'"'/g' docs/source/conf.py
 
-# bump rmm
+# bump cudf
 for FILE in conda/environments/*.yml; do
   sed_runner "s/cudf=.*/cudf=${NEXT_SHORT_TAG}/g" ${FILE};
+  sed_runner "s/cuspatial=.*/cuspatial=${NEXT_SHORT_TAG}/g" ${FILE};
+  sed_runner "s/dask-cuda=.*/dask-cuda=${NEXT_SHORT_TAG}/g" ${FILE};
+  sed_runner "s/dask-cudf=.*/dask-cudf=${NEXT_SHORT_TAG}/g" ${FILE};
 done
+
+# README.md update
+sed_runner "s/version == ${CURRENT_SHORT_TAG}/version == ${NEXT_SHORT_TAG}/g" README.md
+sed_runner "s/cuxfilter=${CURRENT_SHORT_TAG}/cuxfilter=${NEXT_SHORT_TAG}/g" README.md
diff --git a/conda/environments/cuxfilter_dev_cuda10.1.yml b/conda/environments/cuxfilter_dev_cuda10.1.yml
@@ -7,21 +7,21 @@ channels:
 - anaconda
 dependencies:
 - cupy>7.1.0,<9.0.0a0
-- cuspatial=0.17
+- cuspatial=0.18
 - python>=3.6,<3.8
-- cudf=0.17
+- cudf=0.18
 - dask>=2.12.0
 - distributed>=2.12.0
-- dask-cuda=0.17
-- dask-cudf=0.17
+- dask-cuda=0.18
+- dask-cudf=0.18
 - datashader>=0.11.1
 - numba>=0.51.2
 - geopandas>=0.6, <=0.8.1
 - pyproj>=2.4, <=2.6.1.post1
 - libwebp
 - pandoc=<2.0.0
 - bokeh>=2.1.1,<=2.2.3
-- panel>=0.9.1, <=0.9.7
+- panel>=0.10.3
 - cudatoolkit=10.1
 - nodejs
 - recommonmark

diff --git a/conda/environments/cuxfilter_dev_cuda10.2.yml b/conda/environments/cuxfilter_dev_cuda10.2.yml
@@ -8,21 +8,21 @@ channels:
 - anaconda
 dependencies:
 - cupy>7.1.0,<9.0.0a0
-- cuspatial=0.17
+- cuspatial=0.18
 - python>=3.6,<3.8
-- cudf=0.17
+- cudf=0.18
 - dask>=2.12.0
 - distributed>=2.12.0
-- dask-cuda=0.17
-- dask-cudf=0.17
+- dask-cuda=0.18
+- dask-cudf=0.18
 - datashader>=0.11.1
 - numba>=0.51.2
 - geopandas>=0.6, <=0.8.1
 - pyproj>=2.4, <=2.6.1.post1
 - libwebp
 - pandoc=<2.0.0
 - bokeh>=2.1.1,<=2.2.3
-- panel>=0.9.1, <=0.9.7
+- panel>=0.10.3
 - cudatoolkit=10.2
 - nodejs
 - recommonmark

diff --git a/conda/environments/cuxfilter_dev_cuda11.0.yml b/conda/environments/cuxfilter_dev_cuda11.0.yml
@@ -7,21 +7,21 @@ channels:
 - anaconda
 dependencies:
 - cupy>7.1.0,<9.0.0a0
-- cuspatial=0.17
+- cuspatial=0.18
 - python>=3.6,<3.8
-- cudf=0.17
+- cudf=0.18
 - dask>=2.12.0
 - distributed>=2.12.0
-- dask-cuda=0.17
-- dask-cudf=0.17
+- dask-cuda=0.18
+- dask-cudf=0.18
 - datashader>=0.11.1
 - numba>=0.51.2
 - geopandas>=0.6, <=0.8.1
 - pyproj>=2.4, <=2.6.1.post1
 - libwebp
 - pandoc=<2.0.0
 - bokeh>=2.1.1,<=2.2.3
-- panel>=0.9.1, <=0.9.7
+- panel>=0.10.3
 - cudatoolkit=11.0
 - nodejs
 - recommonmark

diff --git a/conda/recipes/cuxfilter/meta.yaml b/conda/recipes/cuxfilter/meta.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2018, NVIDIA CORPORATION.
+# Copyright (c) 2018-2020, NVIDIA CORPORATION.
 
 {% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') + environ.get('VERSION_SUFFIX', '') %}
 {% set minor_version =  version.split('.')[0] + '.' + version.split('.')[1] %}
@@ -30,12 +30,12 @@ requirements:
     - dask-cuda {{ minor_version }}
     - datashader >=0.11.1, <0.12
     - numba >=0.51.2
-    - cupy  >7.1.0,<9.0.0a0
-    - panel>=0.9.1, <=0.9.7
+    - cupy  >=7.8.0,<9.0.0a0
+    - panel >=0.10.3
     - bokeh >=2.1.1,<=2.2.3
     - pyproj >=2.4, <=2.6.1.post1
     - geopandas >=0.6, <=0.8.1
-    - nodejs
+    - nodejs >=12,<15
     - libwebp
     - pyppeteer <=0.2.2
     - jupyter-server-proxy

diff --git a/docs/_images/demo.gif b/docs/_images/demo.gif
diff --git a/docs/_images/demo2.gif b/docs/_images/demo2.gif
diff --git a/docs/source/10 minutes to cuxfilter.ipynb b/docs/source/10 minutes to cuxfilter.ipynb
diff --git a/docs/source/charts/deckgl_charts.rst b/docs/source/charts/deckgl_charts.rst
@@ -38,7 +38,6 @@ Example 3d-Choropleth
     # use chart0.view() in a notebook cell to view the individual charts
     chart0.view()
 
-.. image:: ../../_images/deckgl_chart_1.png
 
 
 Example 2d-Choropleth
@@ -70,4 +69,3 @@ Example 2d-Choropleth
     # use chart0.view() in a notebook cell to view the individual charts
     chart0.view()
 
-.. image:: ../../_images/deckgl_chart_2.png