-
Notifications
You must be signed in to change notification settings - Fork 2
Add initial files from Aiden's OG-PHL-based work, renamed to OG-BRA #2
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.
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
Open
markdebacker
wants to merge
3
commits into
PSLmodels:main
Choose a base branch
from
markdebacker:initial_files
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| Thanks for filing an issue! Please remove any top-level headers that do not apply. | ||
|
|
||
| # Problem or Error | ||
| Please characterize the problem concisely and precisely. You may want to include error message output, other terminal output, your environment characteristics, and a way to replicate the issue. Let us know what solutions you have tried. | ||
|
|
||
| # Question | ||
| Please ask the question with clear context and any potential answer directions you can think of. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| Thanks for contributing! Please remove any top-level sections that do not apply to your changes. | ||
|
|
||
| - [ ] `make format` and `make documentation` has been run. (You may also want to run `make test`.) | ||
|
|
||
| ## What's changed | ||
|
|
||
| Description of the changes here. | ||
|
|
||
| # Bug fix | ||
|
|
||
| - [ ] Continuous integration test added | ||
| - [ ] Continuous integration test passing | ||
|
|
||
| ## What this fixes and how it's fixed | ||
|
|
||
| Description of how this fix works goes here. Link any issues this PR fixes. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| name: Build and test | ||
| on: | ||
| push: | ||
| paths: | ||
| - '**.yml' | ||
| - '**.toml' | ||
| - '**.ini' | ||
| - '**.py' | ||
| - '**.json' | ||
| - '**.csv' | ||
| - '**.pkl' | ||
| pull_request: | ||
| paths: | ||
| - '**.yml' | ||
| - '**.toml' | ||
| - '**.ini' | ||
| - '**.py' | ||
| - '**.json' | ||
| - '**.csv' | ||
| - '**.pkl' | ||
| jobs: | ||
| build: | ||
| runs-on: ${{ matrix.os }} | ||
| strategy: | ||
| matrix: | ||
| os: [ubuntu-latest, macos-latest, windows-latest] | ||
| python-version: ["3.11", "3.12"] | ||
|
|
||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| persist-credentials: false | ||
|
|
||
| - name: Setup Miniconda using Python ${{ matrix.python-version }} | ||
| uses: conda-incubator/setup-miniconda@v3 | ||
| with: | ||
| miniconda-version: "latest" | ||
| auto-update-conda: true | ||
| activate-environment: ogbra-dev | ||
| environment-file: environment.yml | ||
| python-version: ${{ matrix.python-version }} | ||
| auto-activate-base: false | ||
|
|
||
| - name: Build | ||
| shell: bash -l {0} | ||
| run: | | ||
| pip install -e . | ||
| - name: Test | ||
| shell: bash -l {0} | ||
| working-directory: ./ | ||
| run: | | ||
| python -m pytest -m 'not local' --cov=./ --cov-report=xml | ||
| - name: Upload coverage to Codecov | ||
| if: matrix.os == 'ubuntu-latest' && contains(github.repository, 'EAPD-DRB/OG-BRA') | ||
| uses: codecov/codecov-action@v4 | ||
| with: | ||
| files: ./coverage.xml | ||
| flags: unittests | ||
| name: codecov-umbrella | ||
| token: ${{ secrets.CODECOV_TOKEN }} | ||
| fail_ci_if_error: true | ||
| verbose: true |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| name: Check code formatting | ||
|
|
||
| on: [push, pull_request] | ||
|
|
||
| jobs: | ||
| lint: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: actions/setup-python@v4 | ||
| - uses: psf/black@stable | ||
| with: | ||
| options: "-l 79 --check" | ||
| src: "." |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| name: Build and Deploy Jupyter Book documentation | ||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
| paths: | ||
| - './docs/**.png' | ||
| - './docs/book/content/calibration/images/**.png' | ||
| - './docs/README.md' | ||
| - './docs/book/**.yml' | ||
| - './docs/book/**.bib' | ||
| - '**.md' | ||
| - './docs/book/content/api/**.rst' | ||
| - './ogbra/**.py' | ||
| jobs: | ||
| build-and-deploy: | ||
| if: github.repository == 'EAPD-DRB/OG-BRA' | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| persist-credentials: false | ||
|
|
||
| - name: Setup Miniconda | ||
| uses: conda-incubator/setup-miniconda@v3 | ||
| with: | ||
| miniforge-variant: Mambaforge | ||
| activate-environment: ogbra-dev | ||
| environment-file: environment.yml | ||
| python-version: "3.11" | ||
| auto-activate-base: false | ||
|
|
||
| - name: Build # Build Jupyter Book | ||
| shell: bash -l {0} | ||
| run: | | ||
| pip install jupyter-book>=0.11.3 | ||
| pip install sphinxcontrib-bibtex>=2.0.0 | ||
| pip install -e . | ||
| python -m ipykernel install --user --name=ogbra-dev | ||
| jb build ./docs/book | ||
|
|
||
| - name: Deploy | ||
| uses: JamesIves/github-pages-deploy-action@releases/v4 | ||
| with: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| BRANCH: gh-pages # The branch the action should deploy to. | ||
| FOLDER: docs/book/_build/html # The folder the action should deploy. | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| name: Check that docs build | ||
| on: | ||
| pull_request: | ||
| paths: | ||
| - './docs/**.png' | ||
| - './docs/book/content/calibration/images/**.png' | ||
| - './docs/README.md' | ||
| - './docs/book/**.yml' | ||
| - './docs/book/**.bib' | ||
| - '**.md' | ||
| - './docs/book/content/api/**.rst' | ||
| - './ogbra/**.py' | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| persist-credentials: false | ||
|
|
||
| - name: Setup Miniconda | ||
| uses: conda-incubator/setup-miniconda@v3 | ||
| with: | ||
| miniforge-variant: Mambaforge | ||
| activate-environment: ogbra-dev | ||
| environment-file: environment.yml | ||
| python-version: "3.11" | ||
| auto-activate-base: false | ||
|
|
||
| - name: Build # Build Jupyter Book | ||
| shell: bash -l {0} | ||
| run: | | ||
| pip install jupyter-book>=0.11.3 | ||
| pip install sphinxcontrib-bibtex>=2.0.0 | ||
| pip install -e . | ||
| python -m ipykernel install --user --name=ogbra-dev | ||
| jb build ./docs/book |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| name: Publish package to PyPI | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
|
|
||
| jobs: | ||
| deploy: | ||
| name: Publish to PyPI | ||
| if: github.repository == 'EAPD-DRB/OG-BRA' | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Repo should be changed to 'PSLmodels/OG-BRA' |
||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout repo | ||
| uses: actions/checkout@v4 | ||
| - name: Setup Python | ||
| uses: actions/setup-python@v4 | ||
| with: | ||
| python-version: "3.11" | ||
| - name: Build package | ||
| shell: bash -l {0} | ||
| run: | | ||
| pip install wheel | ||
| python setup.py sdist bdist_wheel | ||
| - name: Publish a Python distribution to PyPI | ||
| uses: pypa/gh-action-pypi-publish@release/v1 | ||
| with: | ||
| user: __token__ | ||
| password: ${{ secrets.PYPI }} | ||
| skip_existing: true | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| # Changelog | ||
|
|
||
| All notable changes to this project will be documented in this file. | ||
|
|
||
| The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), | ||
| and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). | ||
|
|
||
|
|
||
| ## [0.0.7] - 2024-12-06 11:00:00 | ||
|
|
||
| ### Added | ||
|
|
||
| - Testing on Python 3.12 | ||
| - Updated local currency units in `constants.py` | ||
|
|
||
| ## [0.0.6] - 2024-10-24 11:00:00 | ||
|
|
||
| ### Added | ||
|
|
||
| - Updated `alpha_G` and `alpha_I` | ||
|
|
||
| ## [0.0.5] - 2024-10-20 22:00:00 | ||
|
|
||
| ### Added | ||
|
|
||
| - Updated Frisch elasticity of labor supply parameter value to 0.25 | ||
| - Added multi industry example run script | ||
|
|
||
| ## [0.0.4] - 2024-10-20 22:00:00 | ||
|
|
||
| ### Added | ||
|
|
||
| - Added UN tutorial section to documentation | ||
| - Updated some Sphinx packages in `environment.yml` | ||
|
|
||
| ## [0.0.3] - 2024-08-11 12:00:00 | ||
|
|
||
| ### Added | ||
|
|
||
| - Updates the calibration of `OG-BRA` | ||
| - Updates the documentation | ||
|
|
||
| ## [0.0.0] - 2024-06-20 12:00:00 | ||
|
|
||
| ### Added | ||
|
|
||
| - This version is a pre-release alpha. The example run script OG-BRA/examples/run_og_bra.py runs, but the model is not currently calibrated to represent the Brazil economy and population. | ||
|
|
||
| [0.0.7]: https://github.com/EAPD-DRB/OG-BRA/compare/v0.0.6...v0.0.7 | ||
| [0.0.6]: https://github.com/EAPD-DRB/OG-BRA/compare/v0.0.4...v0.0.6 | ||
| [0.0.5]: https://github.com/EAPD-DRB/OG-BRA/compare/v0.0.4...v0.0.5 | ||
| [0.0.4]: https://github.com/EAPD-DRB/OG-BRA/compare/v0.0.3...v0.0.4 | ||
| [0.0.3]: https://github.com/EAPD-DRB/OG-BRA/compare/v0.0.0...v0.0.3 |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
repo should be changed to 'PSLmodels/OG-BRA'