Merge pull request rapidsai#256 from ChuckHastings/bug_add_pip

[review] add pip to the install, remove nightly files, update readme
oorliu · May 1, 2019 · 7b47256 · 7b47256
2 parents 5e21bc7 + 98414b4
commit 7b47256
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 90 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@
 - PR #252 cpp test upgrades for more convenient testing on large input
 
 ## Bug Fixes
+- PR #256 Add pip to the install, clean up conda instructions
 - PR #253 Add rmm to conda configuration
 - PR #226 Bump cudf dependencies to 0.7
 - PR #169 Disable terminal output in sssp

diff --git a/README.md b/README.md
@@ -126,7 +126,6 @@ To install cuGraph from source, ensure the dependencies are met and follow the s
 
 2) Create the conda development environment 
 
-	A)   Building the `master` branch uses the `cugraph_dev` environment
 
 ```bash
 # create the conda environment (assuming in base `cugraph` directory)
@@ -145,22 +144,6 @@ conda deactivate
 
 
 
-	B) Create the conda development environment `cugraph_nightly`  
-
-If you are  on the latest development branch then you must use the `cugraph_nightly` environment.  The latest cuGraph code uses the latest cuDF features that might not yet be in the master branch.  To work off of the latest development branch, which could be unstable, use the nightly build environment.  
-
-```bash
-# create the conda environment (assuming in base `cugraph` directory)
-conda env create --name cugraph_nightly --file conda/environments/cugraph_nightly.yml
-
-# activate the environment
-conda activate cugraph_nightly 
-
-```
-
-
-
-
   - The environment can be updated as development includes/changes the dependencies. To do so, run:  
 
 

diff --git a/conda/environments/cugraph_dev.yml b/conda/environments/cugraph_dev.yml
@@ -31,5 +31,6 @@ dependencies:
 - numpydoc
 - ipython
 - recommonmark
+- pip
 - pip:
   - sphinx-markdown-tables
diff --git a/conda/environments/cugraph_dev_cuda10.yml b/conda/environments/cugraph_dev_cuda10.yml
@@ -31,5 +31,6 @@ dependencies:
 - numpydoc
 - ipython
 - recommonmark
+- pip
 - pip:
   - sphinx-markdown-tables
diff --git a/conda/environments/cugraph_nightly.yml b/conda/environments/cugraph_nightly.yml
diff --git a/conda/environments/cugraph_nightly_cuda10.yml b/conda/environments/cugraph_nightly_cuda10.yml