Merge pull request #394 from jdebacker/setup

Updates to `setup.py`

README.md

@@ -55,4 +55,4 @@ Results will change as the underlying models improve. A fundamental reason for a
 
 
 ## Citing the Cost-of-Capital-Calculator Model
-Cost-of-Capital-Calculator (Version 1.5.0)[Source code], https://github.com/PSLmodels/Cost-of-Capital-Calculator
+Cost-of-Capital-Calculator (Version 1.5.1)[Source code], https://github.com/PSLmodels/Cost-of-Capital-Calculator

ccc/__init__.py

@@ -6,4 +6,4 @@
 from ccc.data import *
 from ccc.calculator import *
 
-__version__ = "1.5.0"
+__version__ = "1.5.1"

ccc/calculator.py

@@ -2091,7 +2091,7 @@ def asset_bubble(
             tools="hover",
             background_fill_alpha=0,
             # change things on all axes
-            **PLOT_FORMATS
+            **PLOT_FORMATS,
         )
         if include_title:
             p.add_layout(
@@ -2100,7 +2100,7 @@ def asset_bubble(
                         "Marginal Effective Tax Rates on Corporate Investments"
                         + " in Equipment"
                     ),
-                    **TITLE_FORMATS
+                    **TITLE_FORMATS,
                 ),
                 "above",
             )
@@ -2179,15 +2179,15 @@ def asset_bubble(
             # toolbar_location=None,
             tools="hover",
             background_fill_alpha=0,
-            **PLOT_FORMATS
+            **PLOT_FORMATS,
         )
         p2.add_layout(
             Title(
                 text=(
                     "Marginal Effective Tax Rates on Corporate "
                     + "Investments in Structures"
                 ),
-                **TITLE_FORMATS
+                **TITLE_FORMATS,
             ),
             "above",
         )

docs/book/content/intro.md

@@ -22,4 +22,4 @@ Results will change as the underlying models improve. A fundamental reason for a
 
 
 ## Citing the Cost-of-Capital-Calculator Model
-Cost-of-Capital-Calculator (Version 1.5.0)[Source code], https://github.com/PSLmodels/Cost-of-Capital-Calculator
+Cost-of-Capital-Calculator (Version 1.5.1)[Source code], https://github.com/PSLmodels/Cost-of-Capital-Calculator

environment.yml

@@ -3,7 +3,7 @@ channels:
 - conda-forge
 dependencies:
 - python
-- "taxcalc>=3.1.0"
+- "taxcalc>=4.0.0"
 - "paramtools>=0.18.3"
 - "pandas>=2.2.0"
 - bokeh>=3.1.1

pyproject.toml

@@ -0,0 +1,15 @@
+[build-system]
+requires = ["setuptools>=64.0"]
+build-backend = "setuptools.build_meta"
+
+# Configuration for Black.
+
+# NOTE: you have to use single-quoted strings in TOML for regular expressions.
+# It's the equivalent of r-strings in Python.  Multiline strings are treated as
+# verbose regular expressions by Black.  Use [ ] to denote a significant space
+# character.
+
+[tool.black]
+line-length = 79
+target-version = ["py310", "py311", "py312"]
+include = '\.pyi?$'

setup.py

@@ -1,39 +1,32 @@
-try:
-    from setuptools import setup
-except ImportError:
-    from distutils.core import setup
+import setuptools
 
-with open("README.md") as f:
-    longdesc = f.read()
+with open("README.md", "r", encoding="utf-8") as fh:
+    longdesc = fh.read()
 
-version = "1.5.0"
-
-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 (CC0 1.0) Public Domain Dedication",
-    "packages": ["ccc"],
-    "include_package_data": True,
-    "name": "cost-of-capital-calculator",
-    "install_requires": ["taxcalc", "pandas", "bokeh", "numpy", "paramtools"],
-    "classifiers": [
+setuptools.setup(
+    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="1.5.1",
+    license="CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
+    packages=["ccc"],
+    include_package_data=True,
+    name="cost-of-capital-calculator",
+    install_requires=["taxcalc", "pandas", "bokeh", "numpy", "paramtools"],
+    classifiers=[
         "Development Status :: 4 - Beta",
         "Intended Audience :: Developers",
         "Natural Language :: English",
         "License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ],
-    "tests_require": ["pytest"],
-}
-
-setup(**config)
+    tests_require=["pytest"],
+)