Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates for compatibility with latest OG-Core #54

Merged
merged 41 commits into from
Jun 19, 2024
Merged
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
2d82183
update with optins to not plot
jdebacker May 2, 2024
8d8a1f9
testing to get rho shape to work
jdebacker May 2, 2024
523db00
add docstrings
jdebacker May 3, 2024
34dd7db
update CI test script
jdebacker May 3, 2024
bb90913
get capital share of income from FRED
jdebacker May 5, 2024
1472642
Update macro_params.py
SeaCelo May 7, 2024
bf76bd6
Merge pull request #1 from SeaCelo/jdebacker-updates_ogcore
jdebacker May 8, 2024
f27dde1
download data
jdebacker May 17, 2024
5ddb060
Merge remote-tracking branch 'origin/updates_for_ogcore' into updates…
jdebacker May 17, 2024
54817f9
only try codecov upload in upstream repo
jdebacker May 17, 2024
96105be
get data to 2100
jdebacker May 17, 2024
6bd7eb2
remove tax func stuff
jdebacker Jun 11, 2024
31cbbca
import requests into macro params
jdebacker Jun 11, 2024
a3e1b1c
use plot path:
jdebacker Jun 11, 2024
a917bb8
remove unused bits from example
jdebacker Jun 11, 2024
d282e75
update path arg
jdebacker Jun 11, 2024
a24aa4d
remvoe old data files
jdebacker Jun 11, 2024
02b57ce
version bump
jdebacker Jun 11, 2024
f017519
remove unused lines
jdebacker Jun 11, 2024
c09d462
add test of macro params
jdebacker Jun 11, 2024
c7c82c7
add note
jdebacker Jun 11, 2024
8d9442e
format
jdebacker Jun 12, 2024
f1a70ee
add tests of input output module
jdebacker Jun 12, 2024
2066ce0
remove unused constant and args
jdebacker Jun 14, 2024
c4cc712
remove unused constant and args
jdebacker Jun 14, 2024
ac1f068
remove unused path constants from income.py
jdebacker Jun 14, 2024
7a54015
remove unused import
jdebacker Jun 14, 2024
716e75d
Updated README.md
rickecon Jun 18, 2024
a20e944
Updated intro.md
rickecon Jun 18, 2024
c528878
Updated environment.yml
rickecon Jun 18, 2024
ea057f4
Updated setup.py
rickecon Jun 18, 2024
aaa4bf9
Updated build_and_test.yml
rickecon Jun 18, 2024
f5687d8
Updated CHANGELOG.md
rickecon Jun 18, 2024
a6e10fe
Updated Makefile
rickecon Jun 18, 2024
d8d1bb5
Updated GH Actions
rickecon Jun 18, 2024
e92f3d4
Black formatted setup.py
rickecon Jun 18, 2024
bd22d18
Added __init__.py file
rickecon Jun 18, 2024
cfa3ff7
Merge pull request #3 from rickecon/jdebacker-updates_for_ogcore
jdebacker Jun 18, 2024
bc97cb5
set tax rates
jdebacker Jun 18, 2024
192bfbb
Merge remote-tracking branch 'origin/updates_for_ogcore' into updates…
jdebacker Jun 18, 2024
0a43488
don't update iit params
jdebacker Jun 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updated setup.py
  • Loading branch information
rickecon committed Jun 18, 2024
commit ea057f40196a363d256a65e068128ab4aad9093d
47 changes: 25 additions & 22 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,41 +1,31 @@
"""This file contains the OG-ZAF package's metadata and dependencies."""

from setuptools import find_packages, setup
import setuptools

with open("README.md", "r") as readme_file:
readme = readme_file.read()
longdesc = readme_file.read()

setup(
setuptools.setup(
name="ogzaf",
version="0.0.2",
author="Marcelo LaFleur, Richard W. Evans, and Jason DeBacker",
license="CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
description="South Africa Calibration for OG-Core",
long_description=readme,
long_description_content_type="text/markdown",
classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"Natural Language :: English",
"License :: OSI Approved :: Common Public License",
"Operating System :: POSIX",
"Programming Language :: Python",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Topic :: Scientific/Engineering :: Information Analysis",
"Topic :: Software Development :: Libraries :: Python Modules",
],
keywords="South Africa calibration of large scale overlapping generations model of fiscal policy",
long_description=longdesc,
keywords="ZAF South Africa calibration of large scale overlapping generations model of fiscal policy",
url="https://github.com/EAPD-DRB/OG-ZAF/",
download_url="https://github.com/EAPD-DRB/OG-ZAF/",
project_urls={
"Issue Tracker": "https://github.com/EAPD-DRB/OG-ZAF/issues",
},
packages=["ogzaf"],
package_data={"ogzaf": ["ogusa_default_parameters.json", "data/*"]},
package_data={
"ogzaf": [
"ogzaf_default_parameters.json",
"data/*"
]
},
include_packages=True,
python_requires=">=3.7.7",
python_requires=">=3.7.7, <3.12",
install_requires=[
"numpy",
"psutil",
@@ -51,9 +41,22 @@
"openpyxl>=3.1.2",
"statsmodels",
"linearmodels",
"wheel",
"black",
"linecheck",
"ogcore",
],
classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"Natural Language :: English",
"License :: OSI Approved :: Common Public License",
"Operating System :: POSIX",
"Programming Language :: Python",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Topic :: Scientific/Engineering :: Information Analysis",
"Topic :: Software Development :: Libraries :: Python Modules",
],
tests_require=["pytest"],
)