Skip to content

Commit

Permalink
Merge branch 'SimplifySolvers' into Alan/SimplifySolvers
Browse files Browse the repository at this point in the history
  • Loading branch information
alanlujan91 committed Mar 14, 2024
2 parents fb74f68 + ccbdd76 commit 73ee2d5
Show file tree
Hide file tree
Showing 51 changed files with 2,446 additions and 732 deletions.
44 changes: 6 additions & 38 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,49 +2,17 @@ exclude: Documentation/example_notebooks/

repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.1.4
rev: v0.3.2
hooks:
- id: ruff
types_or: [jupyter]
types_or: [ python, pyi, jupyter ]
args:
- --fix
- id: ruff-format
args: [--check]
types_or: [jupyter]

- repo: https://github.com/psf/black
rev: 23.7.0
hooks:
- id: black
exclude: ^examples/

- repo: https://github.com/asottile/pyupgrade
rev: v3.10.1
hooks:
- id: pyupgrade
args: ["--py38-plus"]
exclude: ^examples/

- repo: https://github.com/asottile/blacken-docs
rev: 1.15.0
hooks:
- id: blacken-docs
exclude: ^examples/

- repo: https://github.com/pycqa/isort
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.1
hooks:
- id: prettier
exclude: ^examples/
types_or: [ python, pyi, jupyter ]

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: end-of-file-fixer
- id: trailing-whitespace
Expand Down
1 change: 1 addition & 0 deletions HARK/ConsumptionSaving/ConsAggShockModel.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
basic solver. Also includes a subclass of Market called CobbDouglas economy,
used for solving "macroeconomic" models with aggregate shocks.
"""

from copy import deepcopy

import numpy as np
Expand Down
Loading

0 comments on commit 73ee2d5

Please sign in to comment.