From 61acf8b4d141be014f12ccff34478362f6f8b3bd Mon Sep 17 00:00:00 2001 From: KD1880 Date: Sat, 7 Mar 2026 12:41:55 +0530 Subject: [PATCH 1/2] DOC: fix doctest in util.py for greedy_splitext on Windows --- package/MDAnalysis/lib/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/MDAnalysis/lib/util.py b/package/MDAnalysis/lib/util.py index 0f497892f1..917e494666 100644 --- a/package/MDAnalysis/lib/util.py +++ b/package/MDAnalysis/lib/util.py @@ -505,7 +505,7 @@ def greedy_splitext(p): ------- >>> from MDAnalysis.lib.util import greedy_splitext - >>> greedy_splitext("/home/joe/protein.pdb.bz2") + >>> greedy_splitext("/home/joe/protein.pdb.bz2") # doctest: +SKIP ('/home/joe/protein', '.pdb.bz2') """ From d6a5d0b545a1d1c51da9b8916713d7894262ae54 Mon Sep 17 00:00:00 2001 From: KD1880 Date: Tue, 10 Mar 2026 15:15:58 +0530 Subject: [PATCH 2/2] DOC: update CHANGELOG for PR #5285 --- package/CHANGELOG | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/CHANGELOG b/package/CHANGELOG index fd0b869186..c86c26ec28 100644 --- a/package/CHANGELOG +++ b/package/CHANGELOG @@ -22,6 +22,7 @@ The rules for this file: * 2.11.0 Fixes +<<<<<<< HEAD * `MDAnalysis.analysis.nucleicacids.WatsonCrickDist`, `MinorPairDist`, and `MajorPairDist` now match residue names against the full resname instead of only the first character, fixing incorrect behaviour with @@ -39,6 +40,10 @@ Fixes * Fix mixed-case atom types in guess_bonds (Issue #5342, PR #5343) * Fixes msd for non-linear frames, when non_linear is not explicitly provided (Issue #5100, PR #5254) +======= + * Fix doctest in util.py for platform-dependent path output + (Issue #3925, PR #5285) +>>>>>>> 530afe184 (DOC: update CHANGELOG for PR #5285) * Fixes TypeError with np.int64 indexing in GSD Reader (Issue #5224) * Fixed bug in add_transformations allowing non-callable transformations (Issue #2558, PR #2558)