Merge branch 'master' into dev

README.md

@@ -24,7 +24,7 @@ Consider reading TabPy documentation in the following order:
 * [About TabPy](docs/about.md)
 * [TabPy Installation Instructions](docs/server-install.md)
 * [TabPy Server Configuration Instructions](docs/server-config.md)
-* [Running TabPy in Python Virtual Environment](docs/tabpy-virtualenv.md)
+* [Running TabPy in Virtual Environment](docs/tabpy-virtualenv.md)
 * [Authoring Python calculations in Tableau](docs/TableauConfiguration.md).
 * [TabPy Tools](docs/tabpy-tools.md)
 

docs/tabpy-virtualenv.md

@@ -1,7 +1,9 @@
-# Running TabPy in Python Virtual Environment
+# Running TabPy in Virtual Environment
 
 <!-- toc -->
 
+## Running TabPy in Python Virtual Environment
+
 To run TabPy in Python virtual environment follow the steps:
 
 1. Install `virtualenv` package:
@@ -41,3 +43,52 @@ To run TabPy in Python virtual environment follow the steps:
    ```sh
    deactivate
    ```
+
+## Running TabPy in an Anaconda Virtual Environment
+
+To run TabPy in an Anaconda virtual environment follow the steps:
+*NOTE: this assumes you have installed [Anaconda](https://www.anaconda.com/products/individual)
+in a Windows environment*
+
+1. For Windows open `Anaconda Prompt` from the Windows Start menu, for
+Linux and Mac run shell.
+
+2. Navigate to your home directory:
+   1. On Windows run
+
+      ```sh
+      cd %USERPROFILE%
+      ```
+
+   2. For Linux and Mac run
+
+      ```sh
+      cd ~
+      ```
+
+3. Create the virtual Anaconda environment
+
+    ```sh
+    conda create --name my-tabpy-env python=3.7
+    ```
+
+4. Activate your virtual environment
+
+   ```sh
+   conda activate my-tabpy-env
+   ```
+
+5. Install TabPy to your new Anaconda environment by following the instructions
+   on the [TabPy Server Install](server-install.md) documentation page.
+
+6. Run TabPy:
+
+   ```sh
+   tabpy
+   ```
+
+7. To deactivate virtual environment run:
+
+   ```sh
+   conda deactivate
+   ```