Skip to content

Commit

Permalink
Merge pull request #1363 from martinholmer/update-user-docs
Browse files Browse the repository at this point in the history
Update user documentation to allow choice between Python 2.7 and Python 3.6
  • Loading branch information
martinholmer authored May 12, 2017
2 parents a8cde66 + 4702618 commit 344e39f
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
14 changes: 7 additions & 7 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,9 @@ <h3 id="cli-install-test">Install/Test tc CLI</h3>

<p><b>Install the free Anaconda Python distribution</b> by going to
the <a href="https://www.continuum.io/downloads">Continuum Analytics
download page</a> and selecting a version of Python suitable for your
computer. You should install Python 2.7, which is the older and more
stable version. You must do this installation even if you already
download page</a> and selecting a version of Python. You can install
either Python 2.7 or Python 3.6 because we test Tax-Calculator with
both. You must do this installation even if you already
have Python installed on your computer because the Anaconda
distribution contains all the additional Python packages that
Tax-Calculator uses to conduct tax calculations (many of which are not
Expand All @@ -216,10 +216,10 @@ <h3 id="cli-install-test">Install/Test tc CLI</h3>
<pre>$ conda --version</pre>
Expected output is something like <kbd>conda 4.3.17</kbd>
<pre>$ python --version</pre>
Expected output should contain the <kbd>Python 2.7.</kbd> and
<kbd>Anaconda</kbd> phrases, the presence of which confirm that the
installation went smoothly. The full output could look something
like this <kbd>Python 2.7.12 :: Anaconda 2.3.0 (x86_64)</kbd>.</p>
Expected output should contain either the <kbd>Python 2.7</kbd> or
the <kbd>Python 3.6</kbd> phrase as well as the
<kbd>Anaconda</kbd> phrase, the presence of which confirm that the
installation went smoothly.

<p><b>Install the free taxcalc package</b> by entering the following:
<pre>$ conda install -c ospc taxcalc</pre>
Expand Down
14 changes: 7 additions & 7 deletions taxcalc/docs/index.htmx
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,9 @@ files to TaxBrain.</p>

<p><b>Install the free Anaconda Python distribution</b> by going to
the <a href="https://www.continuum.io/downloads">Continuum Analytics
download page</a> and selecting a version of Python suitable for your
computer. You should install Python 2.7, which is the older and more
stable version. You must do this installation even if you already
download page</a> and selecting a version of Python. You can install
either Python 2.7 or Python 3.6 because we test Tax-Calculator with
both. You must do this installation even if you already
have Python installed on your computer because the Anaconda
distribution contains all the additional Python packages that
Tax-Calculator uses to conduct tax calculations (many of which are not
Expand All @@ -216,10 +216,10 @@ in any directory:
<pre>$ conda --version</pre>
Expected output is something like <kbd>conda 4.3.17</kbd>
<pre>$ python --version</pre>
Expected output should contain the <kbd>Python 2.7.</kbd> and
<kbd>Anaconda</kbd> phrases, the presence of which confirm that the
installation went smoothly. The full output could look something
like this <kbd>Python 2.7.12 :: Anaconda 2.3.0 (x86_64)</kbd>.</p>
Expected output should contain either the <kbd>Python 2.7</kbd> or
the <kbd>Python 3.6</kbd> phrase as well as the
<kbd>Anaconda</kbd> phrase, the presence of which confirm that the
installation went smoothly.

<p><b>Install the free taxcalc package</b> by entering the following:
<pre>$ conda install -c ospc taxcalc</pre>
Expand Down

0 comments on commit 344e39f

Please sign in to comment.