Merge pull request #1 from jdebacker/pr-26

Updates to IOT PR #26 for formatting and testing

.github/workflows/build_and_test.yml

@@ -1,4 +1,4 @@
-name: Build and test [Python 3.7, 3.8, 3.9]
+name: Build and test [Python 3.9, 3.10, 3.11]
 
 on: [push, pull_request]
 
@@ -7,11 +7,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.9, "3.10", "3.11"]
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@master
         with:
           persist-credentials: false
 
@@ -35,8 +35,10 @@ jobs:
         run: |
           pytest -m 'not full_run and not regression' --cov=./ --cov-report=xml
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2
+        if: contains(github.repository, 'PSLmodels/InverseOptimalTax')
+        uses: codecov/codecov-action@v4
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           files: ./coverage.xml
           flags: unittests
           name: codecov-umbrella

.github/workflows/check_black.yml

@@ -6,7 +6,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@master
       - uses: psf/black@stable
         with:
           options: "--line-length 79 --check --verbose"

.github/workflows/deploy_docs.yml

@@ -9,7 +9,7 @@ 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
 
@@ -18,14 +18,12 @@ jobs:
         with:
           activate-environment: iot-dev
           environment-file: environment.yml
-          python-version: 3.8
+          python-version: 3.11
           auto-activate-base: false
 
       - name: Build # Build Jupyter Book
         shell: bash -l {0}
         run: |
-          pip install jupyter-book
-          pip install sphinxcontrib-bibtex==2.2.0
           pip install -e .
           cd docs
           jb build ./book

.github/workflows/docs_check.yml

@@ -6,7 +6,7 @@ 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
 
@@ -15,14 +15,12 @@ jobs:
         with:
           activate-environment: iot-dev
           environment-file: environment.yml
-          python-version: 3.8
+          python-version: 3.11
           auto-activate-base: false
 
       - name: Build # Build Jupyter Book
         shell: bash -l {0}
         run: |
-          pip install jupyter-book
-          pip install sphinxcontrib-bibtex==2.2.0
           pip install -e .
           cd docs
           jb build ./book

PSL_catalog.json

@@ -0,0 +1,29 @@
+{
+    "name": "Inverse Optimal Tax",
+    "img": "",
+    "banner_title": "Inverse Optimal Tax",
+    "banner_subtitle": "A model of inverse optimal taxation.",
+    "detailed_description": "A model of inverse optimal taxation.",
+    "policy_area": "Optimal Taxation, Inverse Optimal Taxation, Individual Income Tax",
+    "geography": "United States",
+    "language": "Python",
+    "maintainers": [
+      {
+        "name": "Jason DeBacker",
+        "image": "https://avatars.githubusercontent.com/u/10715924?v=4",
+        "link": "https://github.com/jdebacker/"
+      },
+      {
+        "name": "John P. Ryan",
+        "image": "https://avatars.githubusercontent.com/u/83313096?v=4",
+        "link": "https://github.com/john-p-ryan"
+      }
+    ],
+    "links": {
+      "code_repository": "https://github.com/PSLmodels/InverseOptimalTax",
+      "user_documentation": "https://pslmodels.github.io/InverseOptimalTax/content/intro/intro.html",
+      "contributor_documentation": "https://pslmodels.github.io/InverseOptimalTax/content/intro/contributing.html",
+      "webapp": "",
+      "recent_changes": ""
+    }
+  }

environment.yml

@@ -18,4 +18,7 @@ dependencies:
   - jupyter-book>=0.9.1
   - black
   - plotly-express
-  - kaleido
+  - kaleido
+  - typing_extensions
+  - jupyter-book
+  - sphinxcontrib-bibtex