Merge branch 'econ-ark:master' into Update_JAC

.github/workflows/coverage.yml

@@ -4,9 +4,15 @@ on:
   push:
     branches:
       - master
+    paths-ignore:
+      - ".github/workflows/documentation.yml"
+      - "Documentation/**"
   pull_request:
     branches:
       - master
+    paths-ignore:
+      - ".github/workflows/documentation.yml"
+      - "Documentation/**"
 
 jobs:
   build:
@@ -24,10 +30,11 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -r requirements.txt
+          pip install -r requirements/base.txt
       - name: Generate coverage report
         run: |
           pip install pytest pytest-cov
+          NUMBA_DISABLE_JIT=1
           pytest --cov=./ --cov-report=xml
       - name: upload coverage report
         uses: codecov/codecov-action@v3

.github/workflows/documentation.yml

@@ -0,0 +1,74 @@
+name: Documentation
+
+# Run on all pushes and pull requests, and on demand
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+# Limit workflow permissions
+permissions:
+  contents: read
+
+# Limit simultaneous workflow runs
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+env:
+  FORCE_COLOR: "1"
+
+jobs:
+  render:
+    name: Render
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up Python 3.9
+      uses: actions/setup-python@v4
+      with:
+        python-version: "3.9"  # Numba doesn't support Python 3.11 [2023-05]
+        cache: 'pip'
+        cache-dependency-path: |
+          requirements/base.txt
+          requirements/dev.txt
+
+    - name: Install Pandoc
+      run: sudo apt-get install --yes pandoc
+
+    - name: Update pip
+      run: python -m pip install --upgrade pip
+
+    - name: Install HARK
+      run: python -m pip install .[dev]
+
+    - name: Run Sphinx
+      run: >
+        sphinx-build
+        -M html Documentation HARK-docs
+        -T
+
+    - name: Set up git for deployment
+      run: |
+        git config user.name "${{ github.actor }}"
+        git config user.email "${{ github.actor }}@users.noreply.github.com"
+        git config --local --unset-all http.https://github.com/.extraheader
+
+    - name: Commit all rendered HTML files
+      run: |
+        git switch --orphan gh-pages
+        git add --all HARK-docs/html
+        git commit -qm "Documentation from @ ${{ github.repository }}@${{ github.sha }}"
+
+    - name: Deploy to GitHub Pages
+      # Only deploy to Pages on pushes to HEAD
+      if: (github.repository_owner == 'Econ-ARK') && (github.event_name == 'push') && (github.ref_name == 'master')
+      run: >
+        git push
+        --force 
+        https://x-access-token:${{ github.token }}@github.com/${{ github.repository }}
+        `git subtree split --prefix HARK-docs/html gh-pages`:refs/heads/gh-pages

.github/workflows/examples.yml

@@ -4,9 +4,15 @@ on:
   push:
     branches:
       - master
+    paths-ignore:
+      - ".github/workflows/documentation.yml"
+      - "Documentation/**"
   pull_request:
     branches:
       - master
+    paths-ignore:
+      - ".github/workflows/documentation.yml"
+      - "Documentation/**"
   schedule:
     - cron: 0 0 * * *
 

.github/workflows/hark.yml

@@ -4,9 +4,15 @@ on:
   push:
     branches:
       - master
+    paths-ignore:
+      - ".github/workflows/documentation.yml"
+      - "Documentation/**"
   pull_request:
     branches:
       - master
+    paths-ignore:
+      - ".github/workflows/documentation.yml"
+      - "Documentation/**"
 
 jobs:
   build:

.pre-commit-config.yaml

@@ -2,7 +2,7 @@ exclude: Documentation/example_notebooks/
 
 repos:
   - repo: https://github.com/mwouts/jupytext
-    rev: v1.14.4
+    rev: v1.14.5
     hooks:
       - id: jupytext
         args:
@@ -11,13 +11,13 @@ repos:
         files: ^examples/.*\.ipynb$
 
   - repo: https://github.com/psf/black
-    rev: 23.1.0
+    rev: 23.3.0
     hooks:
       - id: black
         exclude: ^examples/
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.1
+    rev: v3.4.0
     hooks:
       - id: pyupgrade
         args: ["--py38-plus"]
@@ -30,15 +30,15 @@ repos:
         exclude: ^examples/
 
   - repo: https://github.com/pycqa/isort
-    rev: 5.11.5
+    rev: 5.12.0
     hooks:
       - id: isort
         name: isort (python)
         args: ["--profile", "black", "--filter-files", "--skip", "__init__.py"]
         exclude: ^examples/
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.0-alpha.4
+    rev: v3.0.0-alpha.9-for-vscode
     hooks:
       - id: prettier
         exclude: ^examples/

Documentation/CHANGELOG.md

@@ -14,8 +14,13 @@ Release Date: TBD
 
 ### Major Changes
 
+- Adds `HARK.core.AgentPopulation` class to represent a population of agents with ex-ante heterogeneous parametrizations as distributions. [#1237](https://github.com/econ-ark/HARK/pull/1237)
+
 ### Minor Changes
+
 - Adds option `sim_common_Rrisky` to control whether risky-asset models draw common or idiosyncratic returns in simulation. [#1250](https://github.com/econ-ark/HARK/pull/1250),[#1253](https://github.com/econ-ark/HARK/pull/1253)
+- Addresses [#1255](https://github.com/econ-ark/HARK/issues/1255). Makes age-varying stochastic returns possible and draws from their discretized version. [#1262](https://github.com/econ-ark/HARK/pull/1262)
+- Fixes bug in the metric that compares dictionaries with the same keys. [#1260](https://github.com/econ-ark/HARK/pull/1260)
 
 ### 0.13.0