Merge pull request #362 from jdebacker/new_release

New release, change setup.py for pip

README.md

@@ -6,6 +6,16 @@
 # Cost-of-Capital-Calculator
 Cost-of-Capital-Calculator is a model that can be used to evaluate the effect of US federal taxes on the investment incentives of corporate and non-corporate businesses.  Specifically, Cost-of-Capital-Calculator uses data on the business assets and financial policy, as well as microdata on individual tax filers, to compute marginal effective tax rates on new investments.  In modeling the effects of changes to the individual income tax code, Cost-of-Capital-Calculator works with [Tax-Calculator](https://github.com/PSLmodels/tax-calculator), another open source model of US federal tax policy.  Cost-of-Capital-Calculator is written in Python, an interpreted language that can execute on Windows, Mac, or Linux.
 
+## Installation
+
+The `ccc` package can be installed with Anaconda via:
+
+```conda install -c conda-forge ccc```
+
+or with PyPI via:
+
+```pip install cost-of-capital-calculator ```
+
 ## Disclaimer
 Results will change as the underlying models improve. A fundamental reason for adopting open source methods in this project is so that people from all backgrounds can contribute to the models that our society uses to assess economic policy; when community-contributed improvements are incorporated, the model will produce different results.
 
@@ -49,4 +59,4 @@ entites and different forms of financing.  The web application is limited in tha
 Of course, you can get started with Cost-of-Capital-Calculator both ways.
 
 ## Citing the Cost-of-Capital-Calculator Model
-Cost-of-Capital-Calculator (Version 1.2.8)[Source code], https://github.com/PSLmodels/Cost-of-Capital-Calculator
+Cost-of-Capital-Calculator (Version 1.2.9)[Source code], https://github.com/PSLmodels/Cost-of-Capital-Calculator

ccc/calculator.py

@@ -43,6 +43,9 @@ class Calculator():
         p (CCC Specifications class object): contains parameters, this
             argument must be specified and object is copied for internal
             use
+        dp (CCC Depreciation Parameters class object): contains parameters
+            descripting depreciation rules for each asset, this argument
+            must be specified and object is copied for internal use
         assets (CCC Assets class object): contains asset data, this
             argument must be specified and object is copied for
             internal use

setup.py

@@ -6,24 +6,26 @@
 with open('README.md') as f:
     longdesc = f.read()
 
-version = '0.0.0'
+version = '1.2.9'
 
 config = {
     'description': 'CCC: A Cost of Capital Calculator',
     'url': 'https://github.com/PSLmodels/Cost-of-Capital-Calculator',
     'download_url': 'https://github.com/PSLmodels/Cost-of-Capital-Calculator',
+    'long_description_content_type': 'text/markdown',
     'long_description': longdesc,
     'version': version,
-    'license': 'CC0 1.0 Universal public domain dedication',
+    'license': 'CC0 1.0 Universal (CC0 1.0) Public Domain Dedication',
     'packages': ['ccc'],
     'include_package_data': True,
-    'name': 'ccc',
-    'install_requires': [],
+    'name': 'cost-of-capital-calculator',
+    'install_requires': ['taxcalc', 'psutil', 'pandas', 'bokeh', 'numpy',
+                         'paramtools'],
     'classifiers': [
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
         'Natural Language :: English',
-        'License :: CC0 1.0 Universal public domain dedication',
+        'License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',