Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into demog_extensions
Browse files Browse the repository at this point in the history
  • Loading branch information
jdebacker committed Feb 13, 2024
2 parents b6e0862 + 1331b6a commit 97d76ae
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.1] - 2024-02-12 15:00:00

### Added

- Updated `setup.py` Python version requirement to be `python_requires=">=3.7.7, <3.12"`

## [0.11.0] - 2024-02-06 15:00:00

### Added
Expand Down Expand Up @@ -176,6 +182,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0



[0.11.1]: https://github.com/PSLmodels/OG-Core/compare/v0.11.0...v0.11.1
[0.11.0]: https://github.com/PSLmodels/OG-Core/compare/v0.10.10...v0.11.0
[0.10.10]: https://github.com/PSLmodels/OG-Core/compare/v0.10.9...v0.10.10
[0.10.9]: https://github.com/PSLmodels/OG-Core/compare/v0.10.8...v0.10.9
Expand Down
2 changes: 1 addition & 1 deletion ogcore/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
from ogcore.txfunc import *
from ogcore.utils import *

__version__ = "0.11.0"
__version__ = "0.11.1"
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

setuptools.setup(
name="ogcore",
version="0.11.0",
version="0.11.1",
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",
Expand All @@ -23,7 +23,7 @@
]
},
include_packages=True,
python_requires=">=3.7.7",
python_requires=">=3.7.7, <3.12",
install_requires=[
"scipy>=1.7.1",
"pandas>=1.2.5",
Expand Down

0 comments on commit 97d76ae

Please sign in to comment.