From e0c379522464d942c54f92506451061abf6d4924 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Tue, 20 Feb 2024 18:41:36 -0500 Subject: [PATCH 1/7] add other required packages to setup.py --- setup.py | 69 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 29 deletions(-) diff --git a/setup.py b/setup.py index b90594a85..4d1be230d 100644 --- a/setup.py +++ b/setup.py @@ -1,38 +1,49 @@ from setuptools import setup -with open('README.md') as f: +with open("README.md") as f: longdesc = f.read() -version = '3.5.0' +version = "3.5.0" config = { - 'description': 'Tax Calculator', - 'url': 'https://github.com/PSLmodels/Tax-Calculator', - 'download_url': 'https://github.com/PSLmodels/Tax-Calculator', - 'description': 'taxcalc', - 'long_description': longdesc, - 'version': version, - 'license': 'CC0 1.0 Universal (CC0 1.0) Public Domain Dedication', - 'packages': ['taxcalc', 'taxcalc.cli'], - 'include_package_data': True, - 'name': 'taxcalc', - 'install_requires': ['setuptools', 'numpy', 'pandas', 'bokeh', 'numba'], - '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.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Topic :: Software Development :: Libraries :: Python Modules'], - 'tests_require': ['pytest'], - 'entry_points': { - 'console_scripts': ['tc=taxcalc.cli.tc:cli_tc_main'] - } + "description": "Tax Calculator", + "url": "https://github.com/PSLmodels/Tax-Calculator", + "download_url": "https://github.com/PSLmodels/Tax-Calculator", + "description": "taxcalc", + "long_description": longdesc, + "version": version, + "license": "CC0 1.0 Universal (CC0 1.0) Public Domain Dedication", + "packages": ["taxcalc", "taxcalc.cli"], + "include_package_data": True, + "name": "taxcalc", + "install_requires": [ + "setuptools", + "numpy", + "pandas", + "bokeh", + "numba", + "requests", + "paramtools", + "behresp", + "aiohttp", + "curl", + "openpyxl", + ], + "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", + "Topic :: Software Development :: Libraries :: Python Modules", + ], + "tests_require": ["pytest"], + "entry_points": {"console_scripts": ["tc=taxcalc.cli.tc:cli_tc_main"]}, } setup(**config) From 56f8c71507ac985e8577cbb955bb2cf7bf14667e Mon Sep 17 00:00:00 2001 From: jdebacker Date: Tue, 20 Feb 2024 18:42:08 -0500 Subject: [PATCH 2/7] pin to Python < 3.12 --- conda.recipe/meta.yaml | 6 +++--- environment.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index b7a076d8f..9f6d8f8cc 100755 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -8,7 +8,7 @@ build: requirements: build: - - python + - "python<3.12" - "numpy>=1.14" - "pandas>=1.2.0" - "bokeh>=1.4.0, <3.0.0" @@ -19,9 +19,9 @@ requirements: - aiohttp - curl - openpyxl - + run: - - python + - "python<3.12" - "numpy>=1.14" - "pandas>=1.2.0" - "bokeh>=1.4.0, <3.0.0" diff --git a/environment.yml b/environment.yml index ea0200d93..19dc1a14d 100644 --- a/environment.yml +++ b/environment.yml @@ -2,7 +2,7 @@ name: taxcalc-dev channels: - conda-forge dependencies: -- python +- "python<3.12" - curl - "numpy>=1.14" - "pandas>=1.2.0" From cbc5a59b2efc6c03f1c90fc6794bdb6724755745 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Tue, 20 Feb 2024 19:48:49 -0500 Subject: [PATCH 3/7] remove some from setup.py --- setup.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/setup.py b/setup.py index 4d1be230d..84bf4ea77 100644 --- a/setup.py +++ b/setup.py @@ -24,10 +24,6 @@ "numba", "requests", "paramtools", - "behresp", - "aiohttp", - "curl", - "openpyxl", ], "classifiers": [ "Development Status :: 4 - Beta", From 569f79ce00e550a4f99f2cfb16099b7ec0cb2550 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Wed, 21 Feb 2024 15:58:36 -0500 Subject: [PATCH 4/7] drop extension from license file --- LICENSE.md => LICENSE | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename LICENSE.md => LICENSE (100%) diff --git a/LICENSE.md b/LICENSE similarity index 100% rename from LICENSE.md rename to LICENSE From 7ad749c3dd68ef7c0b0feecfe9e1701f7a0b1b86 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Wed, 21 Feb 2024 16:07:26 -0500 Subject: [PATCH 5/7] update readme metadata --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 48eefbd2e..2d5b7091c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ -[![PSL cataloged](https://img.shields.io/badge/PSL-cataloged-a0a0a0.svg)](https://www.PSLmodels.org) -[![Python 3.6+](https://img.shields.io/badge/python-3.6%2B-blue.svg)](https://www.python.org/downloads/release/python-360/) -[![Build Status](https://travis-ci.org/PSLmodels/Tax-Calculator.svg?branch=master)](https://travis-ci.org/PSLmodels/Tax-Calculator) -[![Codecov](https://codecov.io/gh/PSLmodels/Tax-Calculator/branch/master/graph/badge.svg)](https://codecov.io/gh/PSLmodels/Tax-Calculator) +| | | +| --- | --- | +| Org | [![PSL cataloged](https://img.shields.io/badge/PSL-cataloged-a0a0a0.svg)](https://www.PSLmodels.org) [![OS License: CCO-1.0](https://img.shields.io/badge/OS%20License-CCO%201.0-yellow)](https://github.com/PSLmodels/Tax-Calculator/blob/master/LICENSE) [![Jupyter Book Badge](https://jupyterbook.org/badge.svg)](https://pslmodels.github.io/Tax-Calculator/) | +| Package | [![Python 3.9](https://img.shields.io/badge/python-3.9-blue.svg)](https://www.python.org/downloads/release/python-3916/) [![Python 3.10](https://img.shields.io/badge/python-3.10-blue.svg)](https://www.python.org/downloads/release/python-3108/) [![Python 3.11](https://img.shields.io/badge/python-3.10-blue.svg)](https://www.python.org/downloads/release/python-3118/) [![PyPI Latest Release](https://img.shields.io/pypi/v/taxcalc.svg)](https://pypi.org/project/taxcalc/) [![PyPI Downloads](https://img.shields.io/pypi/dm/taxcalc.svg?label=PyPI%20downloads)](https://pypi.org/project/taxcalc/) [![Anaconda](https://img.shields.io/conda/dn/conda-forge/taxcalc?color=brightgreen&label=downloads&logo=conda-forge)](https://anaconda.org/conda-forge/taxcalc)| +| Testing | ![example event parameter](https://github.com/PSLmodels/Tax-Calculator/actions/workflows/build_and_test.yml/badge.svg?branch=master) ![example event parameter](https://github.com/PSLmodels/Tax-Calculator/actions/workflows/deploy_jupyterbook.yml/badge.svg?branch=master) [![Codecov](https://codecov.io/gh/PSLmodels/Tax-Calculator/branch/master/graph/badge.svg)](https://codecov.io/gh/PSLmodels/Tax-Calculator) | Tax-Calculator @@ -11,7 +12,7 @@ Tax-Calculator is an open-source microsimulation model for static analysis of USA federal income and payroll taxes. We are seeking contributors and maintainers. If you are interested in joining the project as a contributor or maintainer, -open a new [issue](https://github.com/PSLmodels/Tax-Calculator/issues) and ping @MattHJensen or @jdebacker -- or just jump right in. +open a new [issue](https://github.com/PSLmodels/Tax-Calculator/issues) and ping [@MattHJensen](https://github.com/MattHJensen/) or [@jdebacker](https://github.com/jdebacker/) -- or just jump right in. Complete documentation is available [here](https://PSLmodels.github.io/Tax-Calculator/). From 2f53f3a13a7b005d3c2d117257920be3dc3e40ff Mon Sep 17 00:00:00 2001 From: jdebacker Date: Wed, 21 Feb 2024 19:04:10 -0500 Subject: [PATCH 6/7] test on python 3.9-3.11 --- .github/workflows/build_and_test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index f4eef9568..c57381ee1 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -1,4 +1,4 @@ -name: Build Package and Test Source Code [Python 3.7, 3.8, 3.9, 3.10] +name: Build Package and Test Source Code [Python 3.9, 3.10, 2.11] on: [push, pull_request] @@ -8,7 +8,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python-version: [3.7, 3.8, 3.9, '3.10'] + python-version: [3.9, '3.10', '3.11'] steps: - name: Checkout From 3ff655e537d79bb4484c302f051aef8116219d88 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Wed, 21 Feb 2024 19:04:25 -0500 Subject: [PATCH 7/7] fix py 3.11 badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2d5b7091c..3c3aba333 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ | | | | --- | --- | | Org | [![PSL cataloged](https://img.shields.io/badge/PSL-cataloged-a0a0a0.svg)](https://www.PSLmodels.org) [![OS License: CCO-1.0](https://img.shields.io/badge/OS%20License-CCO%201.0-yellow)](https://github.com/PSLmodels/Tax-Calculator/blob/master/LICENSE) [![Jupyter Book Badge](https://jupyterbook.org/badge.svg)](https://pslmodels.github.io/Tax-Calculator/) | -| Package | [![Python 3.9](https://img.shields.io/badge/python-3.9-blue.svg)](https://www.python.org/downloads/release/python-3916/) [![Python 3.10](https://img.shields.io/badge/python-3.10-blue.svg)](https://www.python.org/downloads/release/python-3108/) [![Python 3.11](https://img.shields.io/badge/python-3.10-blue.svg)](https://www.python.org/downloads/release/python-3118/) [![PyPI Latest Release](https://img.shields.io/pypi/v/taxcalc.svg)](https://pypi.org/project/taxcalc/) [![PyPI Downloads](https://img.shields.io/pypi/dm/taxcalc.svg?label=PyPI%20downloads)](https://pypi.org/project/taxcalc/) [![Anaconda](https://img.shields.io/conda/dn/conda-forge/taxcalc?color=brightgreen&label=downloads&logo=conda-forge)](https://anaconda.org/conda-forge/taxcalc)| +| Package | [![Python 3.9](https://img.shields.io/badge/python-3.9-blue.svg)](https://www.python.org/downloads/release/python-3916/) [![Python 3.10](https://img.shields.io/badge/python-3.10-blue.svg)](https://www.python.org/downloads/release/python-3108/) [![Python 3.11](https://img.shields.io/badge/python-3.11-blue.svg)](https://www.python.org/downloads/release/python-3118/) [![PyPI Latest Release](https://img.shields.io/pypi/v/taxcalc.svg)](https://pypi.org/project/taxcalc/) [![PyPI Downloads](https://img.shields.io/pypi/dm/taxcalc.svg?label=PyPI%20downloads)](https://pypi.org/project/taxcalc/) [![Anaconda](https://img.shields.io/conda/dn/conda-forge/taxcalc?color=brightgreen&label=downloads&logo=conda-forge)](https://anaconda.org/conda-forge/taxcalc)| | Testing | ![example event parameter](https://github.com/PSLmodels/Tax-Calculator/actions/workflows/build_and_test.yml/badge.svg?branch=master) ![example event parameter](https://github.com/PSLmodels/Tax-Calculator/actions/workflows/deploy_jupyterbook.yml/badge.svg?branch=master) [![Codecov](https://codecov.io/gh/PSLmodels/Tax-Calculator/branch/master/graph/badge.svg)](https://codecov.io/gh/PSLmodels/Tax-Calculator) |