Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/nmrglue/files/, sci-chemistry/nmrglue/
Date: Fri, 01 Jan 2021 01:50:50
Message-Id: 1609465842.8929cccdec39a6b8c5ac04972f2d7ef3e93f55e8.mgorny@gentoo
1 commit: 8929cccdec39a6b8c5ac04972f2d7ef3e93f55e8
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 1 01:49:32 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 1 01:50:42 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8929cccd
7
8 sci-chemistry/nmrglue: Remove old (py3.6)
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sci-chemistry/nmrglue/Manifest | 1 -
13 .../nmrglue/files/nmrglue-0.5-nohyper.patch | 33 --------------------
14 sci-chemistry/nmrglue/nmrglue-0.5-r1.ebuild | 35 ----------------------
15 3 files changed, 69 deletions(-)
16
17 diff --git a/sci-chemistry/nmrglue/Manifest b/sci-chemistry/nmrglue/Manifest
18 index b1414f469d9..a887763be6c 100644
19 --- a/sci-chemistry/nmrglue/Manifest
20 +++ b/sci-chemistry/nmrglue/Manifest
21 @@ -1,2 +1 @@
22 -DIST nmrglue-0.5.tar.gz 142604 BLAKE2B 9a018a73bea46176fc06042013cb23b3eeb962df8a595388da536d17f1d2d4d550065c5492df28de860ea1290314d2fa1110af349be0c2a8b1b31677b3e4afbc SHA512 2a4b94eb6bae966000bfdee4dd16f4e312568915fb5f19f59f84c6deff690703f54f76366d3f9299f7ec187192ff64f2bf62836617a424d4c5c895c67d819af2
23 DIST nmrglue-0.7.tar.gz 166596 BLAKE2B 769dbe1330a2b610393cea07edcb7c997d219038ead0330e442b491b84a51f3d1ac0dd22a9399b1af2f97fbfbf0d24316bd834d71804b4607209c5d11f24939e SHA512 4d9959d151954f38efc7ea4f93539970bc75098403b0b5575f0c4ff6c2c25c1f08e207d2dee281109ffb2bdea53f2e7beb04e251cec1f638712dfe38430c23d5
24
25 diff --git a/sci-chemistry/nmrglue/files/nmrglue-0.5-nohyper.patch b/sci-chemistry/nmrglue/files/nmrglue-0.5-nohyper.patch
26 deleted file mode 100644
27 index 103f5b154d0..00000000000
28 --- a/sci-chemistry/nmrglue/files/nmrglue-0.5-nohyper.patch
29 +++ /dev/null
30 @@ -1,33 +0,0 @@
31 -From ba1eee9e71623110511545c058afe2a92e139aa5 Mon Sep 17 00:00:00 2001
32 -From: Jonathan Helmus <jjhelmus@×××××.com>
33 -Date: Tue, 3 Mar 2015 19:47:05 -0600
34 -Subject: [PATCH] pipe_proc.py tp function correctly sets FDSIZE.
35 -
36 -Fixes issue #27
37 ----
38 - nmrglue/process/pipe_proc.py | 7 +++++--
39 - 1 file changed, 5 insertions(+), 2 deletions(-)
40 -
41 -diff --git a/nmrglue/process/pipe_proc.py b/nmrglue/process/pipe_proc.py
42 -index 79b6303..8c1271c 100644
43 ---- a/nmrglue/process/pipe_proc.py
44 -+++ b/nmrglue/process/pipe_proc.py
45 -@@ -1527,13 +1527,16 @@ def tp(dic, data, hyper=False, nohyper=False, auto=False, nohdr=False):
46 - data = np.array(p.tp_hyper(data), dtype="complex64")
47 - else:
48 - data = p.tp(data)
49 -- if dic[fn2 + "QUADFLAG"] != 1 and nohyper is not True:
50 -+ if dic[fn2 + "QUADFLAG"] != 1 and nohyper is False:
51 - # unpack complex as needed
52 - data = np.array(p.c2ri(data), dtype="complex64")
53 -
54 - # update the dimentionality and order
55 - dic["FDSLICECOUNT"] = data.shape[0]
56 -- if data.dtype == 'float32':
57 -+ if (data.dtype == 'float32') and (nohyper is True):
58 -+ # when nohyper is True and the new last dimension was complex
59 -+ # prior to transposing then FDSIZE is set as if the dimension was
60 -+ # converted to complex data, that is half the actual size.
61 - dic["FDSIZE"] = data.shape[1] / 2
62 - else:
63 - dic["FDSIZE"] = data.shape[1]
64
65 diff --git a/sci-chemistry/nmrglue/nmrglue-0.5-r1.ebuild b/sci-chemistry/nmrglue/nmrglue-0.5-r1.ebuild
66 deleted file mode 100644
67 index 3a767944a13..00000000000
68 --- a/sci-chemistry/nmrglue/nmrglue-0.5-r1.ebuild
69 +++ /dev/null
70 @@ -1,35 +0,0 @@
71 -# Copyright 1999-2020 Gentoo Authors
72 -# Distributed under the terms of the GNU General Public License v2
73 -
74 -EAPI=5
75 -
76 -PYTHON_COMPAT=( python3_6 )
77 -
78 -inherit distutils-r1
79 -
80 -DESCRIPTION="A module for working with NMR data in Python"
81 -HOMEPAGE="https://nmrglue.com/"
82 -SRC_URI="https://github.com/jjhelmus/nmrglue/releases/download/v${PV}/${P}.tar.gz"
83 -
84 -SLOT="0"
85 -LICENSE="BSD"
86 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
87 -IUSE="test"
88 -RESTRICT="!test? ( test )"
89 -
90 -RDEPEND="
91 - dev-python/matplotlib[${PYTHON_USEDEP}]
92 - dev-python/numpy[${PYTHON_USEDEP}]
93 - dev-python/scipy[${PYTHON_USEDEP}]"
94 -DEPEND="
95 - test? (
96 - ${RDEPEND}
97 - dev-python/nose[${PYTHON_USEDEP}]
98 - )
99 -"
100 -
101 -PATCHES=( "${FILESDIR}"/${P}-nohyper.patch )
102 -
103 -python_test() {
104 - nosetests --verbosity=3 || die
105 -}