[xmds2] 06/08: d/p/indexing-with-scalars.patch: Drop patch (applied upstream)
Rafael Laboissiere
rafael at debian.org
Fri Feb 3 22:46:52 UTC 2017
This is an automated email from the git hooks/post-receive script.
rafael pushed a commit to branch master
in repository xmds2.
commit db33938c739bd535368aa6c1c3dfda3109a52fab
Author: Rafael Laboissiere <rafael at debian.org>
Date: Fri Feb 3 16:30:12 2017 -0200
d/p/indexing-with-scalars.patch: Drop patch (applied upstream)
---
debian/patches/indexing-with-scalars.patch | 17 -----------------
debian/patches/series | 1 -
2 files changed, 18 deletions(-)
diff --git a/debian/patches/indexing-with-scalars.patch b/debian/patches/indexing-with-scalars.patch
deleted file mode 100644
index e4af097..0000000
--- a/debian/patches/indexing-with-scalars.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Insures that index values in reshape() are integers
- This prevents TypeErrors with NumPy 1.12.0.
-Author: Rafael Laboissiere <rafael at debian.org>
-Forwarded: https://sourceforge.net/p/xmds/mailman/message/35605494/
-Last-Update: 2017-01-15
-
---- xmds2-2.2.2+dfsg.orig/xpdeint/XSILFile.py
-+++ xmds2-2.2.2+dfsg/xpdeint/XSILFile.py
-@@ -117,7 +117,7 @@ class XSILDataBinary(XSILData):
-
- for independentVariable in self.independentVariables:
- size = numpy.fromfile(fd, dtype=ulongDType, count=1)
-- independentGeometry.append(size)
-+ independentGeometry.append(numpy.asscalar(size))
- assert size == independentVariable['length']
- a = numpy.fromfile(fd, dtype=floatDType, count=size)
- independentVariable['array'] = a
diff --git a/debian/patches/series b/debian/patches/series
index b059d54..cadaff9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
revision-number-as-deb-pkg.patch
-indexing-with-scalars.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/xmds2.git
More information about the debian-science-commits
mailing list