Merge branch 'bpurinton:master' into master

UP-RS-ESP · Aug 16, 2021 · fd29606 · fd29606
2 parents 267e827 + 8ad99c6
commit fd29606
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 92 deletions.
diff --git a/README.md b/README.md
@@ -38,12 +38,7 @@ PebbleCounts has a number of important dependencies including [gdal](https://www
 ### For Windows
 Once you've got `conda` commands installed, you can open a command-line terminal and create a conda environment with:
 ```
-conda create --name pebblecounts python=3.6 opencv shapely \
-   scikit-image scikit-learn numpy gdal scipy matplotlib tk
-```
-Or just use the `.yml` file provided with:
-```
-conda env create -f environment.yml
+conda create --name pebblecounts python=3.6 opencv shapely scikit-image scikit-learn numpy gdal scipy matplotlib tk
 ```
 and once installation is complete (and assuming no errors during the install) activate the new environment to run PebbleCounts by:
 ```
@@ -59,8 +54,7 @@ Those using Mac OS or Linux shouldn't have much trouble modifying the above comm
 
 Similar to the above, once you have `conda` installed we create the virtual environment:
 ```
-conda create --name pebblecounts python=3.6 shapely \
-   scikit-image scikit-learn numpy gdal scipy matplotlib tk
+conda create --name pebblecounts python=3.6 shapely scikit-image scikit-learn numpy gdal scipy matplotlib tk
 ```
 and once installation is complete (and assuming no errors during the install) activate the new environment by:
 ```

diff --git a/environment.yml b/environment.yml