Your message dated Mon, 22 Nov 2021 14:40:38 +0000
with message-id <[email protected]>
and subject line Bug#1000326: fixed in xrstools 0.15.0+git20210910+c147919d-2
has caused the Debian Bug report #1000326,
regarding xrstools: please make the build reproducible
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
1000326: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1000326
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: xrstools
Version: 0.15.0+git20210910+c147919d-1
Severity: wishlist
Tags: patch
User: [email protected]
Usertags: timestamps
X-Debbugs-Cc: [email protected]
Hi,
Whilst working on the Reproducible Builds effort [0] we noticed that
xrstools could not be built reproducibly.
This was caused by a default keyword argument in the documentation
which contained an absolute/full pathname.
Patch attached that uses the "if-blah-is-none-blah-equals" Python
idiom.
[0] https://reproducible-builds.org/
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` [email protected] / chris-lamb.co.uk
`-
--- a/debian/patches/reproducible_build.patch 1969-12-31 16:00:00.000000000
-0800
--- b/debian/patches/reproducible_build.patch 2021-11-21 09:08:37.210875808
-0800
@@ -0,0 +1,18 @@
+Description: Make the build reproducible
+Author: Chris Lamb <[email protected]>
+Last-Update: 2021-11-21
+
+--- xrstools-0.15.0+git20210910+c147919d.orig/XRStools/xrs_utilities.py
++++ xrstools-0.15.0+git20210910+c147919d/XRStools/xrs_utilities.py
+@@ -447,8 +447,9 @@ class bragg_refl:
+ np.sqrt(eta**2 - 1))**2
+ return reflectivity_curve, theta_B*180/np.pi, theta_B_correction
+
+- def get_nff(self,
+- nff_path = os.path.join(data_installation_dir,'atomic_form_factors')):
++ def get_nff(self, nff_path=None):
++ if nff_path is None:
++ nff_path =
os.path.join(data_installation_dir,'atomic_form_factors')
+ fname = os.path.join(nff_path, self.crystal.lower()+'.nff')
+ table = np.loadtxt(fname, unpack = True, skiprows = 1)
+ table = np.transpose(table)
--- a/debian/patches/series 2021-11-21 08:56:13.288748075 -0800
--- b/debian/patches/series 2021-11-21 09:08:36.378870580 -0800
@@ -1,2 +1,3 @@
remove_xrs_wizard_pyqt4.patch
fix_python_syntax_error.patch
+reproducible_build.patch
--- End Message ---
--- Begin Message ---
Source: xrstools
Source-Version: 0.15.0+git20210910+c147919d-2
Done: Neil Williams <[email protected]>
We believe that the bug you reported is fixed in the latest version of
xrstools, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Neil Williams <[email protected]> (supplier of updated xrstools package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Mon, 22 Nov 2021 09:04:05 +0000
Source: xrstools
Architecture: source
Version: 0.15.0+git20210910+c147919d-2
Distribution: unstable
Urgency: medium
Maintainer: Debian Science Maintainers
<[email protected]>
Changed-By: Neil Williams <[email protected]>
Closes: 1000326
Changes:
xrstools (0.15.0+git20210910+c147919d-2) unstable; urgency=medium
.
* Source-only upload, restricting the binaries to amd64 only.
Not compatible with 32bit architectures & relies on SSE2 support.
* Apply reproducibility patch for xrs_utilities.py - Thanks Chris Lamb.
(Closes: #1000326)
* Apply multiarch hint
Checksums-Sha1:
06b3911ad542e47c9037a586fe4e59b01442e0f4 2519
xrstools_0.15.0+git20210910+c147919d-2.dsc
4415f84d5a935f4f35a76f48d837154a736a0352 5496
xrstools_0.15.0+git20210910+c147919d-2.debian.tar.xz
e7e217fcc5df15b66a50c67339ecde294b803414 16934
xrstools_0.15.0+git20210910+c147919d-2_amd64.buildinfo
Checksums-Sha256:
e9d519c9b87d3c4bc9c87e72c5d6848cf9402495dc6dec02b602063d4cfa4ef4 2519
xrstools_0.15.0+git20210910+c147919d-2.dsc
b5d961bc97fe344f9fb5bbebaed348813410bcac7dc3c4cf255a33cb03a0203b 5496
xrstools_0.15.0+git20210910+c147919d-2.debian.tar.xz
f31fb8e514b327a35384673088f6861a2743ade896ee4e8f805eadd16f0584dc 16934
xrstools_0.15.0+git20210910+c147919d-2_amd64.buildinfo
Files:
a7ec277fd0579d9c9eca50a5c39520de 2519 science optional
xrstools_0.15.0+git20210910+c147919d-2.dsc
525951d628d001026f8fb6d1bff0b8d2 5496 science optional
xrstools_0.15.0+git20210910+c147919d-2.debian.tar.xz
3b9aa3f0b7f717b2ead412aa2662a643 16934 science optional
xrstools_0.15.0+git20210910+c147919d-2_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEf3HB6ceOc10DYMbM8WfkPIFDtoIFAmGboiAACgkQ8WfkPIFD
toKJPA/+M4yBdnQlMIvFeSCKEi8fHV9UftwA+CDsQnNF11uZgkjTO+cEGYz32Kuh
SHMYMCKsE9NFzUdwU9hBoYz2jJHKL8NLPxwF0Ja8ccJeTlf5JuuUZemZALWDhluu
uHGkCRSsTXq/Z6i7dV2IC/e2eakHxg1NDC3bNbpjfb1oJgcx6sntY7LqY2lEC7n9
qLr7kiQEGrRCOUPLd5X+MiEZeCnpdlR7tqJQDJayAB8URKO3jdPCrY56FUK0eD1Q
LwzXkHWg3939fDVHM27iJoVeesu4uXxw+6KHFHrYfZV+g2Rmoz2VUljt2PX0oI6i
2ZJfweV5K88d9a40f9axDR+4iVqCgIx11+3x1szsq01NjsdyEPcvQut7BKiY4yh3
FOylj+0v6Nyd3gbhWgTmI4mlQ+PfZVm30qjmespv7RNv/Z8z5/I1zA66CeUYoI5Z
h9rVtHOiZBbF8jXZSvttgmC7YDdvPVZzB2EdCks7vLJFE/rqfzQdzvTgyS9LgEM4
EeseopmRa5k4g9ETxBXSazHv08kypvEDQ/06fuEJe8FusZ9WXUL/PDmZnkP6/NY8
gzjZG1YSMaxBMPeyZ+AIwQDzCv3jQTLogh6Onu6lXIRCUmAB1QpuLRVW2y/uHBTz
Wk6nKfZxvsEeCFGQUYUU9/CFh/u8guQEYS24rc0RJBKaHuGYRa8=
=rCwf
-----END PGP SIGNATURE-----
--- End Message ---
