Merge tag '0.17.2'

Update version to 0.17.2 * tag '0.17.2': [skip ci] Update RST changelog Update CHANGELOG.md [skip ci] BF(TST): do proceed to proper test for error being caught for recent git-annex on windows with symlinks ENH(TST): travis - show git describe output to ensure that we did get tags etc BF(TST): adjust range for buggy git-annex version XFAIL test_runner_parametrized_protocol on python3.8 when getting duplicate output
datalad · Jul 18, 2022 · 88bae9f · 88bae9f
2 parents 90b2f6e + 22b2688
commit 88bae9f
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 22 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -204,6 +204,8 @@ before_install:
       PYTEST_OPTS=( "${PYTEST_OPTS[@]}" --doctest-modules --durations=0 --durations-min=5 --fail-slow 30 );
       export DATALAD_TESTS_SETUP_TESTREPOS=1;
     fi
+  # Show git describe output to ensure that we did fetch all the tags etc
+  - git describe
   # Just in case we need to check if nfs is there etc
   - sudo lsmod
   # The ultimate one-liner setup for NeuroDebian repository

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,21 @@
+# 0.17.2 (Sat Jul 16 2022)
+
+#### 🐛 Bug Fix
+
+- BF(TST): do proceed to proper test for error being caught for recent git-annex on windows with symlinks [#6850](https://github.com/datalad/datalad/pull/6850) ([@yarikoptic](https://github.com/yarikoptic))
+- Addressing problem testing against python 3.10 on Travis (skip more annex versions) [#6842](https://github.com/datalad/datalad/pull/6842) ([@yarikoptic](https://github.com/yarikoptic))
+- XFAIL test_runner_parametrized_protocol on python3.8 when getting duplicate output [#6837](https://github.com/datalad/datalad/pull/6837) ([@yarikoptic](https://github.com/yarikoptic))
+- BF: Make create's check for procedures work with several again [#6841](https://github.com/datalad/datalad/pull/6841) ([@adswa](https://github.com/adswa))
+- Support older pytests [#6836](https://github.com/datalad/datalad/pull/6836) ([@jwodder](https://github.com/jwodder))
+
+#### Authors: 3
+
+- Adina Wagner ([@adswa](https://github.com/adswa))
+- John T. Wodder II ([@jwodder](https://github.com/jwodder))
+- Yaroslav Halchenko ([@yarikoptic](https://github.com/yarikoptic))
+
+---
+
 # 0.17.1 (Mon Jul 11 2022)
 
 #### 🐛 Bug Fix

diff --git a/datalad/core/local/tests/test_status.py b/datalad/core/local/tests/test_status.py
@@ -297,9 +297,11 @@ def call():
         return ds.status(path=[bar_f], annex="availability",
                          on_failure="ignore", result_renderer='disabled')
 
-    if ds.repo.git_annex_version < "8.20200522" or on_windows:
-        # TODO: on windows even with a recent annex -- no CommandError is
-        # raised, TODO
+    if ds.repo.git_annex_version < "8.20200522" \
+        or (on_windows and ds.repo.git_annex_version < "10.20220525"):
+        # version for windows is an approx guess, but stopped happening
+        # somewhere around 10.20220505-g3b83224e5 may be.
+        # see https://github.com/datalad/datalad/issues/6849
         assert_result_count(call(), 0)
     elif ds.repo.git_annex_version < '10.20220222':
         # As of 2a8fdfc7d (Display a warning message when asked to operate on a

diff --git a/datalad/local/tests/test_add_archive_content.py b/datalad/local/tests/test_add_archive_content.py
@@ -518,7 +518,7 @@ def test_add_delete(self):
     # git-annex regression
     # https://git-annex.branchable.com/bugs/regression__58___annex_add_of_moved_file_errors_out/
     @skip_if(
-        '10.20220624' <= external_versions['cmd:annex'] < '10.20220706',  # approx when was fixed
+        '10.20220525' <= external_versions['cmd:annex'] < '10.20220706',  # approx when was fixed
         msg="buggy git-annex release"
     )
     def test_add_archive_leading_dir(self):

diff --git a/datalad/runner/tests/test_witless_runner.py b/datalad/runner/tests/test_witless_runner.py
@@ -199,7 +199,13 @@ def pipe_data_received(self, fd, data):
         # value passed to protocol constructor
         value=b'5',
     )
-    eq_(res['stdout'], '5')
+    try:
+        eq_(res['stdout'], '5')
+    except AssertionError:
+        # TODO: remove when dropping support for python3.8
+        if res['stdout'] == '55' and sys.version_info[:2] == (3, 8):
+            pytest.xfail("got 55 and not 5, see https://github.com/datalad/datalad/issues/4921")
+        raise
 
 
 @integration  # ~3 sec

diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -2,9 +2,45 @@
 
 Change log
 **********
+0.17.2 (Sat Jul 16 2022)
+========================
+
+Bug Fix
+-------
+
+-  BF(TST): do proceed to proper test for error being caught for recent
+   git-annex on windows with symlinks
+   `#6850 <https://github.com/datalad/datalad/pull/6850>`__
+   (`@yarikoptic <https://github.com/yarikoptic>`__)
+-  Addressing problem testing against python 3.10 on Travis (skip more
+   annex versions)
+   `#6842 <https://github.com/datalad/datalad/pull/6842>`__
+   (`@yarikoptic <https://github.com/yarikoptic>`__)
+-  XFAIL test_runner_parametrized_protocol on python3.8 when getting
+   duplicate output
+   `#6837 <https://github.com/datalad/datalad/pull/6837>`__
+   (`@yarikoptic <https://github.com/yarikoptic>`__)
+-  BF: Make create’s check for procedures work with several again
+   `#6841 <https://github.com/datalad/datalad/pull/6841>`__
+   (`@adswa <https://github.com/adswa>`__)
+-  Support older pytests
+   `#6836 <https://github.com/datalad/datalad/pull/6836>`__
+   (`@jwodder <https://github.com/jwodder>`__)
+
+Authors: 3
+----------
+
+-  Adina Wagner (`@adswa <https://github.com/adswa>`__)
+-  John T. Wodder II (`@jwodder <https://github.com/jwodder>`__)
+-  Yaroslav Halchenko (`@yarikoptic <https://github.com/yarikoptic>`__)
+
+--------------
+
 0.17.1 (Mon Jul 11 2022)
 ========================
 
+.. _bug-fix-1:
+
 Bug Fix
 -------
 
@@ -38,6 +74,8 @@ Bug Fix
    `#6808 <https://github.com/datalad/datalad/pull/6808>`__
    (`@yarikoptic <https://github.com/yarikoptic>`__)
 
+.. _authors-3-1:
+
 Authors: 3
 ----------
 
@@ -181,7 +219,7 @@ Authors: 7
 0.16.7 (Wed Jul 06 2022)
 ========================
 
-.. _bug-fix-1:
+.. _bug-fix-2:
 
 Bug Fix
 -------
@@ -239,7 +277,7 @@ Authors: 5
 0.16.6 (Tue Jun 14 2022)
 ========================
 
-.. _bug-fix-2:
+.. _bug-fix-3:
 
 Bug Fix
 -------
@@ -268,7 +306,7 @@ Authors: 2
 0.16.5 (Wed Jun 08 2022)
 ========================
 
-.. _bug-fix-3:
+.. _bug-fix-4:
 
 Bug Fix
 -------
@@ -292,7 +330,7 @@ Authors: 1
 0.16.4 (Thu Jun 02 2022)
 ========================
 
-.. _bug-fix-4:
+.. _bug-fix-5:
 
 Bug Fix
 -------
@@ -321,7 +359,7 @@ Bug Fix
    `#6725 <https://github.com/datalad/datalad/pull/6725>`__
    (`@adswa <https://github.com/adswa>`__)
 
-.. _authors-3-1:
+.. _authors-3-2:
 
 Authors: 3
 ----------
@@ -335,7 +373,7 @@ Authors: 3
 0.16.3 (Thu May 12 2022)
 ========================
 
-.. _bug-fix-5:
+.. _bug-fix-6:
 
 Bug Fix
 -------
@@ -386,7 +424,7 @@ Authors: 4
 0.16.2 (Thu Apr 21 2022)
 ========================
 
-.. _bug-fix-6:
+.. _bug-fix-7:
 
 Bug Fix
 -------
@@ -1129,7 +1167,7 @@ Authors: 11
 0.15.6 (Sun Feb 27 2022)
 ========================
 
-.. _bug-fix-7:
+.. _bug-fix-8:
 
 Bug Fix
 -------
@@ -1166,7 +1204,7 @@ Enhancement
    `#6364 <https://github.com/datalad/datalad/pull/6364>`__
    (`@adswa <https://github.com/adswa>`__)
 
-.. _bug-fix-8:
+.. _bug-fix-9:
 
 Bug Fix
 -------
@@ -1217,7 +1255,7 @@ Authors: 5
 0.15.4 (Thu Dec 16 2021)
 ========================
 
-.. _bug-fix-9:
+.. _bug-fix-10:
 
 Bug Fix
 -------
@@ -1302,7 +1340,7 @@ Authors: 6
 0.15.3 (Sat Oct 30 2021)
 ========================
 
-.. _bug-fix-10:
+.. _bug-fix-11:
 
 Bug Fix
 -------
@@ -1408,7 +1446,7 @@ Authors: 7
 0.15.2 (Wed Oct 06 2021)
 ========================
 
-.. _bug-fix-11:
+.. _bug-fix-12:
 
 Bug Fix
 -------
@@ -1475,7 +1513,7 @@ Authors: 5
 0.15.1 (Fri Sep 24 2021)
 ========================
 
-.. _bug-fix-12:
+.. _bug-fix-13:
 
 Bug Fix
 -------
@@ -1530,7 +1568,7 @@ Tests
    `#5986 <https://github.com/datalad/datalad/pull/5986>`__
    (`@yarikoptic <https://github.com/yarikoptic>`__)
 
-.. _authors-3-2:
+.. _authors-3-3:
 
 Authors: 3
 ----------
@@ -1890,7 +1928,7 @@ Tests
 0.14.8 (Sun Sep 12 2021)
 ========================
 
-.. _bug-fix-13:
+.. _bug-fix-14:
 
 Bug Fix
 -------
@@ -1998,7 +2036,7 @@ Authors: 4
 0.14.7 (Tue Aug 03 2021)
 ========================
 
-.. _bug-fix-14:
+.. _bug-fix-15:
 
 Bug Fix
 -------
@@ -2100,7 +2138,7 @@ Authors: 2
 0.14.5 (Mon Jun 21 2021)
 ========================
 
-.. _bug-fix-15:
+.. _bug-fix-16:
 
 Bug Fix
 -------