Merge pull request #56 from jdebacker/taxfuncparams

Update calibration handling of tax function parameters

.github/workflows/build_and_test.yml

@@ -13,11 +13,11 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@master
         with:
           persist-credentials: false
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
       - name: Install
@@ -34,8 +34,9 @@ jobs:
         run: |
           pytest -m 'not local' --cov=./ --cov-report=xml --maxfail=0
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           files: ./coverage.xml
           flags: unittests
           name: codecov-umbrella

.github/workflows/check_black.yml

@@ -6,8 +6,8 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@master
+      - uses: actions/setup-python@v5
       - uses: psf/black@stable
         with:
           options: "-l 79 --check"

.github/workflows/deploy_docs.yml

@@ -9,19 +9,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2  # If you're using actions/checkout@v2 you must set persist-credentials to false in most cases for the deployment to work correctly.
+        uses: actions/checkout@master
         with:
           persist-credentials: false
 
       - name: Setup Miniconda
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           activate-environment: oguk-dev
           environment-file: environment.yml
           python-version: 3.9
           auto-activate-base: false
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
 

.github/workflows/docs_check.yml

@@ -6,11 +6,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2 # If you're using actions/checkout@v2 you must set persist-credentials to false in most cases for the deployment to work correctly.
+        uses: actions/checkout@master
         with:
           persist-credentials: false
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
 

.github/workflows/version_check.yml

@@ -7,12 +7,12 @@ jobs:
     name: Check versioning
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@master
         with:
           fetch-depth: 0
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.7
+          python-version: 3.9
       - name: Check version number has been properly updated
         run: ".github/is-version-number-acceptable.sh"

PSL_catalog.json

@@ -0,0 +1,34 @@
+{
+    "name": "OG-UK",
+    "img": "https://raw.githubusercontent.com/PSLmodels/OG-UK/main/docs/OG-UK_logo.png",
+    "banner_title": "OG-UK",
+    "banner_subtitle": "Large-scale open source overlapping generations model of UK fiscal policy",
+    "detailed_description": "https://raw.githubusercontent.com/PSLmodels/OG-UK/main/README.md",
+    "policy_area": "Policy analysis, policy reform, fiscal policy, tax, benefits, social security, public finance, macroeconomic analysis, general equilibrium, dynamic scoring, overlapping generations, OG, OLG",
+    "geography": "USA",
+    "language": "Python",
+    "maintainers": [
+        {
+            "name": "Richard W. Evans",
+            "image": "https://github.com/rickecon.png",
+            "link": "https://github.com/rickecon"
+        },
+        {
+            "name": "Jason DeBacker",
+            "image": "https://github.com/jdebacker.png",
+            "link": "https://github.com/jdebacker"
+        },
+        {
+            "name": "Jon Pycroft",
+            "image": "https://avatars.githubusercontent.com/u/65815956?v=4",
+            "link": "https://github.com/jpycroft/"
+        }
+    ],
+    "links": {
+      "code_repository": "https://github.com/PSLmodels/OG-UK",
+      "user_documentation": "https://pslmodels.github.io/OG-UK",
+      "contributor_documentation": "https://pslmodels.github.io/OG-UK/content/contributing/contributor_guide.html",
+      "webapp": "",
+      "recent_changes": "https://github.com/PSLmodels/OG-UK/blob/main/CHANGELOG.md"
+    }
+}

environment.yml

@@ -2,7 +2,7 @@ name: oguk-dev
 channels:
 - conda-forge
 dependencies:
-- python>=3.7.7, <=3.11  # This restriction can be removed as soon as these packages support Python 3.10
+- python>=3.7.7, <3.12  # This restriction can be removed as soon as these packages support Python 3.10
 - ipython
 - setuptools
 - psutil
@@ -24,13 +24,12 @@ dependencies:
 - coverage
 - requests
 - xlwt
-- openpyxl
 - statsmodels
 - linearmodels
 - black
-- pre-commit
 - jupyter
 - pip:
   - jupyter-book>=0.8.0
+  - openpyxl>=3.1.2
   - ogcore
   - PolicyEngine-UK>=0.38.6

examples/run_oguk.py

@@ -5,7 +5,7 @@
 import os
 import copy
 from policyengine_core.reforms import Reform
-from policyengine_uk.api import *
+from policyengine_uk.model_api import *
 from oguk.calibrate import Calibration
 from ogcore.parameters import Specifications
 from ogcore import output_tables as ot