[Debian-med-packaging] Bug#1056123: bullseye-pu: package conda-package-handling/1.7.2-2+deb11u1

[Santiago Vila]

Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian.org at packages.debian.org
Usertags: pu
X-Debbugs-Cc: conda-package-handling at packages.debian.org, sanvila at debian.org
Control: affects -1 + src:conda-package-handling

[ Reason ]
This upload fixes Bug #976506: FTBFS due to flaky test.

Upstream added a time condition to skip the failing test,
but that just moved the problem to a future which has already arrived.

This upload removes the condition and skip the test without conditions,
as it was done already in unstable.

[ Impact ]
Anybody trying to build the package from source may get the error:

https://tests.reproducible-builds.org/debian/rb-pkg/bullseye/amd64/conda-package-handling.html

[ Tests ]
There are no code changes. I've verified that the package
now builds from source.

[ Risks ]
Very low. No code changes. Patch is trivial.

[ Checklist ]
   [X] *all* changes are documented in the d/changelog
   [X] I reviewed all changes and I approve them
   [X] attach debdiff against the package in (old)stable
   [X] the issue is verified as fixed in unstable

[ Changes ]
The attached patch is in git diff format, which is
a little bit clearer than debdiff because the existing
patch has been renamed.

[ Other info ]
The package is already uploaded.
-------------- next part --------------
diff --git a/debian/changelog b/debian/changelog
index 306c900..c06fada 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+conda-package-handling (1.7.2-2+deb11u1) bullseye; urgency=medium
+
+  * Team upload.
+  * Disable flaky test. Closes: #976506.
+
+ -- Santiago Vila <sanvila at debian.org>  Fri, 17 Nov 2023 11:30:00 +0100
+
 conda-package-handling (1.7.2-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/series b/debian/patches/series
index 3d1dca5..b36fda0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 fix_linking.patch
 fix_test.patch
 fix-out-dir.patch
-extend-test-datetime-to-dec-2021.patch
+skip-test-timeline.patch
diff --git a/debian/patches/extend-test-datetime-to-dec-2021.patch b/debian/patches/skip-test-timeline.patch
similarity index 71%
rename from debian/patches/extend-test-datetime-to-dec-2021.patch
rename to debian/patches/skip-test-timeline.patch
index 4b22288..78aee74 100644
--- a/debian/patches/extend-test-datetime-to-dec-2021.patch
+++ b/debian/patches/skip-test-timeline.patch
@@ -1,9 +1,10 @@
-Description: Extend datetime to Dec 1, 2021 in test_secure_refusal_to_extract_abs_paths to prevent failing tests in arm64.
+Description: Stop extending datetime in test_secure_refusal_to_extract_abs_paths to prevent failing tests in arm64.
 Upstream has confirmed this here: https://github.com/conda/conda-package-handling/issues/74#issuecomment-739349646
 Author: Nilesh Patra <npatra974 at gmail.com>
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=976506
 Forwarded: https://github.com/conda/conda-package-handling/pull/75
-Last-Update: 2020-12-06
+Last-Update: 2023-11-17
+
 --- a/tests/test_api.py
 +++ b/tests/test_api.py
 @@ -183,7 +183,7 @@
@@ -11,7 +12,7 @@ Last-Update: 2020-12-06
  
  
 - at pytest.mark.skipif(datetime.now() <= datetime(2020, 12, 1), reason="Don't understand why this doesn't behave.  Punt.")
-+ at pytest.mark.skipif(datetime.now() <= datetime(2021, 12, 1), reason="Don't understand why this doesn't behave.  Punt.")
++ at pytest.mark.skip(reason="Don't understand why this doesn't behave.  Punt.")
  def test_secure_refusal_to_extract_abs_paths(testing_workdir):
      with tarfile.open('pinkie.tar.bz2', 'w:bz2') as tf:
          open('thebrain', 'w').close()