Merge pull request #34 from rickecon/jdebacker-pensions

Updated version and added numba to setup.py
PSLmodels · Jul 28, 2024 · f3b21f2 · f3b21f2
2 parents 9be34de + f44266f
commit f3b21f2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.11.13] - 2024-07-28 12:00:00
+
+### Added
+
+- Added three new pension types to the model: (i) defined benefits system, (ii) notional defined contribution system, and (iii) points system.
+
 ## [0.11.12] - 2024-07-26 01:00:00
 
 ### Bug Fix
@@ -265,6 +271,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Any earlier versions of OG-USA can be found in the [`OG-Core`](https://github.com/PSLmodels/OG-Core) repository [release history](https://github.com/PSLmodels/OG-Core/releases) from [v.0.6.4](https://github.com/PSLmodels/OG-Core/releases/tag/v0.6.4) (Jul. 20, 2021) or earlier.
 
 
+[0.11.13]: https://github.com/PSLmodels/OG-Core/compare/v0.11.11...v0.11.13
 [0.11.11]: https://github.com/PSLmodels/OG-Core/compare/v0.11.10...v0.11.11
 [0.11.10]: https://github.com/PSLmodels/OG-Core/compare/v0.11.9...v0.11.10
 [0.11.9]: https://github.com/PSLmodels/OG-Core/compare/v0.11.8...v0.11.9

diff --git a/ogcore/__init__.py b/ogcore/__init__.py
@@ -20,4 +20,4 @@
 from ogcore.txfunc import *
 from ogcore.utils import *
 
-__version__ = "0.11.12"
+__version__ = "0.11.13"
diff --git a/requirements.txt b/requirements.txt
@@ -2,5 +2,6 @@ taxcalc
 scipy
 pandas
 numpy
+numba
 os
 numpydoc
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="ogcore",
-    version="0.11.12",
+    version="0.11.13",
     author="Jason DeBacker and Richard W. Evans",
     license="CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
     description="A general equilibribum overlapping generations model for fiscal policy analysis",
@@ -28,6 +28,7 @@
         "numpy",
         "scipy>=1.7.1",
         "pandas>=1.2.5",
+        "numba",
         "matplotlib",
         "dask>=2.30.0",
         "distributed>=2.30.1",
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,5 +2,6 @@ taxcalc @@
     scipy
     pandas
     numpy
+    numba
     os
     numpydoc