Skip to content

Commit 1fb9eae

Browse files
authored
Prepare for tranquilo 0.1.0 (#19)
1 parent af38e9a commit 1fb9eae

75 files changed

Lines changed: 579 additions & 432 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.envs/testenv-linux.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ dependencies:
1010
- pytest # dev, tests
1111
- pytest-cov # tests
1212
- pytest-xdist # dev, tests
13-
- optimagic # run, tests
1413
- numba # run, tests
1514
- numpy>=1.17.0 # run, tests
1615
- pandas # run, tests

.envs/testenv-others.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ dependencies:
99
- pytest # dev, tests
1010
- pytest-cov # tests
1111
- pytest-xdist # dev, tests
12-
- optimagic # run, tests
1312
- numba # run, tests
1413
- numpy>=1.17.0 # run, tests
1514
- pandas # run, tests

.envs/update_envs.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ def main():
4040
docs_env.append(" - -e ../") # add local installation
4141

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

4648

.pre-commit-config.yaml

Lines changed: 33 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ repos:
66
- id: check-useless-excludes
77
# - id: identity # Prints all files passed to pre-commits. Debugging.
88
- repo: https://github.com/lyz-code/yamlfix
9-
rev: 1.9.0
9+
rev: 1.19.0
1010
hooks:
1111
- id: yamlfix
1212
- repo: local
@@ -18,7 +18,7 @@ repos:
1818
always_run: true
1919
require_serial: true
2020
- repo: https://github.com/pre-commit/pre-commit-hooks
21-
rev: v4.4.0
21+
rev: v6.0.0
2222
hooks:
2323
- id: check-added-large-files
2424
args:
@@ -46,84 +46,61 @@ repos:
4646
- --branch
4747
- main
4848
- id: trailing-whitespace
49+
exclude: docs/
4950
- id: check-ast
50-
- id: check-docstring-first
5151
- repo: https://github.com/adrienverge/yamllint.git
52-
rev: v1.30.0
52+
rev: v1.37.1
5353
hooks:
5454
- id: yamllint
55-
- repo: https://github.com/psf/black
56-
rev: 23.3.0
55+
- repo: https://github.com/PyCQA/docformatter
56+
rev: v1.7.7
5757
hooks:
58-
- id: black
59-
language_version: python3.10
60-
- repo: https://github.com/asottile/blacken-docs
61-
rev: 1.13.0
62-
hooks:
63-
- id: blacken-docs
64-
# - repo: https://github.com/PyCQA/docformatter
65-
# rev: v1.5.1
66-
# hooks:
67-
# - id: docformatter
68-
# args:
69-
# - --in-place
70-
# - --wrap-summaries
71-
# - '88'
72-
# - --wrap-descriptions
73-
# - '88'
74-
# - --blank
75-
- repo: https://github.com/charliermarsh/ruff-pre-commit
76-
rev: v0.0.261
58+
- id: docformatter
59+
args:
60+
- --in-place
61+
- --wrap-summaries
62+
- '88'
63+
- --wrap-descriptions
64+
- '88'
65+
- --blank
66+
- repo: https://github.com/astral-sh/ruff-pre-commit
67+
rev: v0.14.0
7768
hooks:
69+
# Run the linter.
7870
- id: ruff
79-
# args:
80-
# - --verbose
81-
# - repo: https://github.com/kynan/nbstripout
82-
# rev: 0.6.1
83-
# hooks:
84-
# - id: nbstripout
85-
# args:
86-
# - --extra-keys
87-
# - metadata.kernelspec metadata.language_info.version metadata.vscode
88-
- repo: https://github.com/nbQA-dev/nbQA
89-
rev: 1.7.0
90-
hooks:
91-
- id: nbqa-black
92-
- id: nbqa-ruff
71+
types_or:
72+
- python
73+
- pyi
74+
- jupyter
75+
args:
76+
- --fix
77+
# Run the formatter.
78+
- id: ruff-format
79+
types_or:
80+
- python
81+
- pyi
82+
- jupyter
9383
- repo: https://github.com/executablebooks/mdformat
94-
rev: 0.7.16
84+
rev: 0.7.22
9585
hooks:
9686
- id: mdformat
9787
additional_dependencies:
9888
- mdformat-gfm
99-
- mdformat-black
89+
- mdformat-ruff
10090
args:
10191
- --wrap
10292
- '88'
10393
files: (README\.md)
10494
- repo: https://github.com/executablebooks/mdformat
105-
rev: 0.7.16
95+
rev: 0.7.22
10696
hooks:
10797
- id: mdformat
10898
additional_dependencies:
10999
- mdformat-myst
110-
- mdformat-black
100+
- mdformat-ruff
111101
args:
112102
- --wrap
113103
- '88'
114104
files: (docs/.)
115-
- repo: https://github.com/asottile/setup-cfg-fmt
116-
rev: v2.2.0
117-
hooks:
118-
- id: setup-cfg-fmt
119-
- repo: https://github.com/mgedmin/check-manifest
120-
rev: '0.49'
121-
hooks:
122-
- id: check-manifest
123-
args:
124-
- --no-build-isolation
125-
additional_dependencies:
126-
- setuptools-scm
127-
- toml
128105
ci:
129106
autoupdate_schedule: monthly

docs/rtd_environment.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ dependencies:
1111
- optimagic
1212
- ipython
1313
- ipython_genutils
14-
- joblib
1514
- matplotlib
1615
- myst-nb
1716
- numpy

docs/source/conf.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
"cloudpickle",
6767
"cyipopt",
6868
"fides",
69-
"joblib",
7069
"nlopt",
7170
"pandas",
7271
"pytest",

environment.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,12 @@ channels:
66
dependencies:
77
- python=3.10 # dev
88
- jupyterlab # dev, docs
9-
- nb_black # dev, docs
10-
- pdbpp # dev
119
- pip # dev, tests, docs
1210
- pytest # dev, tests
1311
- pytest-cov # tests
1412
- pytest-xdist # dev, tests
15-
- setuptools_scm # dev
13+
- hatch # dev
1614
- toml # dev
17-
- optimagic # run, tests
1815
- numba # run, tests
1916
- numpy>=1.17.0 # run, tests
2017
- pandas # run, tests
@@ -27,8 +24,7 @@ dependencies:
2724
- sphinx-panels # docs
2825
- sphinxcontrib-bibtex # docs
2926
- pip: # dev, tests, docs
30-
- black # dev
31-
- blackcellmagic # dev
3227
- kaleido # dev, tests
3328
- pre-commit # dev
29+
- pdbp # dev
3430
- -e . # dev

0 commit comments

Comments
 (0)