From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DA61A138359 for ; Wed, 8 Jul 2020 08:26:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5FCCBE0845; Wed, 8 Jul 2020 08:26:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3401AE0845 for ; Wed, 8 Jul 2020 08:26:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 00C7134F445 for ; Wed, 8 Jul 2020 08:26:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 045CD2E5 for ; Wed, 8 Jul 2020 08:26:09 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1594196761.81573375223269fcb469cb2dcce59fbe753f3d5e.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/distlib/, dev-python/distlib/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/distlib/Manifest dev-python/distlib/distlib-0.3.1.ebuild dev-python/distlib/files/distlib-0.3.1-system-pypiserver.py X-VCS-Directories: dev-python/distlib/ dev-python/distlib/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 81573375223269fcb469cb2dcce59fbe753f3d5e X-VCS-Branch: master Date: Wed, 8 Jul 2020 08:26:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b78be629-ce3c-4b79-b26e-852e94b0c4e8 X-Archives-Hash: 1d511c947d27fa172cd36d15e987555c commit: 81573375223269fcb469cb2dcce59fbe753f3d5e Author: Michał Górny gentoo org> AuthorDate: Wed Jul 8 07:50:11 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Jul 8 08:26:01 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81573375 dev-python/distlib: Bump to 0.3.1, fix tests Signed-off-by: Michał Górny gentoo.org> dev-python/distlib/Manifest | 1 + dev-python/distlib/distlib-0.3.1.ebuild | 51 ++++++++++++++++++++++ .../files/distlib-0.3.1-system-pypiserver.py | 37 ++++++++++++++++ 3 files changed, 89 insertions(+) diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest index 4bbb3b2204a..2183bfda011 100644 --- a/dev-python/distlib/Manifest +++ b/dev-python/distlib/Manifest @@ -1 +1,2 @@ DIST distlib-0.3.0.tar.bz2 848089 BLAKE2B 70f88b570229e2ab4c95bd8da0375aba189f66dec8defcf8eedf1be6924d93bd20b54c68e5fba867a6c68a31d4ef926ee2dc18ccb0391278680f30a62d0cd251 SHA512 01b0e7d59736414a241efdf883e4ee63eafe9614ce3b4147781a5750d25d6383543146c5277e3e0d3e11ce03693afd0331c6e3416776a6f84de7a4d9dadf3de4 +DIST distlib-0.3.1.tar.bz2 1068500 BLAKE2B 52135869242f71cc6d6887da6d9e20ffc6b46c84d8146393961062d92d8c0bd68e1309277f64fdec0319ff3c503b1caaba3d5378f5c081dca79573c8d9c2e6f2 SHA512 f259299176c45be7024b80759015a2fad120ffdde55b6abea0f7fb0335cee90809b5daedcb88abdfb68fd496284b2e478df622004b3750327bfc86807581116c diff --git a/dev-python/distlib/distlib-0.3.1.ebuild b/dev-python/distlib/distlib-0.3.1.ebuild new file mode 100644 index 00000000000..349667d657a --- /dev/null +++ b/dev-python/distlib/distlib-0.3.1.ebuild @@ -0,0 +1,51 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=no +PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 ) + +inherit distutils-r1 vcs-snapshot + +DESCRIPTION="Low-level components of distutils2/packaging" +HOMEPAGE="https://pypi.org/project/distlib/ + https://bitbucket.org/pypa/distlib/" +# pypi has zip only :-( +SRC_URI=" + https://bitbucket.org/pypa/distlib/get/${PV}.tar.bz2 -> ${P}.tar.bz2" + +LICENSE="PSF-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +# openpyxl installs invalid metadata that breaks distlib +BDEPEND=" + test? ( + dev-python/pypiserver[${PYTHON_USEDEP}] + !! +Date: Wed, 8 Jul 2020 09:24:42 +0200 +Subject: [PATCH] Use system pypiserver + +--- + tests/test_index.py | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/tests/test_index.py b/tests/test_index.py +index bc24367..623b027 100644 +--- a/tests/test_index.py ++++ b/tests/test_index.py +@@ -52,11 +52,6 @@ class PackageIndexTestCase(unittest.TestCase): + def setUpClass(cls): + if cls.run_test_server: + cls.server = None +- server_script = os.path.join(HERE, 'pypi-server-standalone.py') +- if not os.path.exists(server_script): +- logger.debug('test server not available - some tests ' +- 'will be skipped.') +- return + pwdfn = os.path.join(HERE, 'passwords') + if not os.path.exists(pwdfn): # pragma: no cover + with open(pwdfn, 'w') as f: +@@ -65,7 +60,7 @@ class PackageIndexTestCase(unittest.TestCase): + if not os.path.isdir(pkgdir): # pragma: no cover + os.mkdir(pkgdir) + cls.sink = sink = open(os.devnull, 'w') +- cmd = [sys.executable, 'pypi-server-standalone.py', ++ cmd = [sys.executable, '-m', 'pypiserver', + '-P', 'passwords', 'packages'] + cls.server = subprocess.Popen(cmd, stdout=sink, stderr=sink, + cwd=HERE) +-- +2.27.0 +