[pre-commit.ci] pre-commit autoupdate (#433)

optimagic-dev · Feb 7, 2023 · b651439 · b651439
1 parent 74c292b
commit b651439
Show file tree

Hide file tree

Showing 58 changed files with 78 additions and 197 deletions.
diff --git a/.envs/testenv-linkcheck.yml b/.envs/testenv-linkcheck.yml
diff --git a/.envs/testenv-linux.yml b/.envs/testenv-linux.yml
@@ -1,10 +1,8 @@
 ---
 name: estimagic
-
 channels:
   - conda-forge
   - nodefaults
-
 dependencies:
   - jax
   - pygmo
@@ -14,7 +12,6 @@ dependencies:
   - pytest-cov  # tests
   - pytest-xdist  # dev, tests
   - statsmodels  # dev, tests
-
   - bokeh<=2.4.3  # run, tests
   - click  # run, tests
   - cloudpickle  # run, tests
@@ -26,13 +23,11 @@ dependencies:
   - plotly  # run, tests
   - pybaum >= 0.1.2  # run, tests
   - scipy>=1.2.1  # run, tests
-  - sqlalchemy <2.0   # run, tests
-
-
+  - sqlalchemy <2.0  # run, tests
   - pip:  # dev, tests, docs
-      - DFO-LS    # dev, tests
-      - Py-BOBYQA    # dev, tests
-      - fides==0.7.4    # dev, tests
-      - kaleido    # dev, tests
-      - simoptlib==1.0.1    # dev, tests
+      - DFO-LS  # dev, tests
+      - Py-BOBYQA  # dev, tests
+      - fides==0.7.4  # dev, tests
+      - kaleido  # dev, tests
+      - simoptlib==1.0.1  # dev, tests
       - -e ../
diff --git a/.envs/testenv-others.yml b/.envs/testenv-others.yml
@@ -1,10 +1,8 @@
 ---
 name: estimagic
-
 channels:
   - conda-forge
   - nodefaults
-
 dependencies:
   - cyipopt
   - nlopt  # dev, tests
@@ -13,7 +11,6 @@ dependencies:
   - pytest-cov  # tests
   - pytest-xdist  # dev, tests
   - statsmodels  # dev, tests
-
   - bokeh<=2.4.3  # run, tests
   - click  # run, tests
   - cloudpickle  # run, tests
@@ -25,13 +22,11 @@ dependencies:
   - plotly  # run, tests
   - pybaum >= 0.1.2  # run, tests
   - scipy>=1.2.1  # run, tests
-  - sqlalchemy <2.0   # run, tests
-
-
+  - sqlalchemy <2.0  # run, tests
   - pip:  # dev, tests, docs
-      - DFO-LS    # dev, tests
-      - Py-BOBYQA    # dev, tests
-      - fides==0.7.4    # dev, tests
-      - kaleido    # dev, tests
-      - simoptlib==1.0.1    # dev, tests
+      - DFO-LS  # dev, tests
+      - Py-BOBYQA  # dev, tests
+      - fides==0.7.4  # dev, tests
+      - kaleido  # dev, tests
+      - simoptlib==1.0.1  # dev, tests
       - -e ../
diff --git a/.envs/update_envs.py b/.envs/update_envs.py
@@ -40,9 +40,7 @@ def main():
     docs_env.append("      - -e ../")  # add local installation
 
     # write environments
-    for name, env in zip(
-        ["linux", "others", "linkcheck"], [test_env_linux, test_env_others, docs_env]
-    ):
+    for name, env in zip(["linux", "others"], [test_env_linux, test_env_others]):
         Path(f".envs/testenv-{name}.yml").write_text("\n".join(env) + "\n")
 
 

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,19 +1,16 @@
 ---
 name: main
-
 # Automatically cancel a previous run.
 concurrency:
   group: ${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
-
 on:
   push:
     branches:
       - main
   pull_request:
     branches:
       - '*'
-
 jobs:
   run-tests-linux:
     name: Run tests for ${{ matrix.os }} on ${{ matrix.python-version }}
@@ -47,7 +44,6 @@ jobs:
         uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-
   run-tests-win-and-mac:
     name: Run tests for ${{ matrix.os }} on ${{ matrix.python-version }}
     runs-on: ${{ matrix.os }}
@@ -76,7 +72,6 @@ jobs:
         run: |
           micromamba activate estimagic
           pytest -m "not slow and not jax"
-
   code-in-docs:
     name: Run code snippets in documentation
     runs-on: ubuntu-latest

diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml
@@ -1,20 +1,16 @@
 ---
 name: PyPI
-
 on: push
-
 jobs:
   build-n-publish:
     name: Build and publish Python 🐍 distributions 📦 to PyPI
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-
       - name: Set up Python 3.10
         uses: actions/setup-python@v4
         with:
           python-version: '3.10'
-
       - name: Install pypa/build
         run: >-
           python -m

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -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.2.0
+    rev: 1.8.0
     hooks:
       - id: yamlfix
         exclude: tests/optimization/fixtures
@@ -18,7 +18,6 @@ repos:
         language: python
         always_run: true
         require_serial: true
-
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.4.0
     hooks:
@@ -53,12 +52,12 @@ repos:
       - id: check-docstring-first
         exclude: src/estimagic/optimization/algo_options.py
   - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.28.0
+    rev: v1.29.0
     hooks:
       - id: yamllint
         exclude: tests/optimization/fixtures
   - repo: https://github.com/psf/black
-    rev: 22.12.0
+    rev: 23.1.0
     hooks:
       - id: black
         language_version: python3.10
@@ -79,7 +78,7 @@ repos:
           - '88'
           - --blank
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.230
+    rev: v0.0.241
     hooks:
       - id: ruff
       #   args:
@@ -131,6 +130,5 @@ repos:
         additional_dependencies:
           - setuptools-scm
           - toml
-
 ci:
   autoupdate_schedule: monthly
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -1,14 +1,11 @@
 ---
 version: 2
-
 build:
   os: ubuntu-22.04
   tools:
     python: mambaforge-4.10
-
 conda:
   environment: docs/rtd_environment.yml
-
 sphinx:
   builder: html
   configuration: docs/source/conf.py

diff --git a/.yamllint.yml b/.yamllint.yml
@@ -3,7 +3,6 @@ yaml-files:
   - '*.yaml'
   - '*.yml'
   - .yamllint
-
 rules:
   braces: enable
   brackets: enable

diff --git a/codecov.yml b/codecov.yml
@@ -2,7 +2,6 @@
 codecov:
   notify:
     require_ci_to_pass: true
-
 coverage:
   precision: 2
   round: down
@@ -14,7 +13,6 @@ coverage:
     project:
       default:
         target: 90%
-
 ignore:
   - .tox/**/*
   - release.py

diff --git a/docs/rtd_environment.yml b/docs/rtd_environment.yml
@@ -1,16 +1,13 @@
 ---
 name: estimagic-docs
-
 channels:
   - conda-forge
   - nodefaults
-
 dependencies:
   - python=3.9
   - pip
   - setuptools_scm
   - toml
-
   - black
   - sphinx
   - sphinxcontrib-bibtex
@@ -31,7 +28,6 @@ dependencies:
   - joblib
   - plotly
   - ipython
-
   - pip:
       - ../
       - kaleido

diff --git a/environment.yml b/environment.yml
@@ -1,10 +1,8 @@
 ---
 name: estimagic
-
 channels:
   - conda-forge
   - nodefaults
-
 dependencies:
   - python=3.10  # dev
   - cyipopt  # dev
@@ -20,7 +18,6 @@ dependencies:
   - setuptools_scm  # dev
   - statsmodels  # dev, tests
   - toml  # dev
-
   - bokeh<=2.4.3  # run, tests
   - click  # run, tests
   - cloudpickle  # run, tests
@@ -32,24 +29,22 @@ dependencies:
   - plotly  # run, tests
   - pybaum >= 0.1.2  # run, tests
   - scipy>=1.2.1  # run, tests
-  - sqlalchemy <2.0   # run, tests
-
+  - sqlalchemy <2.0  # run, tests
   - pydata-sphinx-theme>=0.3.0  # docs
   - myst-nb  # docs
   - sphinx  # docs
   - sphinx-copybutton  # docs
   - sphinx-panels  # docs
   - sphinxcontrib-bibtex  # docs
-
   - pip:  # dev, tests, docs
-      - DFO-LS    # dev, tests
-      - Py-BOBYQA    # dev, tests
-      - black    # dev
-      - blackcellmagic    # dev
-      - fides==0.7.4    # dev, tests
-      - gif    # dev
-      - gif[matplotlib]    # dev
-      - kaleido    # dev, tests
-      - pre-commit    # dev
-      - simoptlib==1.0.1    # dev, tests
-      - -e .    # dev
+      - DFO-LS  # dev, tests
+      - Py-BOBYQA  # dev, tests
+      - black  # dev
+      - blackcellmagic  # dev
+      - fides==0.7.4  # dev, tests
+      - gif  # dev
+      - gif[matplotlib]  # dev
+      - kaleido  # dev, tests
+      - pre-commit  # dev
+      - simoptlib==1.0.1  # dev, tests
+      - -e .  # dev
diff --git a/pyproject.toml b/pyproject.toml
@@ -40,6 +40,8 @@ extend-ignore = [
     "S324", # Probable use of insecure hash function.
     "COM812", # trailing comma missing, but black takes care of that
     "PT007", # wrong type in parametrize, gave false positives
+    "EXE001", # Shebang is present but file is not executable
+    "PIE804", # unnecessary dict kwargs
 
 
     # Things we are not sure we want
@@ -58,7 +60,12 @@ extend-ignore = [
     "C901",  # function too complex
     "PT011", # pytest raises without match statement
     "INP001", # implicit namespace packages without init.
-    "TRY300", # consider moving this statement to an else block
+    "TRY",
+    "PLR",
+    "TCH",
+    "RSE",
+    "SLF",
+    "PTH123",
     # ======================================
 ]
 
@@ -112,5 +119,5 @@ norecursedirs = ["docs", ".envs"]
 
 [tool.yamlfix]
 line_length = 88
-flow_style_sequence = false
+sequence_style = "block_style"
 none_representation = "null"
diff --git a/src/estimagic/benchmarking/get_benchmark_problems.py b/src/estimagic/benchmarking/get_benchmark_problems.py
@@ -99,7 +99,7 @@ def get_benchmark_problems(
 
     if scaling:
         scaling_options = scaling_options if scaling_options is not None else {}
-        scaling_options = {**{"min_scale": 0.1, "max_scale": 10}, **scaling_options}
+        scaling_options = {"min_scale": 0.1, "max_scale": 10, **scaling_options}
     else:
         scaling_options = None
 

diff --git a/src/estimagic/benchmarking/run_benchmark.py b/src/estimagic/benchmarking/run_benchmark.py
@@ -159,7 +159,6 @@ def _get_results(names, raw_results, kwargs_list):
     results = {}
 
     for name, result, inputs in zip(names, raw_results, kwargs_list):
-
         if isinstance(result, OptimizeResult):
             history = result.history
             params_history = pd.DataFrame(