Merge pull request #70 from rickecon/test

Restrict Python 3.11 and update GitHub Actions

.github/workflows/build_and_test.yml

@@ -1,4 +1,4 @@
-name: Build and test [Python 3.8, 3.9]
+name: Build and test [Python 3.9, 3.10]
 
 on: [push, pull_request]
 
@@ -7,7 +7,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.8, 3.9]
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        python-version: ["3.9", "3.10"]
 
     steps:
       - name: Checkout
@@ -35,7 +36,7 @@ jobs:
         run: |
           pytest -m 'not local and not regression' --cov=./ --cov-report=xml
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v3
         with:
           files: ./coverage.xml
           flags: unittests

.github/workflows/check_black.yml

@@ -6,8 +6,9 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
       - uses: psf/black@stable
         with:
           args: ". -l 79 --check"
+          src: "."

.github/workflows/deploy_docs.yml

@@ -19,14 +19,14 @@ jobs:
           miniforge-variant: Mambaforge
           activate-environment: ogusa-dev
           environment-file: environment.yml
-          python-version: 3.7
+          python-version: "3.10"
           auto-activate-base: false
 
       - name: Build # Build Jupyter Book
         shell: bash -l {0}
         run: |
-          pip install jupyter-book
-          pip install sphinxcontrib-bibtex
+          pip install jupyter-book>=0.11.3
+          pip install sphinxcontrib-bibtex>=2.0.0
           pip install -e .
           python -m ipykernel install --user --name=ogusa-dev
           cd docs

.github/workflows/docs_check.yml

@@ -16,14 +16,14 @@ jobs:
           miniforge-variant: Mambaforge
           activate-environment: ogusa-dev
           environment-file: environment.yml
-          python-version: 3.7
+          python-version: "3.10"
           auto-activate-base: false
 
       - name: Build # Build Jupyter Book
         shell: bash -l {0}
         run: |
-          pip install jupyter-book
-          pip install sphinxcontrib-bibtex
+          pip install jupyter-book>=0.11.3
+          pip install sphinxcontrib-bibtex>=2.0.0
           pip install -e .
           python -m ipykernel install --user --name=ogusa-dev
           cd docs

LICENSE

@@ -0,0 +1,121 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+    HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display,
+     communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+     likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+     subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+     in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+     European Parliament and of the Council of 11 March 1996 on the legal
+     protection of databases, and under any national implementation
+     thereof, including any amended or successor version of such
+     directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+     world based on applicable law or treaty, and any national
+     implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+    surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+    warranties of any kind concerning the Work, express, implied,
+    statutory or otherwise, including without limitation warranties of
+    title, merchantability, fitness for a particular purpose, non
+    infringement, or the absence of latent or other defects, accuracy, or
+    the present or absence of errors, whether or not discoverable, all to
+    the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+    that may apply to the Work or any use thereof, including without
+    limitation any person's Copyright and Related Rights in the Work.
+    Further, Affirmer disclaims responsibility for obtaining any necessary
+    consents, permissions or other rights required for any use of the
+    Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+    party to this document and has no duty or obligation with respect to
+    this CC0 or use of the Work.

Makefile

@@ -0,0 +1,70 @@
+# GNU Makefile that documents and automates common development operations
+#              using the GNU make tool (version >= 3.81)
+# Development is typically conducted on Linux or Max OS X (with the Xcode
+#              command-line tools installed), so this Makefile is designed
+#              to work in that environment (and not on Windows).
+# USAGE: OG-Core$ make [TARGET]
+
+.PHONY=help
+help:
+	@echo "USAGE: make [TARGET]"
+	@echo "TARGETS:"
+	@echo "help       : show help message"
+	@echo "clean      : remove .pyc files and local ccc package"
+	@echo "package    : build and install local package"
+	@echo "pytest     : generate report for and cleanup after"
+	@echo "             pytest -W ignore -m ''"
+	@echo "cstest     : generate coding-style errors using the"
+	@echo "             pycodestyle (nee pep8) tool"
+	@echo "coverage   : generate test coverage report"
+	@echo "git-sync   : synchronize local, origin, and upstream Git repos"
+	@echo "git-pr N=n : create local pr-n branch containing upstream PR"
+
+.PHONY=clean
+clean:
+	@find . -name *pyc -exec rm {} \;
+	@find . -name *cache -maxdepth 1 -exec rm -r {} \;
+	@conda uninstall ccc --yes --quiet 2>&1 > /dev/null
+
+.PHONY=pytest
+pytest:
+	@cd ogusa ; pytest -W ignore
+
+ogcore_JSON_FILES := $(shell ls -l ./ogusa/*json | awk '{print $$9}')
+
+.PHONY=cstest
+cstest:
+	-pycodestyle ogusa
+	-pycodestyle --ignore=E501,E121 $(ogusa_JSON_FILES)
+
+define coverage-cleanup
+rm -f .coverage htmlcov/*
+endef
+
+COVMARK = ""
+
+OS := $(shell uname -s)
+
+.PHONY=coverage
+coverage:
+	@$(coverage-cleanup)
+	@coverage run -m pytest -v -m $(COVMARK) > /dev/null
+	@coverage html --ignore-errors
+ifeq ($(OS), Darwin) # on Mac OS X
+	@open htmlcov/index.html
+else
+	@echo "Open htmlcov/index.html in browser to view report"
+endif
+	@$(pytest-cleanup)
+
+.PHONY=git-sync
+git-sync:
+	@./gitsync
+
+.PHONY=git-pr
+git-pr:
+	@./gitpr $(N)
+
+pip-package:
+	pip install wheel
+	python setup.py sdist bdist_wheel

cs-config/cs_config/functions.py

@@ -75,7 +75,7 @@ class MetaParams(paramtools.Parameters):
 
 
 def get_version():
-    return "0.0.0"
+    return "0.1.0"
 
 
 def get_inputs(meta_param_dict):

environment.yml

@@ -2,7 +2,7 @@ name: ogusa-dev
 channels:
 - conda-forge
 dependencies:
-- python>=3.7.7
+- python>=3.7.7, <3.11
 - numpy
 - psutil
 - scipy>=1.5.0
@@ -25,7 +25,7 @@ dependencies:
 - xlwt
 - statsmodels
 - linearmodels
-- rpy2
+- rpy2<=3.5.11
 - black
 - pip:
   - jupyter-book>=0.9.1

examples/run_og_usa.py

@@ -87,6 +87,8 @@ def main():
             )
         )
     )
+    p2.age_specific = False
+    p2.tax_func_type = "GS"
     # Use calibration class to estimate reform tax functions from
     # Tax-Calculator, specifing reform for Tax-Calculator in iit_reform
     c2 = Calibration(
@@ -96,7 +98,7 @@ def main():
     d = c2.get_dict()
     # additional parameters to change
     updated_params = {
-        "cit_rate": [0.35],
+        "cit_rate": [[0.35]],
         "etr_params": d["etr_params"],
         "mtrx_params": d["mtrx_params"],
         "mtry_params": d["mtry_params"],