Merge pull request #33 from PSLmodels/master

update from forked repo

.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

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.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) |
 
 
 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/).

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"

docs/index.md

@@ -9,7 +9,13 @@ You can install it with [Anaconda](https://www.anaconda.com/products/individual)
 via:
 
 ```
-conda install -c conda-forge taxcalc
+conda update taxcalc
+```
+
+or with [PyPI](https://pypi.org/project/taxcalc/) via:
+
+```
+pip install taxcalc
 ```
 
 When using
@@ -56,7 +62,13 @@ The cross-model validation work with NBER's TAXSIM-27 model is described
 If you are already using Tax-Calculator, upgrade using the following command:
 
 ```
-conda update -c conda-forge taxcalc
+conda update conda-forge::taxcalc
+```
+
+or
+
+```
+pip install -U taxcalc
 ```
 
 If you're a new user, read {doc}`usage/starting`.