Bug#985782: unblock: cif2cell/2.0.0a1+dfsg-4

2021-03-26 Thread Andrius Merkys
On 2021-03-25 22:05, Ivo De Decker wrote:
> On Tue, Mar 23, 2021 at 02:48:01PM +0200, Andrius Merkys wrote:
>> I am seeking unblocking of cif2cell/2.0.0a1+dfsg-4.
> The deadline for packages that are not testing has passed. Sorry.

I see. Thank you for information, and sorry for the noise.

Best,
Andrius



Bug#985782: unblock: cif2cell/2.0.0a1+dfsg-4

2021-03-23 Thread Andrius Merkys
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Dear release-team,

I am seeking unblocking of cif2cell/2.0.0a1+dfsg-4.

[ Reason ]
cif2cell/2.0.0a1+dfsg-4 was affected by RC bug #975215 (FTBFS with
Python 3.9), therefore it got removed from testing. The
upstream-provided fix is simple and focused solely on adapting to the
API which has changed in Python 3.9.

[ Impact ]
Without the fix, cif2cell will not get into bullseye. It is a leaf
package though.

[ Tests ]
* Built on clean sid chroot;
* Upstream test suite passes.

[ Risks ]
cif2cell is a leaf package, thus having it in bullseye should not affect
anything negatively.

[ Checklist ]
  [*] all changes are documented in the d/changelog
  [*] I reviewed all changes and I approve them
  [*] attach debdiff against the package in testing

unblock cif2cell/2.0.0a1+dfsg-4

Best,
Andrius
diff -Nru cif2cell-2.0.0a1+dfsg/debian/changelog 
cif2cell-2.0.0a1+dfsg/debian/changelog
--- cif2cell-2.0.0a1+dfsg/debian/changelog  2020-09-10 07:10:15.0 
-0400
+++ cif2cell-2.0.0a1+dfsg/debian/changelog  2021-03-03 06:29:19.0 
-0500
@@ -1,3 +1,10 @@
+cif2cell (2.0.0a1+dfsg-4) unstable; urgency=medium
+
+  * Applying upstream changes as a patch to fix FTBFS with Python 3.9
+(Closes: #975215)
+
+ -- Andrius Merkys   Wed, 03 Mar 2021 06:29:19 -0500
+
 cif2cell (2.0.0a1+dfsg-3) unstable; urgency=medium
 
   * Making build reproducible (Closes: #970024). Thanks Chris Lamb.
diff -Nru cif2cell-2.0.0a1+dfsg/debian/patches/23.patch 
cif2cell-2.0.0a1+dfsg/debian/patches/23.patch
--- cif2cell-2.0.0a1+dfsg/debian/patches/23.patch   1969-12-31 
19:00:00.0 -0500
+++ cif2cell-2.0.0a1+dfsg/debian/patches/23.patch   2021-03-03 
06:29:19.0 -0500
@@ -0,0 +1,48 @@
+From 9c7f1e1335c5a38a1acf28186ca406a51df954d4 Mon Sep 17 00:00:00 2001
+From: Leopold Talirz 
+Date: Wed, 3 Mar 2021 12:16:38 +0100
+Subject: [PATCH 2/2] fix: gcd moved from 'fractions' to 'math'
+
+Also make sure that the input of gcd are actually integers.
+---
+ README.md| 2 +-
+ cif2cell/uctools.py  | 6 +++---
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+--- a/README.md
 b/README.md
+@@ -1,4 +1,4 @@
+-[![Build 
Status](https://travis-ci.org/torbjornbjorkman/cif2cell.svg?branch=master)](https://travis-ci.org/torbjornbjorkman/cif2cell)
++[![Build 
Status](https://github.com/torbjornbjorkman/cif2cell/workflows/ci/badge.svg)](https://github.com/torbjornbjorkman/cif2cell/actions)
+ 
+ A tool to generate the geometrical setup for various electronic
+ structure codes from a CIF (Crystallographic Information
+--- a/cif2cell/uctools.py
 b/cif2cell/uctools.py
+@@ -38,7 +38,7 @@
+ from math import sin,cos,pi,sqrt,pow,ceil,floor
+ from cif2cell.utils import *
+ from random import random, gauss
+-from fractions import gcd
++from math import gcd
+ from cif2cell.spacegroupdata import *
+ from cif2cell.elementdata import *
+ import six
+@@ -755,7 +755,7 @@
+ self.ChemicalComposition[k] = v
+ if not self.alloy:
+ L = list(self.ChemicalComposition.values())
+-divisor = reduce(gcd,L)
++divisor = reduce(gcd, map(int, L))
+ for k,v in self.ChemicalComposition.items():
+ self.ChemicalComposition[k] = v/divisor
+ # Number of atoms
+@@ -1723,7 +1723,7 @@
+ self.ChemicalComposition[e] = n
+ if not alloy:
+ L = list(self.ChemicalComposition.values())
+-divisor = reduce(gcd,L)
++divisor = reduce(gcd, map(int, L))
+ for k,v in self.ChemicalComposition.items():
+ self.ChemicalComposition[k] = v/divisor
+ except:
diff -Nru cif2cell-2.0.0a1+dfsg/debian/patches/series 
cif2cell-2.0.0a1+dfsg/debian/patches/series
--- cif2cell-2.0.0a1+dfsg/debian/patches/series 2020-09-10 07:10:15.0 
-0400
+++ cif2cell-2.0.0a1+dfsg/debian/patches/series 2021-03-03 06:29:19.0 
-0500
@@ -1,3 +1,4 @@
 shebang.patch
 tests.patch
 reproducible-build.patch
+23.patch