From e22375a2a296b324489541356b5a8bd8241ab2d1 Mon Sep 17 00:00:00 2001 From: jimenezd <david.doblas-jimenez@xfel.eu> Date: Thu, 18 Aug 2022 17:46:49 +0200 Subject: [PATCH 1/5] Change hook for notebooks --- .pre-commit-config.yaml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 13f1176..1832439 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ # See https://pre-commit.com/hooks.html for more hooks repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.1.0 + rev: v4.3.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer @@ -12,31 +12,30 @@ repos: - id: check-docstring-first - repo: https://github.com/psf/black - rev: 22.1.0 + rev: 22.6.0 hooks: - id: black args: [--line-length=79] - repo: https://github.com/PyCQA/flake8 - rev: 4.0.1 + rev: 5.0.4 hooks: - id: flake8 - repo: https://github.com/asottile/reorder_python_imports - rev: v2.7.1 + rev: v3.8.2 hooks: - id: reorder-python-imports args: [--application-directories, '.:src', --py36-plus] - repo: https://github.com/asottile/pyupgrade - rev: v2.31.0 + rev: v2.37.3 hooks: - id: pyupgrade args: [--py36-plus] - repo: https://github.com/asottile/add-trailing-comma - rev: v2.2.1 + rev: v2.2.3 hooks: - id: add-trailing-comma args: [--py36-plus] -- repo: https://gitlab.com/iamlikeme/nbhooks - rev: 1.0.0 - hooks: - - id: nb-ensure-clean - args: [--meta, ExecuteTime] +- repo: https://github.com/kynan/nbstripout + rev: 0.6.0 + hooks: + - id: nbstripout -- GitLab From 24d2182ee52c864b28c98f9edfc83e75c8d31852 Mon Sep 17 00:00:00 2001 From: jimenezd <david.doblas-jimenez@xfel.eu> Date: Thu, 18 Aug 2022 17:50:38 +0200 Subject: [PATCH 2/5] Fix import --- sed/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sed/core.py b/sed/core.py index d318f4c..aebe68d 100644 --- a/sed/core.py +++ b/sed/core.py @@ -10,9 +10,9 @@ import pandas as pd import psutil import xarray as xr -from .diagnostic import grid_histogram from sed.binning import bin_dataframe from sed.dfops import apply_jitter +from sed.diagnostics import grid_histogram from sed.metadata import MetaHandler from sed.settings import parse_config -- GitLab From 457e2bd60b7bb17e2cb9ddd69d24f35ffe5f1dbd Mon Sep 17 00:00:00 2001 From: jimenezd <david.doblas-jimenez@xfel.eu> Date: Fri, 19 Aug 2022 13:34:00 +0200 Subject: [PATCH 3/5] Reverting black update --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1832439..232f130 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,7 +12,7 @@ repos: - id: check-docstring-first - repo: https://github.com/psf/black - rev: 22.6.0 + rev: 22.3.0 hooks: - id: black args: [--line-length=79] -- GitLab From 8351cc4300c41e78c3fec7aac9eb0ab9569be22d Mon Sep 17 00:00:00 2001 From: jimenezd <david.doblas-jimenez@xfel.eu> Date: Fri, 19 Aug 2022 13:40:39 +0200 Subject: [PATCH 4/5] Revert .diagnostic import --- sed/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sed/core.py b/sed/core.py index aebe68d..58a315f 100644 --- a/sed/core.py +++ b/sed/core.py @@ -10,9 +10,9 @@ import pandas as pd import psutil import xarray as xr +from .diagnostics import grid_histogram from sed.binning import bin_dataframe from sed.dfops import apply_jitter -from sed.diagnostics import grid_histogram from sed.metadata import MetaHandler from sed.settings import parse_config -- GitLab From fab299853c192caf4b3213a91714dfd4cb321965 Mon Sep 17 00:00:00 2001 From: Steinn Ymir Agustsson <agustsson@phys.au.dk> Date: Fri, 19 Aug 2022 13:46:30 +0200 Subject: [PATCH 5/5] consistency fix --- sed/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sed/core.py b/sed/core.py index 58a315f..aebe68d 100644 --- a/sed/core.py +++ b/sed/core.py @@ -10,9 +10,9 @@ import pandas as pd import psutil import xarray as xr -from .diagnostics import grid_histogram from sed.binning import bin_dataframe from sed.dfops import apply_jitter +from sed.diagnostics import grid_histogram from sed.metadata import MetaHandler from sed.settings import parse_config -- GitLab