From 6b61e6ee8badd5d87c6766b109b4c76470d7fc61 Mon Sep 17 00:00:00 2001 From: Martin Holmer Date: Tue, 4 Dec 2018 15:08:32 -0500 Subject: [PATCH] Documentation and configuration updates --- docs/index.htmx | 8 ++++---- read-the-docs/requirements-docs.txt | 2 -- read-the-docs/source/contributor_guide.rst | 8 ++++---- setup.py | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/docs/index.htmx b/docs/index.htmx index 19bd9d80b..6a4a08cdd 100644 --- a/docs/index.htmx +++ b/docs/index.htmx @@ -216,10 +216,10 @@ files to TaxBrain.

Installation of tc CLI involves several steps:

Install the free Anaconda Python distribution by going to -the Continuum Analytics -download page 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 Anaconda download +page 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 diff --git a/read-the-docs/requirements-docs.txt b/read-the-docs/requirements-docs.txt index 4d7411e30..b2a3d31e2 100644 --- a/read-the-docs/requirements-docs.txt +++ b/read-the-docs/requirements-docs.txt @@ -5,8 +5,6 @@ mock # used to mock numba dependency numpy pandas numba -six -toolz # for ReadTheDocs sphinx>=1.3 diff --git a/read-the-docs/source/contributor_guide.rst b/read-the-docs/source/contributor_guide.rst index 246cf044b..0163947a1 100644 --- a/read-the-docs/source/contributor_guide.rst +++ b/read-the-docs/source/contributor_guide.rst @@ -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 @@ -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 diff --git a/setup.py b/setup.py index 9486b4a07..2f7eec58e 100755 --- a/setup.py +++ b/setup.py @@ -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',