Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .envs/testenv-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependencies:
- pytest # dev, tests
- pytest-cov # tests
- pytest-xdist # dev, tests
- optimagic # run, tests
- numba # run, tests
- numpy>=1.17.0 # run, tests
- pandas # run, tests
Expand Down
1 change: 0 additions & 1 deletion .envs/testenv-others.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ dependencies:
- pytest # dev, tests
- pytest-cov # tests
- pytest-xdist # dev, tests
- optimagic # run, tests
- numba # run, tests
- numpy>=1.17.0 # run, tests
- pandas # run, tests
Expand Down
4 changes: 3 additions & 1 deletion .envs/update_envs.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ def main():
docs_env.append(" - -e ../") # add local installation

# write environments
for name, env in zip(["linux", "others"], [test_env_linux, test_env_others]):
for name, env in zip(
["linux", "others"], [test_env_linux, test_env_others], strict=True
):
Path(f".envs/testenv-{name}.yml").write_text("\n".join(env) + "\n")


Expand Down
89 changes: 33 additions & 56 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repos:
- id: check-useless-excludes
# - id: identity # Prints all files passed to pre-commits. Debugging.
- repo: https://github.com/lyz-code/yamlfix
rev: 1.9.0
rev: 1.19.0
hooks:
- id: yamlfix
- repo: local
Expand All @@ -18,7 +18,7 @@ repos:
always_run: true
require_serial: true
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v6.0.0
hooks:
- id: check-added-large-files
args:
Expand Down Expand Up @@ -46,84 +46,61 @@ repos:
- --branch
- main
- id: trailing-whitespace
exclude: docs/
- id: check-ast
- id: check-docstring-first
- repo: https://github.com/adrienverge/yamllint.git
rev: v1.30.0
rev: v1.37.1
hooks:
- id: yamllint
- repo: https://github.com/psf/black
rev: 23.3.0
- repo: https://github.com/PyCQA/docformatter
rev: v1.7.7
hooks:
- id: black
language_version: python3.10
- repo: https://github.com/asottile/blacken-docs
rev: 1.13.0
hooks:
- id: blacken-docs
# - repo: https://github.com/PyCQA/docformatter
# rev: v1.5.1
# hooks:
# - id: docformatter
# args:
# - --in-place
# - --wrap-summaries
# - '88'
# - --wrap-descriptions
# - '88'
# - --blank
- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: v0.0.261
- id: docformatter
args:
- --in-place
- --wrap-summaries
- '88'
- --wrap-descriptions
- '88'
- --blank
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.14.0
hooks:
# Run the linter.
- id: ruff
# args:
# - --verbose
# - repo: https://github.com/kynan/nbstripout
# rev: 0.6.1
# hooks:
# - id: nbstripout
# args:
# - --extra-keys
# - metadata.kernelspec metadata.language_info.version metadata.vscode
- repo: https://github.com/nbQA-dev/nbQA
rev: 1.7.0
hooks:
- id: nbqa-black
- id: nbqa-ruff
types_or:
- python
- pyi
- jupyter
args:
- --fix
# Run the formatter.
- id: ruff-format
types_or:
- python
- pyi
- jupyter
- repo: https://github.com/executablebooks/mdformat
rev: 0.7.16
rev: 0.7.22
hooks:
- id: mdformat
additional_dependencies:
- mdformat-gfm
- mdformat-black
- mdformat-ruff
args:
- --wrap
- '88'
files: (README\.md)
- repo: https://github.com/executablebooks/mdformat
rev: 0.7.16
rev: 0.7.22
hooks:
- id: mdformat
additional_dependencies:
- mdformat-myst
- mdformat-black
- mdformat-ruff
args:
- --wrap
- '88'
files: (docs/.)
- repo: https://github.com/asottile/setup-cfg-fmt
rev: v2.2.0
hooks:
- id: setup-cfg-fmt
- repo: https://github.com/mgedmin/check-manifest
rev: '0.49'
hooks:
- id: check-manifest
args:
- --no-build-isolation
additional_dependencies:
- setuptools-scm
- toml
ci:
autoupdate_schedule: monthly
1 change: 0 additions & 1 deletion docs/rtd_environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ dependencies:
- optimagic
- ipython
- ipython_genutils
- joblib
- matplotlib
- myst-nb
- numpy
Expand Down
1 change: 0 additions & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
"cloudpickle",
"cyipopt",
"fides",
"joblib",
"nlopt",
"pandas",
"pytest",
Expand Down
8 changes: 2 additions & 6 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,12 @@ channels:
dependencies:
- python=3.10 # dev
- jupyterlab # dev, docs
- nb_black # dev, docs
- pdbpp # dev
- pip # dev, tests, docs
- pytest # dev, tests
- pytest-cov # tests
- pytest-xdist # dev, tests
- setuptools_scm # dev
- hatch # dev
- toml # dev
- optimagic # run, tests
- numba # run, tests
- numpy>=1.17.0 # run, tests
- pandas # run, tests
Expand All @@ -27,8 +24,7 @@ dependencies:
- sphinx-panels # docs
- sphinxcontrib-bibtex # docs
- pip: # dev, tests, docs
- black # dev
- blackcellmagic # dev
- kaleido # dev, tests
- pre-commit # dev
- pdbp # dev
- -e . # dev
Loading