* [gentoo-commits] repo/gentoo:master commit in: dev-python/pylibmc/, dev-python/pylibmc/files/
@ 2019-11-21 5:27 Patrick McLean
0 siblings, 0 replies; 4+ messages in thread
From: Patrick McLean @ 2019-11-21 5:27 UTC (permalink / raw
To: gentoo-commits
commit: d2541deb97e7445ac2e0344485ababc6f4ec83b0
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Thu Nov 21 05:26:35 2019 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Nov 21 05:26:35 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2541deb
dev-python/pylibmc: Version bump to 1.6.1, EAPI=7, py38
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
dev-python/pylibmc/Manifest | 1 +
.../files/pylibmc-1.6.1-fix-test-failures.patch | 18 ++++++
dev-python/pylibmc/pylibmc-1.6.1.ebuild | 65 ++++++++++++++++++++++
3 files changed, 84 insertions(+)
diff --git a/dev-python/pylibmc/Manifest b/dev-python/pylibmc/Manifest
index c7a52afcc1f..f98ddd40cd5 100644
--- a/dev-python/pylibmc/Manifest
+++ b/dev-python/pylibmc/Manifest
@@ -1 +1,2 @@
DIST pylibmc-1.5.1.tar.gz 69525 BLAKE2B 5039ad7d99a5ca57bd6cf7f00c77cc8bba122fe5852de164df34a71b4f5d1e4fcb428e749a66d384691b74f30b99e000f5cb9cd6479af2fc324d885b0fa59aa7 SHA512 efc40fae9721a6be589f87b66109132d4656725f718e1d63d7d25b9b27790b7c00fc3c7e4e47235895b7127cebc64229ddb284d23d0d903d3a510da7e1ce4549
+DIST pylibmc-1.6.1.tar.gz 72061 BLAKE2B ebaa6f9dfc341d862a8b46bbbf0db1420ff400cb40390f7bee6bf198ff941ad7967b578040ffe1209721ea84a163a39649108a2a23f3dadc2d579db740b2ccf3 SHA512 a3874435389486b29bab5f1d29e5c179d67655d90995bb27fcb7cd46ce7eb3b60117b94f901602f8a65dc0e587d5f8edfcf15e259effd439411adb58ddb7065e
diff --git a/dev-python/pylibmc/files/pylibmc-1.6.1-fix-test-failures.patch b/dev-python/pylibmc/files/pylibmc-1.6.1-fix-test-failures.patch
new file mode 100644
index 00000000000..c19ab468ce8
--- /dev/null
+++ b/dev-python/pylibmc/files/pylibmc-1.6.1-fix-test-failures.patch
@@ -0,0 +1,18 @@
+diff --git a/src/_pylibmcmodule.c b/src/_pylibmcmodule.c
+index 5324d1d..70c18cb 100644
+--- a/src/_pylibmcmodule.c
++++ b/src/_pylibmcmodule.c
+@@ -600,6 +600,13 @@ static PyObject *_PylibMC_parse_memcached_value(PylibMC_Client *self,
+ }
+ #endif
+
++#if PY_MAJOR_VERSION >= 3
++ /* make sure we don't pass a null pointer to _PylibMC_deserialize_native */
++ if (value == NULL) {
++ value = "";
++ }
++#endif
++
+ if (self->native_deserialization) {
+ retval = _PylibMC_deserialize_native(self, NULL, value, size, flags);
+ } else {
diff --git a/dev-python/pylibmc/pylibmc-1.6.1.ebuild b/dev-python/pylibmc/pylibmc-1.6.1.ebuild
new file mode 100644
index 00000000000..11264e7c131
--- /dev/null
+++ b/dev-python/pylibmc/pylibmc-1.6.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Libmemcached wrapper written as a Python extension"
+HOMEPAGE="http://sendapatch.se/projects/pylibmc/ https://pypi.org/project/pylibmc/"
+# One image is missing from the doc at PyPI
+# https://github.com/lericson/pylibmc/pull/221
+SRC_URI="https://github.com/lericson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-libs/libmemcached-0.32"
+# Older sphinx versions fail to compile the doc
+# https://github.com/sphinx-doc/sphinx/issues/3266
+BDEPEND="${RDEPEND}
+ doc? ( $(python_gen_any_dep '>=dev-python/sphinx-1.5.1-r1[${PYTHON_USEDEP}]') )
+ test? (
+ net-misc/memcached
+ dev-python/nose[${PYTHON_USEDEP}]
+ )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/pylibmc-1.6.1-fix-test-failures.patch"
+)
+
+python_check_deps() {
+ use doc || return 0
+ has_version ">=dev-python/sphinx-1.5.1-r1[${PYTHON_USEDEP}]"
+}
+
+python_prepare_all() {
+ sed -e "/with-info=1/d" -i setup.cfg || die
+
+ # some amazon thing, expects to be in AWS
+ rm tests/test_autoconf.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ if use doc; then
+ # This variable is added to sys.path
+ # but it does not seem to be useful
+ PYLIBMC_DIR="." emake -C docs
+ HTML_DOCS=( docs/_build/html/. )
+ fi
+}
+
+python_test() {
+ distutils_install_for_testing
+ memcached -d -p 11219 -u nobody -l localhost -P "${T}/m.pid" || die
+ MEMCACHED_PORT=11219 nosetests -v
+ local ret=${?}
+ kill "$(<"${T}/m.pid")" || die
+ [[ ${ret} == 0 ]] || die "Tests fail with ${EPYTHON}!"
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pylibmc/, dev-python/pylibmc/files/
@ 2019-12-10 1:14 Patrick McLean
0 siblings, 0 replies; 4+ messages in thread
From: Patrick McLean @ 2019-12-10 1:14 UTC (permalink / raw
To: gentoo-commits
commit: 525ee6507f05e96ec5e7db8ef6c547eae7c8d639
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Mon Dec 9 22:46:17 2019 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Dec 10 01:13:35 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=525ee650
dev-python/pylibmc-1.6.1-r1: Revbump, update patch to fix tests
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
...test-failures.patch => pylibmc-1.6.1-fix-test-failures-r1.patch} | 6 ++----
.../pylibmc/{pylibmc-1.6.1.ebuild => pylibmc-1.6.1-r1.ebuild} | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/dev-python/pylibmc/files/pylibmc-1.6.1-fix-test-failures.patch b/dev-python/pylibmc/files/pylibmc-1.6.1-fix-test-failures-r1.patch
similarity index 81%
rename from dev-python/pylibmc/files/pylibmc-1.6.1-fix-test-failures.patch
rename to dev-python/pylibmc/files/pylibmc-1.6.1-fix-test-failures-r1.patch
index c19ab468ce8..0a91fd39266 100644
--- a/dev-python/pylibmc/files/pylibmc-1.6.1-fix-test-failures.patch
+++ b/dev-python/pylibmc/files/pylibmc-1.6.1-fix-test-failures-r1.patch
@@ -2,16 +2,14 @@ diff --git a/src/_pylibmcmodule.c b/src/_pylibmcmodule.c
index 5324d1d..70c18cb 100644
--- a/src/_pylibmcmodule.c
+++ b/src/_pylibmcmodule.c
-@@ -600,6 +600,13 @@ static PyObject *_PylibMC_parse_memcached_value(PylibMC_Client *self,
+@@ -600,6 +600,11 @@ static PyObject *_PylibMC_parse_memcached_value(PylibMC_Client *self,
}
#endif
-
-+#if PY_MAJOR_VERSION >= 3
+
+ /* make sure we don't pass a null pointer to _PylibMC_deserialize_native */
+ if (value == NULL) {
+ value = "";
+ }
-+#endif
+
if (self->native_deserialization) {
retval = _PylibMC_deserialize_native(self, NULL, value, size, flags);
diff --git a/dev-python/pylibmc/pylibmc-1.6.1.ebuild b/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
similarity index 97%
rename from dev-python/pylibmc/pylibmc-1.6.1.ebuild
rename to dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
index a52234269c7..37471012654 100644
--- a/dev-python/pylibmc/pylibmc-1.6.1.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
@@ -38,7 +38,7 @@ RESTRICT="!test? ( test )"
REQUIRED_USE="doc? ( || ( $(python_gen_useflags "${DOCS_PYTHON_COMPAT[@]}") ) )"
PATCHES=(
- "${FILESDIR}/pylibmc-1.6.1-fix-test-failures.patch"
+ "${FILESDIR}/pylibmc-1.6.1-fix-test-failures-r1.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pylibmc/, dev-python/pylibmc/files/
@ 2022-05-22 10:46 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2022-05-22 10:46 UTC (permalink / raw
To: gentoo-commits
commit: aa4df450bf8e7c5333e0cb0c09a22bcf78fa2153
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun May 22 10:27:58 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun May 22 10:46:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa4df450
dev-python/pylibmc: Enable py3.11
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pylibmc/files/pylibmc-1.6.1-py311.patch | 29 ++++++++++++++++++++++
dev-python/pylibmc/pylibmc-1.6.1-r2.ebuild | 3 ++-
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/dev-python/pylibmc/files/pylibmc-1.6.1-py311.patch b/dev-python/pylibmc/files/pylibmc-1.6.1-py311.patch
new file mode 100644
index 000000000000..c687f90fb658
--- /dev/null
+++ b/dev-python/pylibmc/files/pylibmc-1.6.1-py311.patch
@@ -0,0 +1,29 @@
+From 22854a4ba8f7e926099219c107104723089bcad8 Mon Sep 17 00:00:00 2001
+From: Ludvig Ericson <ludvig@lericson.se>
+Date: Mon, 29 Jun 2020 14:59:36 +0200
+Subject: [PATCH] =?UTF-8?q?2020:=20Do=20not=20pass=20=E2=80=98U=E2=80=99?=
+ =?UTF-8?q?=20flag=20to=20open?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ setup.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 9bea257..89871ea 100644
+--- a/setup.py
++++ b/setup.py
+@@ -95,9 +95,9 @@ def append_env(L, e):
+ s.write(line + "\n")
+ sys.exit(0)
+
+-with open("README.rst", "U", encoding="utf-8") as r:
++with open("README.rst", encoding="utf-8") as r:
+ readme_text = r.read()
+-with open("src/pylibmc-version.h", "U", encoding="utf-8") as r:
++with open("src/pylibmc-version.h", encoding="utf-8") as r:
+ version = r.read().strip().split("\"")[1]
+
+ setup(
diff --git a/dev-python/pylibmc/pylibmc-1.6.1-r2.ebuild b/dev-python/pylibmc/pylibmc-1.6.1-r2.ebuild
index 348df4925a33..65a68720139f 100644
--- a/dev-python/pylibmc/pylibmc-1.6.1-r2.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.6.1-r2.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
inherit distutils-r1
@@ -39,6 +39,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/pylibmc-1.6.1-fix-test-failures-r1.patch"
+ "${FILESDIR}/pylibmc-1.6.1-py311.patch"
"${DISTDIR}/${P}-no-nose.patch"
)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pylibmc/, dev-python/pylibmc/files/
@ 2022-09-07 5:16 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2022-09-07 5:16 UTC (permalink / raw
To: gentoo-commits
commit: 4b223c09ed590fa240157c28652a98e5c7b7bce9
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 7 05:10:07 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep 7 05:10:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b223c09
dev-python/pylibmc: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pylibmc/Manifest | 2 -
dev-python/pylibmc/files/pylibmc-1.6.1-py311.patch | 29 ---------
dev-python/pylibmc/pylibmc-1.6.1-r2.ebuild | 68 ----------------------
3 files changed, 99 deletions(-)
diff --git a/dev-python/pylibmc/Manifest b/dev-python/pylibmc/Manifest
index 48e52782dbf8..499cf86f8fc6 100644
--- a/dev-python/pylibmc/Manifest
+++ b/dev-python/pylibmc/Manifest
@@ -1,4 +1,2 @@
-DIST pylibmc-1.6.1-no-nose.patch 26090 BLAKE2B 160e5b58107dcea0354462370eeeb12739c7fd1549e1c64ddf1fe2451654e50c1408505985eb6a7150ce60185bc7acebba7a20c6444615bef8c6991debfba4cc SHA512 84fb37505def84caaacb1343032d18bd644f5072e6ce7a2d6e88bc33bd2dedc8b303f4cf2a9b57b32c3c4b8e01bef1bebcc09ecb525568c928aed326bee2cace
-DIST pylibmc-1.6.1.tar.gz 72061 BLAKE2B ebaa6f9dfc341d862a8b46bbbf0db1420ff400cb40390f7bee6bf198ff941ad7967b578040ffe1209721ea84a163a39649108a2a23f3dadc2d579db740b2ccf3 SHA512 a3874435389486b29bab5f1d29e5c179d67655d90995bb27fcb7cd46ce7eb3b60117b94f901602f8a65dc0e587d5f8edfcf15e259effd439411adb58ddb7065e
DIST pylibmc-1.6.2.gh.tar.gz 71581 BLAKE2B 4fc9216150e122b6d80537184422b52c0a518f5b9fbcf5b54f794fde33d5ac6fcd474e08f71b8d71f0443351e91ea5d8ac2c24e94bd568605cf1183259394091 SHA512 1a1575fd5c3644d53e0ed49818bd958e0e28fe0354f41578c944b260f402f1b51a74baca8f98b32adfd0024e61ec8df1795c6ca7363509e35e4f34a907de063e
DIST pylibmc-1.6.3.gh.tar.gz 72154 BLAKE2B 3367651d355cb9c6693d8162e740c855c8f84f6b2a5f54ba5fb7f505474263650b46d5ed04c11af2199a7b40c6d4cf0d13a63d2d76a395ff30570a4a3e5259ec SHA512 4bc85d305410f775a39d8d3f64a7e97538ed6ae890cd64833e5bff92fbb60fe8ebc4cc7956df015f6590eb55b7009bd36b299dc636ee0da7f71ed51cc98f3012
diff --git a/dev-python/pylibmc/files/pylibmc-1.6.1-py311.patch b/dev-python/pylibmc/files/pylibmc-1.6.1-py311.patch
deleted file mode 100644
index c687f90fb658..000000000000
--- a/dev-python/pylibmc/files/pylibmc-1.6.1-py311.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 22854a4ba8f7e926099219c107104723089bcad8 Mon Sep 17 00:00:00 2001
-From: Ludvig Ericson <ludvig@lericson.se>
-Date: Mon, 29 Jun 2020 14:59:36 +0200
-Subject: [PATCH] =?UTF-8?q?2020:=20Do=20not=20pass=20=E2=80=98U=E2=80=99?=
- =?UTF-8?q?=20flag=20to=20open?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- setup.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 9bea257..89871ea 100644
---- a/setup.py
-+++ b/setup.py
-@@ -95,9 +95,9 @@ def append_env(L, e):
- s.write(line + "\n")
- sys.exit(0)
-
--with open("README.rst", "U", encoding="utf-8") as r:
-+with open("README.rst", encoding="utf-8") as r:
- readme_text = r.read()
--with open("src/pylibmc-version.h", "U", encoding="utf-8") as r:
-+with open("src/pylibmc-version.h", encoding="utf-8") as r:
- version = r.read().strip().split("\"")[1]
-
- setup(
diff --git a/dev-python/pylibmc/pylibmc-1.6.1-r2.ebuild b/dev-python/pylibmc/pylibmc-1.6.1-r2.ebuild
deleted file mode 100644
index 65a68720139f..000000000000
--- a/dev-python/pylibmc/pylibmc-1.6.1-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Libmemcached wrapper written as a Python extension"
-HOMEPAGE="
- https://sendapatch.se/projects/pylibmc/
- https://pypi.org/project/pylibmc/
- https://github.com/lericson/pylibmc/
-"
-SRC_URI="
- https://github.com/lericson/pylibmc/archive/${PV}.tar.gz
- -> ${P}.tar.gz
- https://github.com/lericson/pylibmc/pull/263.patch
- -> ${P}-no-nose.patch
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
-
-DEPEND="
- >=dev-libs/libmemcached-0.32
-"
-RDEPEND="
- ${DEPEND}
-"
-BDEPEND="
- test? (
- net-misc/memcached
- )
-"
-
-PATCHES=(
- "${FILESDIR}/pylibmc-1.6.1-fix-test-failures-r1.patch"
- "${FILESDIR}/pylibmc-1.6.1-py311.patch"
- "${DISTDIR}/${P}-no-nose.patch"
-)
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-# needed for docs
-export PYLIBMC_DIR=.
-
-src_test() {
- local -x MEMCACHED_PORT=11219
- memcached -d -p "${MEMCACHED_PORT}" -u nobody -l localhost \
- -P "${T}/m.pid" || die
- distutils-r1_src_test
- kill "$(<"${T}/m.pid")" || die
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # these require "AmazonElastiCache" running
- tests/test_autoconf.py
- )
-
- epytest --doctest-modules --doctest-glob='doctests.txt' \
- src/pylibmc tests
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-09-07 5:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-21 5:27 [gentoo-commits] repo/gentoo:master commit in: dev-python/pylibmc/, dev-python/pylibmc/files/ Patrick McLean
-- strict thread matches above, loose matches on Subject: below --
2019-12-10 1:14 Patrick McLean
2022-05-22 10:46 Michał Górny
2022-09-07 5:16 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox