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: dev-python/csv23/, dev-python/csv23/files/
Date: Sat, 02 May 2020 10:32:59
Message-Id: 1588415572.565fcbf28861d592444f3f2a999a65b8a067efcd.mgorny@gentoo
1 commit: 565fcbf28861d592444f3f2a999a65b8a067efcd
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 2 10:32:27 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat May 2 10:32:52 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=565fcbf2
7
8 dev-python/csv23: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/csv23/Manifest | 1 -
13 dev-python/csv23/csv23-0.3.ebuild | 34 ---------------------
14 dev-python/csv23/files/csv23-0.3-pypy3.patch | 44 ----------------------------
15 3 files changed, 79 deletions(-)
16
17 diff --git a/dev-python/csv23/Manifest b/dev-python/csv23/Manifest
18 index 52c996b24c5..dd664de3a7e 100644
19 --- a/dev-python/csv23/Manifest
20 +++ b/dev-python/csv23/Manifest
21 @@ -1,2 +1 @@
22 DIST csv23-0.3.1.tar.gz 23959 BLAKE2B 076c1a3f52d4cf6283716c366c3b44d3cae4012ae7613e24193aa7d8e0ac96e4ee9d1325219dd90ada26970cb3fde093730224f0f9bda3cadc921d9a5465b317 SHA512 25a0e06529edab89e4541cd7622a980af2cc31eff62db9f659af5305bfdbdcd388354b38a6f725d81e2f39fb48bec7adb287bb0577e973b5709a38ff03456037
23 -DIST csv23-0.3.tar.gz 23625 BLAKE2B 88df927acb1910a2ada69cf0aa8855a2cda93a006e05cfa270ee86ddbea3a5fa4df52607d320fcdecd67ff3e4e5a0f900f74bbd56e75b5e44baa46ba9d26836a SHA512 7581aef25878d2c6f7aaea4cfd8af8c2062a3d18469c176a9a09513beac34299e9456f77581025e207a814311bad7becd621ebf4e0f759a8f7ca16f55fd2731f
24
25 diff --git a/dev-python/csv23/csv23-0.3.ebuild b/dev-python/csv23/csv23-0.3.ebuild
26 deleted file mode 100644
27 index 82aab4ad628..00000000000
28 --- a/dev-python/csv23/csv23-0.3.ebuild
29 +++ /dev/null
30 @@ -1,34 +0,0 @@
31 -# Copyright 2020 Gentoo Authors
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=7
35 -
36 -PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
37 -inherit distutils-r1
38 -
39 -DESCRIPTION="Python 2/3 unicode CSV compatibility layer"
40 -HOMEPAGE="
41 - https://pypi.org/project/csv23/
42 - https://github.com/xflr6/csv23/"
43 -SRC_URI="https://github.com/xflr6/csv23/archive/v${PV}.tar.gz -> ${P}.tar.gz"
44 -
45 -LICENSE="MIT"
46 -SLOT="0"
47 -KEYWORDS="~amd64 ~x86"
48 -
49 -# note: upstream really uses mock at runtime
50 -RDEPEND="
51 - $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)"
52 -BDEPEND="
53 - test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )"
54 -
55 -distutils_enable_tests pytest
56 -
57 -PATCHES=(
58 - "${FILESDIR}"/${P}-pypy3.patch
59 -)
60 -
61 -src_prepare() {
62 - sed -i -e '/--cov/d' setup.cfg || die
63 - distutils-r1_src_prepare
64 -}
65
66 diff --git a/dev-python/csv23/files/csv23-0.3-pypy3.patch b/dev-python/csv23/files/csv23-0.3-pypy3.patch
67 deleted file mode 100644
68 index 2e1e3b217c2..00000000000
69 --- a/dev-python/csv23/files/csv23-0.3-pypy3.patch
70 +++ /dev/null
71 @@ -1,44 +0,0 @@
72 -From cb9a4519b81daccbb54ea767829d888a6b97855a Mon Sep 17 00:00:00 2001
73 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
74 -Date: Thu, 30 Apr 2020 11:54:31 +0200
75 -Subject: [PATCH] fix hashlib usage compatibility with pypy3
76 -
77 -PyPy3's hashlib fails when passed a memoryview object (i.e.
78 -BytesIO.getbuffer()). Convert it to bytes instead in order to fix
79 -compatibility. While this isn't necessary for CPython, it should not
80 -cause any issues.
81 -
82 -Also enabling testing with pypy3. I had to switch to the newer Ubuntu
83 -version as well in order to avoid more bugs in old PyPy versions.
84 -
85 -PyPy3 bug: https://foss.heptapod.net/pypy/pypy/issues/3217
86 ----
87 - .travis.yml | 2 ++
88 - csv23/shortcuts.py | 2 +-
89 - tox.ini | 2 +-
90 - 3 files changed, 4 insertions(+), 2 deletions(-)
91 -
92 -diff --git a/csv23/shortcuts.py b/csv23/shortcuts.py
93 -index 6eeb248..7bdb013 100644
94 ---- a/csv23/shortcuts.py
95 -+++ b/csv23/shortcuts.py
96 -@@ -206,7 +206,7 @@ def write_csv(file, rows, header=None, dialect=DIALECT, encoding=ENCODING,
97 - buf = f.buffer
98 - for rows in iterslices(rows, 1000):
99 - writer.writerows(rows)
100 -- hashsum.update(buf.getbuffer())
101 -+ hashsum.update(bytes(buf.getbuffer()))
102 - # NOTE: f.truncate(0) would prepend zero-bytes
103 - f.seek(0)
104 - f.truncate()
105 -diff --git a/tox.ini b/tox.ini
106 -index 2a234b3..89a4432 100644
107 ---- a/tox.ini
108 -+++ b/tox.ini
109 -@@ -1,5 +1,5 @@
110 - [tox]
111 --envlist = py{27,35,36,37,38}
112 -+envlist = py{27,35,36,37,38},pypy3
113 - skip_missing_interpreters = true
114 -
115 - [testenv]