diff options
Diffstat (limited to 'dev-python/pylibmc')
| -rw-r--r-- | dev-python/pylibmc/Manifest | 1 | ||||
| -rw-r--r-- | dev-python/pylibmc/files/pylibmc-1.6.1-py311.patch | 29 | ||||
| -rw-r--r-- | dev-python/pylibmc/pylibmc-1.6.1-r2.ebuild | 51 |
3 files changed, 61 insertions, 20 deletions
diff --git a/dev-python/pylibmc/Manifest b/dev-python/pylibmc/Manifest index 68a4f2e095a6..132d9d866ba2 100644 --- a/dev-python/pylibmc/Manifest +++ b/dev-python/pylibmc/Manifest @@ -1 +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 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 df9dce3f5f36..38c4945f973b 100644 --- a/dev-python/pylibmc/pylibmc-1.6.1-r2.ebuild +++ b/dev-python/pylibmc/pylibmc-1.6.1-r2.ebuild @@ -12,41 +12,42 @@ DESCRIPTION="Libmemcached wrapper written as a Python extension" HOMEPAGE=" https://sendapatch.se/projects/pylibmc/ https://pypi.org/project/pylibmc/ - https://github.com/lericson/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" + 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" -RDEPEND=">=dev-libs/libmemcached-0.32" -# Older sphinx versions fail to compile the doc -# https://github.com/sphinx-doc/sphinx/issues/3266 -DEPEND="${RDEPEND}" +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 nose +distutils_enable_tests pytest -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 - - # needed for docs - export PYLIBMC_DIR=. -} +# needed for docs +export PYLIBMC_DIR=. src_test() { local -x MEMCACHED_PORT=11219 @@ -55,3 +56,13 @@ src_test() { 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 +} |