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.

Sign up for GitHub

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

[DO NOT MERGE] Add windows to build_and_test.py #109

Closed
wants to merge 2 commits into from
Closed

[DO NOT MERGE] Add windows to build_and_test.py #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8b90d4
Add windows to build_and_test.py
rickecon May 9, 2024
c2b142c
Updated environment.yml and setup.py
rickecon May 9, 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
2 changes: 1 addition & 1 deletion .github/workflows/build_and_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 5 additions & 2 deletions environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ channels:
dependencies:
- python>=3.7.7,<3.12
- numpy
- ipython
- setuptools
- numba>=0.54
- scipy>=1.7.1
Expand All @@ -15,22 +16,24 @@ 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
- rpy2<=3.5.11
- black>=24.1.1
- pip
- pip:
- openpyxl>=3.1.2
- cs-kit
- cs2tc
- pandas-datareader
Expand Down
10 changes: 5 additions & 5 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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={
Expand All @@ -24,21 +24,21 @@
install_requires=[
"numpy",
"psutil",
"scipy>=1.5.0",
"scipy>=1.7.1",
"pandas>=1.2.5",
"matplotlib",
"dask>=2.30.0",
"distributed>=2.30.1",
"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=[
Expand Down
Loading