diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 84494712..64b333c7 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -27,7 +27,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-latest, windows-latest] python-version: ["3.10", "3.11"] steps: diff --git a/environment.yml b/environment.yml index d2e34748..35ad373d 100644 --- a/environment.yml +++ b/environment.yml @@ -4,6 +4,7 @@ channels: dependencies: - python>=3.7.7,<3.12 - numpy +- ipython - setuptools - numba>=0.54 - scipy>=1.7.1 @@ -15,14 +16,17 @@ dependencies: - paramtools>=0.15.0 - taxcalc>=3.0.0 - sphinx>=3.5.4 -- sphinx-book-theme>=0.1.3 +- sphinx-argparse +- sphinxcontrib-bibtex>=2.0.0 - jupyter-book>=0.11.3 +- jupyter - pytest>=6.0 - pytest-cov - pytest-xdist - pylint - coverage - requests +- openpyxl>=3.1.2 - xlwt - statsmodels - linearmodels @@ -30,7 +34,6 @@ dependencies: - black>=24.1.1 - pip - pip: - - openpyxl>=3.1.2 - cs-kit - cs2tc - pandas-datareader diff --git a/setup.py b/setup.py index 1368425b..aa2a64f6 100644 --- a/setup.py +++ b/setup.py @@ -1,17 +1,17 @@ import setuptools -with open("README.md", "r") as readme_file: +with open("README.md", "r", encoding="utf-8") as readme_file: longdesc = readme_file.read() setuptools.setup( name="ogusa", - version="0.1.6", + version="0.1.7", author="Jason DeBacker and Richard W. Evans", license="CC0 1.0 Universal (CC0 1.0) Public Domain Dedication", description="USA calibration for OG-Core", long_description_content_type="text/markdown", long_description=longdesc, - keywords="USA calibration of large scale overlapping generations model of fiscal policy", + keywords="USA, OG-USA, OG-Core, overlapping-generations, general-equilibrium, fiscal, fiscal-policy, tax, benefits, debt, spending, macroeconomics", url="https://github.com/PSLmodels/OG-USA/", download_url="https://github.com/PSLmodels/OG-USA/", project_urls={ @@ -24,7 +24,7 @@ install_requires=[ "numpy", "psutil", - "scipy>=1.5.0", + "scipy>=1.7.1", "pandas>=1.2.5", "matplotlib", "dask>=2.30.0", @@ -32,13 +32,13 @@ "paramtools>=0.15.0", "taxcalc>=3.0.0", "requests", + "pip", "rpy2<=3.5.11", "pandas-datareader", "xlwt", "openpyxl>=3.1.2", "statsmodels", "linearmodels", - "wheel", "ogcore", ], classifiers=[