Merge remote-tracking branch 'upstream/branch-0.5'

Author: ajschmidt8

.travis.yml

@@ -78,19 +78,6 @@ jupyter lab build
 This application is distributed as two subpackages.
 
 The JupyterLab frontend part is published to [npm](https://www.npmjs.com/package/jupyterlab-nvdashboard),
-and the server-side part to [PyPI](https://pypi.org/project/jupyterlab-nvdashboard/).
+and the server-side part to both [PyPI](https://pypi.org/project/jupyterlab-nvdashboard/) and [Anaconda](https://anaconda.org/rapidsai/jupyterlab-nvdashboard) ([nightlies](https://anaconda.org/rapidsai-nightly/jupyterlab-nvdashboard)).
 
-Releases for both packages are done with the `jlpm` tool, `git` and Travis CI.
-
-_Note: Package versions are not prefixed with the letter `v`. You will need to disable this._
-
-```console
-$ jlpm config set version-tag-prefix ""
-```
-
-Making a release
-
-```console
-$ jlpm version [--major|--minor|--patch]  # updates package.json and creates git commit and tag
-$ git push && git push --tags  # pushes tags to GitHub which triggers Travis CI to build and deploy
-```
+Releases for both packages are handled by [gpuCI](https://gpuci.gpuopenanalytics.com/job/rapidsai/job/gpuci/job/jupyterlab-nvdashboard/). Nightly builds are triggered when a push to a versioned branch occurs (i.e. `branch-0.5`). Stable builds are triggered when a push to the `main` branch occurs.

README.md

@@ -1,12 +1,13 @@
 #!/bin/bash
-# Copyright (c) 2019, NVIDIA CORPORATION.
+# Copyright (c) 2020, NVIDIA CORPORATION.
 
 # Ignore errors and set path
 set +e
-PATH=/conda/bin:$PATH
+PATH=/opt/conda/bin:$PATH
 
 # Activate common conda env
-source activate gdf
+. /opt/conda/etc/profile.d/conda.sh
+conda activate rapids
 
 # Run flake8 and get results/return code
 FLAKE=`flake8 --exclude=src,style,test`

ci/checks/style.sh

@@ -1,21 +1,16 @@
 #!/bin/bash
-# Copyright (c) 2018, NVIDIA CORPORATION.
+# Copyright (c) 2020, NVIDIA CORPORATION.
 set -e
 
-# Logger function for build status output
-function logger() {
-  echo -e "\n>>>> $@\n"
-}
-
 # Set path and build parallel level
-export PATH=/conda/bin:/usr/local/cuda/bin:$PATH
-export PARALLEL_LEVEL=4
+export PATH=/opt/conda/bin:/usr/local/cuda/bin:$PATH
+export PARALLEL_LEVEL=${PARALLEL_LEVEL:-4}
 
 # Set home to the job's workspace
-export HOME=$WORKSPACE
+export HOME="$WORKSPACE"
 
 # Switch to project root; also root of repo checkout
-cd $WORKSPACE
+cd "$WORKSPACE"
 
 # Get latest tag and number of commits since tag
 export GIT_DESCRIBE_TAG=`git describe --abbrev=0 --tags`
@@ -26,21 +21,28 @@ if [[ "$BUILD_MODE" = "branch" && "$SOURCE_BRANCH" = branch-* ]] ; then
   export VERSION_SUFFIX=`date +%y%m%d`
 fi
 
+# Setup 'gpuci_conda_retry' for build retries (results in 2 total attempts)
+export GPUCI_CONDA_RETRY_MAX=1
+export GPUCI_CONDA_RETRY_SLEEP=30
+
 ################################################################################
 # SETUP - Check environment
 ################################################################################
 
-logger "Get env..."
+gpuci_logger "Get env"
 env
 
-logger "Activate conda env..."
-source activate gdf
+gpuci_logger "Activate conda env"
+. /opt/conda/etc/profile.d/conda.sh
+conda activate rapids
 
-logger "Check versions..."
+gpuci_logger "Check versions"
 python --version
-gcc --version
-g++ --version
-conda list
+$CC --version
+$CXX --version
+conda info
+conda config --show-sources
+conda list --show-channel-urls
 
 # FIX Added to deal with Anancoda SSL verification issues during conda builds
 conda config --set ssl_verify False
@@ -49,21 +51,22 @@ conda config --set ssl_verify False
 # BUILD - Conda, pip, & npm package
 ################################################################################
 
-logger "Build conda pkg for jupyterlab-nvdashboard..."
-conda build conda/recipes/jupyterlab-nvdashboard --python=$PYTHON
+gpuci_logger "Build conda pkg for jupyterlab-nvdashboard"
+gpuci_conda_retry build conda/recipes/jupyterlab-nvdashboard --python=$PYTHON
 
-logger "Build pip pkg for jupyterlab-nvdashboard..."
+gpuci_logger "Build pip pkg for jupyterlab-nvdashboard"
 rm -rf dist/
 python setup.py sdist bdist_wheel
 
-logger "Build npm pkg for jupyterlab-nvdashboard..."
-conda install -y nodejs=10 jupyterlab
+gpuci_logger "Build npm pkg for jupyterlab-nvdashboard"
+gpuci_conda_retry install -y nodejs=10 jupyterlab
+npm i -g npm@latest
 jlpm install
 jlpm build
 
 ################################################################################
 # UPLOAD - Packages
 ################################################################################
 
-logger "Upload packages..."
-source ci/cpu/upload-packages.sh
+gpuci_logger "Upload packages"
+source ci/cpu/upload.sh

ci/cpu/build.sh

@@ -0,0 +1,62 @@
+#!/bin/bash
+# Copyright (c) 2020, NVIDIA CORPORATION.
+
+set -e
+
+# Setup 'gpuci_retry' for upload retries (results in 4 total attempts)
+export GPUCI_RETRY_MAX=3
+export GPUCI_RETRY_SLEEP=30
+
+# Set default label options if they are not defined elsewhere
+export LABEL_OPTION=${LABEL_OPTION:-"--label main"}
+
+# Skip uploads unless BUILD_MODE == "branch"
+if [ ${BUILD_MODE} != "branch" ]; then
+  echo "Skipping upload"
+  return 0
+fi
+
+# Skip uploads if there is no upload key
+if [ -z "$MY_UPLOAD_KEY" ]; then
+  echo "No upload key"
+  return 0
+fi
+
+if [ -z "$TWINE_PASSWORD" ]; then
+  echo "TWINE_PASSWORD not set"
+  return 0
+fi
+
+if [ -z "$NPM_TOKEN" ]; then
+  echo "NPM_TOKEN not set"
+  return 0
+fi
+
+################################################################################
+# SETUP - Get conda file output locations
+################################################################################
+
+gpuci_logger "Get conda file output locations"
+export JUPYTERLAB_NVDASHBOARD_FILE=`conda build conda/recipes/jupyterlab-nvdashboard --output`
+
+################################################################################
+# UPLOAD - Conda packages
+################################################################################
+
+gpuci_logger "Starting conda uploads"
+
+gpuci_retry anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-rapidsai} ${LABEL_OPTION} --skip-existing ${JUPYTERLAB_NVDASHBOARD_FILE}
+
+
+echo "Upload pypi"
+twine upload --skip-existing -u ${TWINE_USERNAME:-rapidsai} dist/*
+
+echo '//registry.npmjs.org/:_authToken=${NPM_TOKEN}' > .npmrc
+if [[ "$BUILD_MODE" == "branch" && "${SOURCE_BRANCH}" != 'main' ]]; then
+  echo "Nightly build, publishing to npm with nightly tag"
+  # Updates package.json version before publishing since previous publications can't be overwritten
+  npm version --no-git-tag-version $(git describe --tags)
+  npm publish --tag=nightly
+else
+  npm publish
+fi

ci/cpu/upload-packages.sh

@@ -1,22 +1,17 @@
 #!/bin/bash
-# Copyright (c) 2018, NVIDIA CORPORATION.
+# Copyright (c) 2020, NVIDIA CORPORATION.
 set -e
 NUMARGS=$#
 ARGS=$*
 
-# Logger function for build status output
-function logger() {
-  echo -e "\n>>>> $@\n"
-}
-
 # Arg parsing function
 function hasArg {
     (( ${NUMARGS} != 0 )) && (echo " ${ARGS} " | grep -q " $1 ")
 }
 
 # Set path and build parallel level
-export PATH=/conda/bin:/usr/local/cuda/bin:$PATH
-export PARALLEL_LEVEL=4
+export PATH=/opt/conda/bin:/usr/local/cuda/bin:$PATH
+export PARALLEL_LEVEL=${PARALLEL_LEVEL:-4}
 export CUDA_REL=${CUDA_VERSION%.*}
 
 # Set home to the job's workspace
@@ -31,34 +26,36 @@ export MINOR_VERSION=`echo $GIT_DESCRIBE_TAG | grep -o -E '([0-9]+\.[0-9]+)'`
 # SETUP - Check environment
 ################################################################################
 
-logger "Check environment..."
+gpuci_logger "Check environment"
 env
 
-logger "Check GPU usage..."
+gpuci_logger "Check GPU usage"
 nvidia-smi
 
-logger "Activate conda env..."
-source activate gdf
+gpuci_logger "Activate conda env"
+. /opt/conda/etc/profile.d/conda.sh
+conda activate rapids
+
+gpuci_logger "Install conda dependencies"
+gpuci_conda_retry install -y nodejs=10 jupyterlab
 
-logger "Install conda dependencies"
-conda install -y nodejs=10 jupyterlab
 
 ################################################################################
 # TEST
 ################################################################################
 
 if hasArg --skip-tests; then
-    logger "Skipping Tests..."
+    gpuci_logger "Skipping Tests"
 else
-    logger "Check GPU usage..."
+    gpuci_logger "Check GPU usage"
     nvidia-smi
 
     cd $WORKSPACE
-    logger "Python py.test for jupyterlab_nvdashboard..."
+    gpuci_logger "Python py.test for jupyterlab_nvdashboard"
     python -m pip install -e .
     py.test --cache-clear --junitxml=${WORKSPACE}/junit-nvstrings.xml -v jupyterlab_nvdashboard
 
-    logger "Node jlpm test for jupyterlab_nvdashboard..."
+    gpuci_logger "Node jlpm test for jupyterlab_nvdashboard"
     jlpm install
     jlpm test
 fi

ci/cpu/upload.sh

@@ -11,4 +11,4 @@
 
 
 def launch_server():
-    return {"command": [sys.executable, serverfile, '{port}']}
+    return {"command": [sys.executable, serverfile, "{port}"], "timeout": 20}

ci/gpu/build.sh

@@ -1,6 +1,6 @@
 {
   "name": "jupyterlab-nvdashboard",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "A JupyterLab extension for displaying GPU usage dashboards",
   "keywords": [
     "jupyter",