From f52ebea302f6fb6dab140cda8d1586e877c18ad8 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Mon, 5 Aug 2024 12:00:05 -0400 Subject: [PATCH 1/3] add style file to setup --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index bd872c254..4bfac24d6 100755 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="ogcore", - version="0.11.14", + version="0.11.15", 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", @@ -20,6 +20,7 @@ package_data={ "ogcore": [ "default_parameters.json", + "OGcorePlots.mplstyle" ] }, include_packages=True, From 1393b76f1a6fb2473f28ecc7ef024c951eac35e6 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Mon, 5 Aug 2024 12:00:28 -0400 Subject: [PATCH 2/3] update version and changelog --- CHANGELOG.md | 7 +++++++ ogcore/__init__.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af23aa948..892b933b9 100644 --- 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.15] - 2024-07-30 12:00:00 + +### Bug Fix + +- Make `OGcorePlots.mplstyle` importable from the package by adding it to `setup.py` + ## [0.11.14] - 2024-07-30 12:00:00 ### Added @@ -276,6 +282,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Version [0.7.0] on August 30, 2021 was the first time that the OG-USA repository was detached from all of the core model logic, which was named OG-Core. Before this version, OG-USA was part of what is now the [`OG-Core`](https://github.com/PSLmodels/OG-Core) repository. In the next version of OG-USA, we adjusted the version numbering to begin with 0.1.0. This initial version of 0.7.0, was sequential from what OG-USA used to be when the OG-Core project was called OG-USA. - 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.15]: https://github.com/PSLmodels/OG-Core/compare/v0.11.14...v0.11.15 [0.11.14]: https://github.com/PSLmodels/OG-Core/compare/v0.11.13...v0.11.14 [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 diff --git a/ogcore/__init__.py b/ogcore/__init__.py index 3d7193455..e901b4fe9 100644 --- a/ogcore/__init__.py +++ b/ogcore/__init__.py @@ -20,4 +20,4 @@ from ogcore.txfunc import * from ogcore.utils import * -__version__ = "0.11.14" +__version__ = "0.11.15" From 9eab3224bac316f23d93e50f5c6b1d8bed7b134b Mon Sep 17 00:00:00 2001 From: jdebacker Date: Mon, 5 Aug 2024 19:49:47 -0400 Subject: [PATCH 3/3] format --- setup.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 4bfac24d6..d6ab47615 100755 --- a/setup.py +++ b/setup.py @@ -18,10 +18,7 @@ }, packages=["ogcore"], package_data={ - "ogcore": [ - "default_parameters.json", - "OGcorePlots.mplstyle" - ] + "ogcore": ["default_parameters.json", "OGcorePlots.mplstyle"] }, include_packages=True, python_requires=">=3.7.7, <3.12",