Skip to content

Commit

Permalink
pre-commit run -a
Browse files Browse the repository at this point in the history
  • Loading branch information
alanlujan91 committed Feb 7, 2023
1 parent 643f602 commit c7f8b14
Show file tree
Hide file tree
Showing 186 changed files with 2,852 additions and 2,189 deletions.
2 changes: 1 addition & 1 deletion .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Code of Conduct

* [NumFOCUS Code of Conduct](https://numfocus.org/code-of-conduct)
- [NumFOCUS Code of Conduct](https://numfocus.org/code-of-conduct)
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github: [numfocus]
custom: ['https://numfocus.org/donate-to-econ-ark']
custom: ["https://numfocus.org/donate-to-econ-ark"]
15 changes: 8 additions & 7 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

title: ""
labels: ""
assignees: ""
---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
Expand All @@ -24,9 +24,10 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. Mac/Windows/Linux]
- Browser [e.g. chrome, safari]
- Econ-ARK and Python version [eg. 0.10.6 and python 3.7]

- OS: [e.g. Mac/Windows/Linux]
- Browser [e.g. chrome, safari]
- Econ-ARK and Python version [eg. 0.10.6 and python 3.7]

**Additional context**
Add any other context about the problem here.
1 change: 1 addition & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Please ensure your pull request adheres to the following guidelines:

<!--- Put an `x` in all the boxes that apply: -->

- [ ] Tests for new functionality/models or Tests to reproduce the bug-fix in code.
- [ ] Updated documentation of features that add new functionality.
- [ ] Update CHANGELOG.md with major/minor changes.
40 changes: 20 additions & 20 deletions .github/workflows/chatops-binder.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,27 @@ jobs:
if: (github.event.issue.pull_request != null) && contains(github.event.comment.body, '/binder')
runs-on: ubuntu-latest
steps:
# Use the GitHub API to:
# (1) Get the branch name of the PR that has been commented on with "/binder"
# Use the GitHub API to:
# (1) Get the branch name of the PR that has been commented on with "/binder"
# (2) make a comment on the PR with the binder badge
- name: comment on PR with Binder link
uses: actions/github-script@v1
with:
github-token: ${{secrets.GITHUB_TOKEN}}
script: |
// Get the branch name
github.pulls.get({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: context.payload.issue.number
}).then( (pr) => {
// use the branch name to make a comment on the PR with a Binder badge
var BRANCH_NAME = pr.data.head.ref
github.issues.createComment({
issue_number: context.payload.issue.number,
- name: comment on PR with Binder link
uses: actions/github-script@v1
with:
github-token: ${{secrets.GITHUB_TOKEN}}
script: |
// Get the branch name
github.pulls.get({
owner: context.repo.owner,
repo: context.repo.repo,
body: `[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/${context.repo.owner}/${context.repo.repo}/${BRANCH_NAME}) :point_left: Launch a binder notebook on this branch`
pull_number: context.payload.issue.number
}).then( (pr) => {
// use the branch name to make a comment on the PR with a Binder badge
var BRANCH_NAME = pr.data.head.ref
github.issues.createComment({
issue_number: context.payload.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: `[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/${context.repo.owner}/${context.repo.repo}/${BRANCH_NAME}) :point_left: Launch a binder notebook on this branch`
})
})
})
34 changes: 17 additions & 17 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Generate coverage report
on:
push:
branches:
- master
- master
pull_request:
branches:
- master
- master

jobs:
build:
Expand All @@ -16,18 +16,18 @@ jobs:
python-version: [3.8]

steps:
- uses: actions/checkout@v1
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: Generate coverage report
run: |
pip install pytest pytest-cov
pytest --cov=./ --cov-report=xml
- name: upload coverage report
uses: codecov/codecov-action@v1
- uses: actions/checkout@v1
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: Generate coverage report
run: |
pip install pytest pytest-cov
pytest --cov=./ --cov-report=xml
- name: upload coverage report
uses: codecov/codecov-action@v1
7 changes: 3 additions & 4 deletions .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Test examples as a cron job
on:
push:
branches:
- master
- master
pull_request:
branches:
- master
- master
schedule:
- cron: 0 0 * * *

Expand All @@ -16,7 +16,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python-version: ['3.8', '3.9', '3.10']
python-version: ["3.8", "3.9", "3.10"]
steps:
- uses: actions/checkout@v2
- name: Set up Python
Expand All @@ -31,4 +31,3 @@ jobs:
- name: Run examples
run: |
pytest --nbval-lax --current-env examples/
31 changes: 15 additions & 16 deletions .github/workflows/hark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@ name: HARK build on MacOS, Ubuntu and Windows
on:
push:
branches:
- master
- master
pull_request:
branches:
- master
- master

jobs:
build:

runs-on: ${{ matrix.os }}
strategy:
max-parallel: 5
Expand All @@ -19,16 +18,16 @@ jobs:
python-version: [3.8, 3.9, "3.10"]

steps:
- uses: actions/checkout@v1
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pytest
pip install .
- name: Test with pytest
run: |
pytest
- uses: actions/checkout@v1
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pytest
pip install .
- name: Test with pytest
run: |
pytest
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ nate-notes/

*_region_*.*

# VSCode
# VSCode
settings.json
.idea

Expand Down
39 changes: 23 additions & 16 deletions .zenodo.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,33 @@
{
"title": "Heterogeneous Agents Resources and toolKit (HARK)",
"creators": [{
"creators": [
{
"name": "Carroll, Christopher D"
}, {
},
{
"name": "Palmer, Nathan"
}, {
},
{
"name": "White, Matthew N."
}, {
},
{
"name": "Kazil, Jacqueline"
}, {
},
{
"name": "Low, David C"
}, {
},
{
"name": "Kaufman, Alexander"
}],
"access_right": "open",
}
],
"access_right": "open",
"license": "apache2.0",
"upload_type": "software",
"related_identifiers": [
{
"scheme": "url",
"identifier": "https://github.com/econ-ark/HARK/",
"relation": "isSupplementTo"
}
]
"upload_type": "software",
"related_identifiers": [
{
"scheme": "url",
"identifier": "https://github.com/econ-ark/HARK/",
"relation": "isSupplementTo"
}
]
}
Loading

0 comments on commit c7f8b14

Please sign in to comment.