From 04a87a568e318a847e57b3376d6df1fde709e464 Mon Sep 17 00:00:00 2001 From: Rocco Meli Date: Sun, 29 Dec 2024 23:35:16 +0100 Subject: [PATCH 1/7] blame --- .git-blame-ignore-revs | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index d40a8a87bd9..ee6d9041259 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,24 @@ -# black -83e5f99051d86ca354b537be8854c40f9b6ce172 +#4725 +571431a169e5881f7d09930c4d7e633df0f2cd40 +#4726 +46be788d84a6cb149d90e4493a726c3a30b3cca0 +#4802 +441e2c67abdb8a0a5ffac4a0bc5e88bc7c329aa8 +#4804 +25e755fd78e0a6fb71a91c9d3d989328f021f34b +#4809 +557f27d658ff0d4011bbe0efa03495f18aa2c1ce +#4848 +b710e57a64654bed5250eb771f0f27a2dddfeebf +#4850 +9110a6efe2765802856d028e650ebb0117d336bf +#4851 +a10e23e681023f383baac7582c39dce4180e2263 +#4856 +c08cb797fd1a2cb45bc0b9e4522cabb15d1f36bd +#4857 +29deccc9b43a09d2ec3b456bb9c70aae4c34c2cd +#4859 +9312fa67f163ec055a66f5756a182206fbea3130 +#4861 +55cce24003d4c0975b1bba387b9e6ac20638780e From 55ce5cf989cbcdb1e5320f511c902cfa77c6d446 Mon Sep 17 00:00:00 2001 From: Rocco Meli Date: Wed, 8 Jan 2025 22:16:31 +0100 Subject: [PATCH 2/7] update --- .git-blame-ignore-revs | 4 +++ maintainer/active_files_package.lst | 44 --------------------------- maintainer/active_files_testsuite.lst | 21 ------------- package/CHANGELOG | 5 +-- 4 files changed, 7 insertions(+), 67 deletions(-) delete mode 100644 maintainer/active_files_package.lst delete mode 100644 maintainer/active_files_testsuite.lst diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index ee6d9041259..3177946715f 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -22,3 +22,7 @@ c08cb797fd1a2cb45bc0b9e4522cabb15d1f36bd 9312fa67f163ec055a66f5756a182206fbea3130 #4861 55cce24003d4c0975b1bba387b9e6ac20638780e +#4874 +5eef34165b03281515e08a69159f6504e3a2ff8b +#4875 +b8fe34b73c9df9330c1608229b2f8cddc6e275b4 diff --git a/maintainer/active_files_package.lst b/maintainer/active_files_package.lst deleted file mode 100644 index a1889549c1e..00000000000 --- a/maintainer/active_files_package.lst +++ /dev/null @@ -1,44 +0,0 @@ -package/MDAnalysis/core/selection\.py -| package/MDAnalysis/analysis/atomicdistances\.py -| package/MDAnalysis/topology/CMSParser\.py -| package/MDAnalysis/topology/__init__\.py -| package/MDAnalysis/coordinates/XDR\.py -| package/MDAnalysis/core/selection\.py -| package/MDAnalysis/analysis/diffusionmap\.py -| package/MDAnalysis/analysis/align\.py -| package/MDAnalysis/lib/_distopia\.py -| package/MDAnalysis/lib/distances\.py -| package/MDAnalysis/analysis/dasktimeseries\.py -| package/MDAnalysis/coordinates/H5MD\.py -| package/MDAnalysis/coordinates/MMCIF\.py -| package/MDAnalysis/coordinates/__init__\.py -| package/MDAnalysis/topology/MMCIFParser\.py -| package/MDAnalysis/topology/PDBParser\.py -| package/MDAnalysis/topology/__init__\.py -| package/MDAnalysis/topology/tpr/utils\.py -| package/MDAnalysis/coordinates/CIF\.py -| package/MDAnalysis/coordinates/PDBx\.py -| package/MDAnalysis/coordinates/__init__\.py -| package/MDAnalysis/topology/PDBxParser\.py -| package/MDAnalysis/topology/__init__\.py -| package/MDAnalysis/coordinates/base\.py -| package/MDAnalysis/core/universe\.py -| package/MDAnalysis/topology/base\.py -| package/MDAnalysis/analysis/hydrogenbonds/hbond_analysis\.py -| package/MDAnalysis/analysis/sasa\.py -| package/MDAnalysis/coordinates/DCD\.py -| package/MDAnalysis/coordinates/DLPoly\.py -| package/MDAnalysis/coordinates/GMS\.py -| package/MDAnalysis/coordinates/MOL2\.py -| package/MDAnalysis/coordinates/PDB\.py -| package/MDAnalysis/coordinates/TRJ\.py -| package/MDAnalysis/coordinates/TRR\.py -| package/MDAnalysis/coordinates/TRZ\.py -| package/MDAnalysis/coordinates/TXYZ\.py -| package/MDAnalysis/coordinates/XTC\.py -| package/MDAnalysis/coordinates/XYZ\.py -| package/MDAnalysis/coordinates/base\.py -| package/MDAnalysis/coordinates/chain\.py -| package/MDAnalysis/coordinates/chemfiles\.py -| package/MDAnalysis/coordinates/memory\.py -| package/MDAnalysis/core/universe\.py diff --git a/maintainer/active_files_testsuite.lst b/maintainer/active_files_testsuite.lst deleted file mode 100644 index 4898eafde48..00000000000 --- a/maintainer/active_files_testsuite.lst +++ /dev/null @@ -1,21 +0,0 @@ -testsuite/MDAnalysisTests/core/test_atomselections\.py -| testsuite/MDAnalysisTests/analysis/test_atomicdistances\.py -| testsuite/MDAnalysisTests/coordinates/test_xdr\.py -| testsuite/MDAnalysisTests/core/test_atomselections\.py -| testsuite/MDAnalysisTests/datafiles\.py -| testsuite/MDAnalysisTests/analysis/conftest\.py -| testsuite/MDAnalysisTests/analysis/test_diffusionmap\.py -| testsuite/MDAnalysisTests/analysis/conftest\.py -| testsuite/MDAnalysisTests/analysis/test_align\.py -| testsuite/MDAnalysisTests/lib/test_distances\.py -| testsuite/MDAnalysisTests/coordinates/test_mmcif\.py -| testsuite/MDAnalysisTests/datafiles\.py -| testsuite/MDAnalysisTests/topology/test_mmcif\.py -| testsuite/MDAnalysisTests/coordinates/test_cif\.py -| testsuite/MDAnalysisTests/analysis/test_encore\.py -| testsuite/MDAnalysisTests/parallelism/test_multiprocessing\.py -| testsuite/MDAnalysisTests/coordinates/base\.py -| testsuite/MDAnalysisTests/coordinates/test_gro\.py -| testsuite/MDAnalysisTests/topology/base\.py -| testsuite/MDAnalysisTests/analysis/test_hydrogenbonds_analysis\.py -| testsuite/MDAnalysisTests/analysis/test_sasa\.py diff --git a/package/CHANGELOG b/package/CHANGELOG index 5d8328f3313..32a7374ff6b 100644 --- a/package/CHANGELOG +++ b/package/CHANGELOG @@ -14,8 +14,8 @@ The rules for this file: ------------------------------------------------------------------------------- -??/??/?? IAlibay, ChiahsinChu, RMeli, tanishy7777, talagayev, - tylerjereddy +??/??/?? IAlibay, ChiahsinChu, RMeli, tanishy7777, talagayev, tylerjereddy, + marinegor * 2.9.0 @@ -36,6 +36,7 @@ Enhancements Changes + * Codebase is now formatted with black (version `24`) (PR #4886) Deprecations From d1778d167f7bbca78c9ac125cf1638d717140b48 Mon Sep 17 00:00:00 2001 From: Rocco Meli Date: Wed, 8 Jan 2025 22:47:17 +0100 Subject: [PATCH 3/7] add more context --- .git-blame-ignore-revs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 3177946715f..d88e84c0b16 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,3 +1,14 @@ +##### git-blame show what revision and author last modified each line of a file +##### .git-blame-ignore-revs file is used to ignore certain revisions from being +##### shown in the output of git blame (also on GitHub blame view). +# +# ~~~ Commits that only change the formatting of the code should be ignored. ~~~ +# +# --- Automated Formatting with `black` --- +# MDAnalysis was automatically formatted with `black` (end of 2024, beginning of 2025). +# Formatting PRs (should) contain "[fmt]" in the title (and so do the related commit). +# See https://github.com/MDAnalysis/mdanalysis/issues/2450 for more details. +# The following commits are squash commits that contain only formatting changes. #4725 571431a169e5881f7d09930c4d7e633df0f2cd40 #4726 From 84e1fdbf20d032542644c5c74ba0047150fcad21 Mon Sep 17 00:00:00 2001 From: Rocco Meli Date: Wed, 8 Jan 2025 22:58:38 +0100 Subject: [PATCH 4/7] Update .git-blame-ignore-revs --- .git-blame-ignore-revs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index d88e84c0b16..7c5bec6a43d 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,5 +1,5 @@ -##### git-blame show what revision and author last modified each line of a file -##### .git-blame-ignore-revs file is used to ignore certain revisions from being +##### git-blame shows what revision and author last modified each line of a file +##### The ".git-blame-ignore-revs" file is used to ignore certain revisions from being ##### shown in the output of git blame (also on GitHub blame view). # # ~~~ Commits that only change the formatting of the code should be ignored. ~~~ From 9c6f63c79f9a6cd6d3cb29ad653b53d8e5f498df Mon Sep 17 00:00:00 2001 From: Rocco Meli Date: Wed, 8 Jan 2025 22:59:09 +0100 Subject: [PATCH 5/7] Update .git-blame-ignore-revs --- .git-blame-ignore-revs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 7c5bec6a43d..7a7a4912e43 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -6,7 +6,7 @@ # # --- Automated Formatting with `black` --- # MDAnalysis was automatically formatted with `black` (end of 2024, beginning of 2025). -# Formatting PRs (should) contain "[fmt]" in the title (and so do the related commit). +# Formatting PRs (should) contain "[fmt]" in the title (and so do the related commits). # See https://github.com/MDAnalysis/mdanalysis/issues/2450 for more details. # The following commits are squash commits that contain only formatting changes. #4725 From 0eb9b83cbed9c52ea79c148ab51fe844837050c1 Mon Sep 17 00:00:00 2001 From: Rocco Meli Date: Wed, 8 Jan 2025 23:00:38 +0100 Subject: [PATCH 6/7] Update .git-blame-ignore-revs --- .git-blame-ignore-revs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 7a7a4912e43..ad2e7229a91 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -8,7 +8,9 @@ # MDAnalysis was automatically formatted with `black` (end of 2024, beginning of 2025). # Formatting PRs (should) contain "[fmt]" in the title (and so do the related commits). # See https://github.com/MDAnalysis/mdanalysis/issues/2450 for more details. -# The following commits are squash commits that contain only formatting changes. +# The following commits are squash commits that contain only^ formatting changes. +# ^ This is not strictly true. See PRs for the nitty gritty details. +#. PR numbers are listed just above the commit being ignored. #4725 571431a169e5881f7d09930c4d7e633df0f2cd40 #4726 From 94396c3f180cbda0d3cf7ffc89d67bf5b036412e Mon Sep 17 00:00:00 2001 From: Rocco Meli Date: Wed, 8 Jan 2025 23:10:51 +0100 Subject: [PATCH 7/7] add pr --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index d88e84c0b16..5aff409e164 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -37,3 +37,5 @@ c08cb797fd1a2cb45bc0b9e4522cabb15d1f36bd 5eef34165b03281515e08a69159f6504e3a2ff8b #4875 b8fe34b73c9df9330c1608229b2f8cddc6e275b4 +#4885 +263bbe65047e535fbad981852ad9c7327826f93d