From b06ae4502f32b982f684601b6ff427a36b4ead4c Mon Sep 17 00:00:00 2001 From: "martin.holmer@gmail.com" Date: Tue, 10 Sep 2024 12:01:20 -0400 Subject: [PATCH 1/4] Drop conda-forge channel in environment.yml --- environment.yml | 2 -- taxcalc.egg-info/PKG-INFO | 7 +++++++ taxcalc.egg-info/requires.txt | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/environment.yml b/environment.yml index e848d0284..daf2a2c49 100644 --- a/environment.yml +++ b/environment.yml @@ -1,6 +1,4 @@ name: taxcalc-dev -channels: - - conda-forge dependencies: - "python>=3.9, <3.13" - "numpy>=1.26,<1.27" diff --git a/taxcalc.egg-info/PKG-INFO b/taxcalc.egg-info/PKG-INFO index ca46bf73d..79f62759c 100644 --- a/taxcalc.egg-info/PKG-INFO +++ b/taxcalc.egg-info/PKG-INFO @@ -19,6 +19,13 @@ Classifier: Programming Language :: Python :: 3.12 Classifier: Topic :: Software Development :: Libraries :: Python Modules Description-Content-Type: text/markdown License-File: LICENSE +Requires-Dist: setuptools +Requires-Dist: numpy +Requires-Dist: pandas +Requires-Dist: bokeh +Requires-Dist: numba +Requires-Dist: requests +Requires-Dist: paramtools>=0.18.3 | | | | --- | --- | diff --git a/taxcalc.egg-info/requires.txt b/taxcalc.egg-info/requires.txt index f8a31659f..2e5f43376 100644 --- a/taxcalc.egg-info/requires.txt +++ b/taxcalc.egg-info/requires.txt @@ -4,4 +4,4 @@ pandas bokeh numba requests -paramtools +paramtools>=0.18.3 From 1ae3a74707aac2c6a3e7eb6a9dc4f47b17a51ae7 Mon Sep 17 00:00:00 2001 From: "martin.holmer@gmail.com" Date: Tue, 10 Sep 2024 12:05:50 -0400 Subject: [PATCH 2/4] Restore conda-forge channel in environment.yml --- environment.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/environment.yml b/environment.yml index daf2a2c49..e848d0284 100644 --- a/environment.yml +++ b/environment.yml @@ -1,4 +1,6 @@ name: taxcalc-dev +channels: + - conda-forge dependencies: - "python>=3.9, <3.13" - "numpy>=1.26,<1.27" From 28d6fd497f80398439325af9e5780de209ceae2a Mon Sep 17 00:00:00 2001 From: "martin.holmer@gmail.com" Date: Tue, 10 Sep 2024 12:44:36 -0400 Subject: [PATCH 3/4] Drop Python 3.9 from GitHub testing --- .github/workflows/build_and_test.yml | 4 ++-- .github/workflows/check_jupyterbook.yml | 2 +- README.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 5a1e456c5..76a9b21ae 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.9, 3.10, 3.11, 3.12] +name: Build Package and Test Source Code [Python 3.10, 3.11, 3.12] on: [push, pull_request] @@ -8,7 +8,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python-version: [3.9, '3.10', '3.11', '3.12'] + python-version: ['3.10', '3.11', '3.12'] steps: - name: Checkout diff --git a/.github/workflows/check_jupyterbook.yml b/.github/workflows/check_jupyterbook.yml index 4a491fe5e..3c3b65950 100644 --- a/.github/workflows/check_jupyterbook.yml +++ b/.github/workflows/check_jupyterbook.yml @@ -26,4 +26,4 @@ jobs: pip install -e . python docs/guide/make/make_uguide.py cd docs - jb build . \ No newline at end of file + jb build . diff --git a/README.md b/README.md index dcd1fa597..55daa6dd4 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.11-blue.svg)](https://www.python.org/downloads/release/python-3118/) [![Python 3.12](https://img.shields.io/badge/python-3.12-blue.svg)](https://www.python.org/downloads/release/python-3121/) [![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.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/) [![Python 3.12](https://img.shields.io/badge/python-3.12-blue.svg)](https://www.python.org/downloads/release/python-3121/) [![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) | From 41044b31a0c5eeb81b3737bd4e7f4a9c5cc21570 Mon Sep 17 00:00:00 2001 From: "martin.holmer@gmail.com" Date: Tue, 10 Sep 2024 13:01:14 -0400 Subject: [PATCH 4/4] Remove support for Python 3.9 --- conda.recipe/meta.yaml | 4 ++-- environment.yml | 2 +- setup.py | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index 60028ed73..d618a778f 100755 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -8,7 +8,7 @@ build: requirements: build: - - "python>=3.9, <3.13" + - "python>=3.10, <3.13" - "numpy>=1.26,<1.27" - "pandas>=2.2" - "bokeh>=2.4" @@ -19,7 +19,7 @@ requirements: - behresp run: - - "python>=3.9, <3.13" + - "python>=3.10, <3.13" - "numpy>=1.26,<1.27" - "pandas>=2.2" - "bokeh>=2.4" diff --git a/environment.yml b/environment.yml index e848d0284..8032c1e8d 100644 --- a/environment.yml +++ b/environment.yml @@ -2,7 +2,7 @@ name: taxcalc-dev channels: - conda-forge dependencies: -- "python>=3.9, <3.13" +- "python>=3.10, <3.13" - "numpy>=1.26,<1.27" - "pandas>=2.2" - "bokeh>=2.4" diff --git a/setup.py b/setup.py index 3147899bd..edc1094e1 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,6 @@ "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",