Skip to content

Commit

Permalink
Merge pull request #2150 from martinholmer/master
Browse files Browse the repository at this point in the history
Documentation and configuration updates
  • Loading branch information
martinholmer authored Dec 4, 2018
2 parents a381e8b + 6b61e6e commit 1af7844
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 11 deletions.
8 changes: 4 additions & 4 deletions docs/index.htmx
Original file line number Diff line number Diff line change
Expand Up @@ -216,10 +216,10 @@ files to TaxBrain.</p>
<p>Installation of tc CLI involves several steps:</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. You should install
Python 3.6 because we will be forced to discontinue support for Python
2.7 at the end of 2018. You must do this installation even if you already
the <a href="https://www.anaconda.com/download/">Anaconda download
page</a> and selecting Python 3.6. You should install Python 3.6
because we have discontinued support for Python 2.7 and are not yet
supporting Python 3.7. 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 Down
2 changes: 0 additions & 2 deletions read-the-docs/requirements-docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ mock # used to mock numba dependency
numpy
pandas
numba
six
toolz

# for ReadTheDocs
sphinx>=1.3
8 changes: 4 additions & 4 deletions read-the-docs/source/contributor_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ Setup Python
-------------

The Tax-Calculator is written in the Python programming language.
Download and install the free Anaconda distribution of Python 3.6 from
`Continuum Analytics`_. You must do this even if you already have
Download and install the free Anaconda distribution of Python 3.6
from `Anaconda`_. You must do this even if you already have
Python installed on your computer because the Anaconda distribution
contains all the additional Python packages that we use to conduct tax
calculations (many of which are not included in other Python
Expand Down Expand Up @@ -270,8 +270,8 @@ interpreter or imported into a Python notebook for interactive execution.
.. _`Github Flow`:
https://guides.github.com/introduction/flow/

.. _`Continuum Analytics`:
http://www.continuum.io/downloads
.. _`Anaconda`:
https://www.anaconda.com/download/

.. _`remote`:
https://help.github.com/articles/github-glossary/#remote
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
'packages': ['taxcalc', 'taxcalc.tbi', 'taxcalc.cli'],
'include_package_data': True,
'name': 'taxcalc',
'install_requires': ['numpy', 'pandas', 'bokeh', 'numba', 'toolz'],
'install_requires': ['numpy', 'pandas', 'bokeh', 'numba'],
'classifiers': [
'Development Status :: 4 - Beta',
'Intended Audience :: Developers',
Expand Down

0 comments on commit 1af7844

Please sign in to comment.