Merge pull request #6078 from kkraus14/fix-automerge

[REVIEW] Fix automerge [skip ci]
rapidsai · Aug 24, 2020 · 5fbffb6 · 5fbffb6
2 parents 88826ee + 0974d48
commit 5fbffb6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -280,7 +280,7 @@ For detailed information on usage of this script, see [here](ci/local/README.md)
 
 ## Automated Build in Docker Container
 
-A Dockerfile is provided with a preconfigured conda environment for building and installing cuDF from source based off of the master branch.
+A Dockerfile is provided with a preconfigured conda environment for building and installing cuDF from source based off of the main branch.
 
 ### Prerequisites
 
@@ -317,7 +317,7 @@ flag. Below is a list of the available arguments and their purpose:
 | `LINUX_VERSION` | ubuntu16.04 | ubuntu18.04 | set Ubuntu version |
 | `CC` & `CXX` | 5 | 7 | set gcc/g++ version; **NOTE:** gcc7 requires Ubuntu 18.04 |
 | `CUDF_REPO` | This repo | Forks of cuDF | set git URL to use for `git clone` |
-| `CUDF_BRANCH` | master | Any branch name | set git branch to checkout of `CUDF_REPO` |
+| `CUDF_BRANCH` | main | Any branch name | set git branch to checkout of `CUDF_REPO` |
 | `NUMBA_VERSION` | newest | >=0.40.0 | set numba version |
 | `NUMPY_VERSION` | newest | >=1.14.3 | set numpy version |
 | `PANDAS_VERSION` | newest | >=0.23.4 | set pandas version |

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://gpuci.gpuopenanalytics.com/job/rapidsai/job/gpuci/job/cudf/job/branches/job/cudf-branch-pipeline/badge/icon)](https://gpuci.gpuopenanalytics.com/job/rapidsai/job/gpuci/job/cudf/job/branches/job/cudf-branch-pipeline/)
 
-**NOTE:** For the latest stable [README.md](https://github.com/rapidsai/cudf/blob/master/README.md) ensure you are on the `master` branch.
+**NOTE:** For the latest stable [README.md](https://github.com/rapidsai/cudf/blob/main/README.md) ensure you are on the `main` branch.
 
 Built based on the [Apache Arrow](http://arrow.apache.org/) columnar memory format, cuDF is a GPU DataFrame library for loading, joining, aggregating, filtering, and otherwise manipulating data.
 

diff --git a/conda/recipes/dask-cudf/run_test.sh b/conda/recipes/dask-cudf/run_test.sh
@@ -8,7 +8,7 @@ function logger() {
   echo -e "\n>>>> $@\n"
 }
 
-# Install the master version of dask and distributed
+# Install the latest version of dask and distributed
 logger "pip install git+https://github.com/dask/distributed.git --upgrade --no-deps"
 pip install "git+https://github.com/dask/distributed.git" --upgrade --no-deps
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -16,4 +16,4 @@ exclude = '''
     build |
     dist
 )/
-'''
+'''
diff --git a/python/custreamz/README.md b/python/custreamz/README.md
@@ -36,7 +36,7 @@ tips_df['tip_percentage'] = tips_df['tip'] / tips_df['total_bill'] * 100
 print(tips_df.groupby('size').tip_percentage.mean())
 ```
 
-A "hello world" of using cuStreamz with python streamz can be found [here](https://github.com/rapidsai-community/notebooks-contrib/blob/master/getting_started_notebooks/basics/hello_streamz.ipynb)
+A "hello world" of using cuStreamz with python streamz can be found [here](https://github.com/rapidsai-community/notebooks-contrib/blob/main/getting_started_notebooks/basics/hello_streamz.ipynb)
 
 A more detailed example of [parsing haproxy logs](https://github.com/rapidsai-community/notebooks-contrib/blob/branch-0.14/intermediate_notebooks/examples/custreamz/parsing_haproxy_logs.ipynb) is also available.
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,4 +16,4 @@ exclude = ''' @@
         build |
         dist
     )/
-    '''
+    '''