mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-07-31 10:58:21 -07:00
dev-python/distlib: Clean old versions up
This commit is contained in:
Michał Górny
@@ -1,3 +1,2 @@
|
||||
DIST distlib-0.2.1.zip 542424 SHA256 d91dc4a509ca50d1ba796ba1c4b23d5587f082d8a886856544546c88f4d9a685 SHA512 f6453585650db242ad4a176bbd468cc6069ee0941b6ea23f24fc32000778097d8a100de82eaad7b3d8d998dc153d25f537505c7eefcc6f98f37995cfc9d5be77 WHIRLPOOL 86c2eb318c9df8233847b5ded3370d77ed71fab22067f4fa039531d5a3df2ede463e1688d920401a0870e4359f18f8d765230c72e71be1458e5db14de153ad8d
|
||||
DIST distlib-0.2.2.zip 544724 SHA256 ddd173fc2ce7491c5dc92ac69b3cf2702e9885677b1d5f1c877a36f4dd5b9b6c SHA512 399469376eebbedf288ebc04c0d551c75b3656d8aeb87bae02c7e2542e41018bd50ec28d76a99b293b10b941e0e7735841e5e13512acccc9fdb2af0044c970ee WHIRLPOOL fc9498233c31a33eb8c351c3af4ec75809c0484af302f8041cd7b3aeb28f90f4a9cbb9fab514bebda1ad127d4a1e89f8714ae771eb103277850aaa5cbb27be7f
|
||||
DIST distlib-0.2.4.zip 547411 SHA256 ee0966c613d04b19e425367b238c0a426ef34a43e1e0ffa6b16f781045d2a2a3 SHA512 03f9f9474578226e1a40a85a490aead3ec0509ba444856a263d4f25b3c86b5f919a3e18ff715a3a329d80a3f20a540b8c57a6e3dff55703c9cce730e2d021084 WHIRLPOOL 5dc9abf490bfccfc86c3092193d56963bef71a3f426f40b1e7dfdb9d2c45da7751488dff4213487e8a84871318a3379a7f122b1350f561cd7a195dd7ed7d45da
|
||||
|
||||
@@ -1,54 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
|
||||
PYTHON_REQ_USE="threads(+)"
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Distribution utilities"
|
||||
HOMEPAGE="https://pypi.python.org/pypi/distlib https://bitbucket.org/vinay.sajip/distlib https://github.com/vsajip/distlib"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="BSD"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="app-arch/unzip"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-unbundle.patch
|
||||
"${FILESDIR}"/${P}-online.patch
|
||||
)
|
||||
|
||||
python_prepare_all() {
|
||||
rm -r \
|
||||
distlib/*.exe \
|
||||
distlib/_backport \
|
||||
tests/test_shutil.py* \
|
||||
tests/test_sysconfig.py* || die
|
||||
|
||||
distutils-r1_python_prepare_all
|
||||
|
||||
# Broken tests
|
||||
# 1 fails due to it being sensitive to dictionary ordering
|
||||
# inconsistency between code and test
|
||||
sed \
|
||||
-e 's:test_dependency_finder:_&:g' \
|
||||
-i tests/*py || die
|
||||
|
||||
# Gentoo still doesn't report correct ABI
|
||||
sed \
|
||||
-e 's:test_abi:_&:g' \
|
||||
-i tests/*py || die
|
||||
}
|
||||
|
||||
python_test() {
|
||||
sed \
|
||||
-e '/PIP_AVAILABLE/s:True:False:g' \
|
||||
-i tests/*py || die
|
||||
SKIP_ONLINE=True PYTHONHASHSEED=0 esetup.py test
|
||||
}
|
||||
@@ -1,53 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
|
||||
PYTHON_REQ_USE="threads(+)"
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Distribution utilities"
|
||||
HOMEPAGE="https://pypi.python.org/pypi/distlib https://bitbucket.org/vinay.sajip/distlib https://github.com/vsajip/distlib"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="BSD"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="app-arch/unzip"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-unbundle.patch
|
||||
)
|
||||
|
||||
python_prepare_all() {
|
||||
rm -r \
|
||||
distlib/*.exe \
|
||||
distlib/_backport \
|
||||
tests/test_shutil.py* \
|
||||
tests/test_sysconfig.py* || die
|
||||
|
||||
distutils-r1_python_prepare_all
|
||||
|
||||
# Broken tests
|
||||
# 1 fails due to it being sensitive to dictionary ordering
|
||||
# inconsistency between code and test
|
||||
sed \
|
||||
-e 's:test_dependency_finder:_&:g' \
|
||||
-i tests/*py || die
|
||||
|
||||
# Gentoo still doesn't report correct ABI
|
||||
sed \
|
||||
-e 's:test_abi:_&:g' \
|
||||
-i tests/*py || die
|
||||
}
|
||||
|
||||
python_test() {
|
||||
sed \
|
||||
-e '/PIP_AVAILABLE/s:True:False:g' \
|
||||
-i tests/*py || die
|
||||
SKIP_ONLINE=True PYTHONHASHSEED=0 esetup.py test
|
||||
}
|
||||
@@ -1,113 +0,0 @@
|
||||
tests/test_index.py | 1 +
|
||||
tests/test_locators.py | 10 ++++++++++
|
||||
tests/test_util.py | 1 +
|
||||
3 files changed, 12 insertions(+)
|
||||
|
||||
diff --git a/tests/test_index.py b/tests/test_index.py
|
||||
index a188816..dbef670 100644
|
||||
--- a/tests/test_index.py
|
||||
+++ b/tests/test_index.py
|
||||
@@ -290,6 +290,7 @@ class PackageIndexTestCase(unittest.TestCase):
|
||||
self.assertRaises(DistlibException, self.index.download_file, url, fn,
|
||||
digest[:-1] + '8')
|
||||
|
||||
+ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
|
||||
def test_search(self):
|
||||
self.index = PackageIndex()
|
||||
result = self.index.search({'name': 'tatterdema'})
|
||||
diff --git a/tests/test_locators.py b/tests/test_locators.py
|
||||
index de97541..436ea9d 100644
|
||||
--- a/tests/test_locators.py
|
||||
+++ b/tests/test_locators.py
|
||||
@@ -29,6 +29,7 @@ PYPI_WEB_HOST = os.environ.get('PYPI_WEB_HOST', 'https://pypi.python.org/simple/
|
||||
class LocatorTestCase(unittest.TestCase):
|
||||
|
||||
@unittest.skipIf('SKIP_SLOW' in os.environ, 'Skipping slow test')
|
||||
+ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
|
||||
def test_xmlrpc(self):
|
||||
locator = PyPIRPCLocator(PYPI_RPC_HOST)
|
||||
try:
|
||||
@@ -53,6 +54,7 @@ class LocatorTestCase(unittest.TestCase):
|
||||
self.assertGreater(len(names), 25000)
|
||||
|
||||
@unittest.skipIf('SKIP_SLOW' in os.environ, 'Skipping slow test')
|
||||
+ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
|
||||
def test_json(self):
|
||||
locator = PyPIJSONLocator(PYPI_RPC_HOST)
|
||||
result = locator.get_project('sarge')
|
||||
@@ -69,6 +71,7 @@ class LocatorTestCase(unittest.TestCase):
|
||||
self.assertRaises(NotImplementedError, locator.get_distribution_names)
|
||||
|
||||
@unittest.skipIf('SKIP_SLOW' in os.environ, 'Skipping slow test')
|
||||
+ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
|
||||
def test_scraper(self):
|
||||
locator = SimpleScrapingLocator('https://pypi.python.org/simple/')
|
||||
for name in ('sarge', 'Sarge'):
|
||||
@@ -88,6 +91,7 @@ class LocatorTestCase(unittest.TestCase):
|
||||
self.assertGreater(len(names), 25000)
|
||||
|
||||
@unittest.skipIf('SKIP_SLOW' in os.environ, 'Skipping slow test')
|
||||
+ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
|
||||
def test_unicode_project_name(self):
|
||||
# Just checking to see that no exceptions are raised.
|
||||
NAME = '\u2603'
|
||||
@@ -166,6 +170,7 @@ class LocatorTestCase(unittest.TestCase):
|
||||
sys.path.pop(0)
|
||||
|
||||
@unittest.skipIf('SKIP_SLOW' in os.environ, 'Skipping slow test')
|
||||
+ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
|
||||
def test_aggregation(self):
|
||||
d = os.path.join(HERE, 'fake_archives')
|
||||
loc1 = DirectoryLocator(d)
|
||||
@@ -201,6 +206,7 @@ class LocatorTestCase(unittest.TestCase):
|
||||
n2 = loc2.get_distribution_names()
|
||||
self.assertEqual(locator.get_distribution_names(), n1 | n2)
|
||||
|
||||
+ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
|
||||
def test_dependency_finder(self):
|
||||
locator = AggregatingLocator(
|
||||
JSONLocator(),
|
||||
@@ -280,6 +286,7 @@ class LocatorTestCase(unittest.TestCase):
|
||||
for url1, url2 in cases:
|
||||
self.assertEqual(default_locator.prefer_url(url1, url2), url1)
|
||||
|
||||
+ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
|
||||
def test_prereleases(self):
|
||||
locator = AggregatingLocator(
|
||||
JSONLocator(),
|
||||
@@ -308,6 +315,7 @@ class LocatorTestCase(unittest.TestCase):
|
||||
self.assertEqual(dists, set([actual[0], dist]))
|
||||
self.assertFalse(problems)
|
||||
|
||||
+ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
|
||||
def test_dist_reqts(self):
|
||||
r = 'config (<=0.3.5)'
|
||||
dist = default_locator.locate(r)
|
||||
@@ -316,6 +324,7 @@ class LocatorTestCase(unittest.TestCase):
|
||||
self.assertTrue(dist.matches_requirement(r))
|
||||
self.assertFalse(dist.matches_requirement('config (0.3.6)'))
|
||||
|
||||
+ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
|
||||
def test_dist_reqts_extras(self):
|
||||
r = 'config[doc,test](<=0.3.5)'
|
||||
dist = default_locator.locate(r)
|
||||
@@ -323,6 +332,7 @@ class LocatorTestCase(unittest.TestCase):
|
||||
self.assertTrue(dist.matches_requirement(r))
|
||||
self.assertEqual(dist.extras, ['doc', 'test'])
|
||||
|
||||
+ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
|
||||
def test_all(self):
|
||||
d = default_locator.get_project('setuptools')
|
||||
self.assertTrue('urls' in d)
|
||||
diff --git a/tests/test_util.py b/tests/test_util.py
|
||||
index 1b615d7..2908eee 100644
|
||||
--- a/tests/test_util.py
|
||||
+++ b/tests/test_util.py
|
||||
@@ -461,6 +461,7 @@ class UtilTestCase(unittest.TestCase):
|
||||
self.assertFalse(is_string_sequence(['a', 'b', None]))
|
||||
self.assertRaises(AssertionError, is_string_sequence, [])
|
||||
|
||||
+ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
|
||||
def test_package_data(self):
|
||||
data = get_package_data(name='config', version='0.3.6')
|
||||
self.assertTrue(data)
|
||||
@@ -1,35 +0,0 @@
|
||||
--- distlib-0.1.9/distlib/compat.py.orig 2014-06-06 09:58:21.317560756 +0200
|
||||
+++ distlib-0.1.9/distlib/compat.py 2014-06-06 09:58:29.955611427 +0200
|
||||
@@ -17,7 +17,7 @@ if sys.version_info[0] < 3:
|
||||
from types import FileType as file_type
|
||||
import __builtin__ as builtins
|
||||
import ConfigParser as configparser
|
||||
- from ._backport import shutil
|
||||
+ import shutil
|
||||
from urlparse import urlparse, urlunparse, urljoin, urlsplit, urlunsplit
|
||||
from urllib import (urlretrieve, quote as _quote, unquote, url2pathname,
|
||||
pathname2url, ContentTooShortError, splittype)
|
||||
@@ -267,7 +267,7 @@ except ImportError: # pragma: no cover
|
||||
try:
|
||||
import sysconfig
|
||||
except ImportError: # pragma: no cover
|
||||
- from ._backport import sysconfig
|
||||
+ import sysconfig
|
||||
|
||||
try:
|
||||
callable = callable
|
||||
--- distlib-0.1.9/setup.py.orig 2014-06-06 10:19:13.971997156 +0200
|
||||
+++ distlib-0.1.9/setup.py 2014-06-06 10:19:20.012034150 +0200
|
||||
@@ -62,12 +62,7 @@ distutils.core.setup(
|
||||
platforms='any',
|
||||
packages=[
|
||||
'distlib',
|
||||
- 'distlib._backport',
|
||||
],
|
||||
- package_data={
|
||||
- 'distlib._backport': ['sysconfig.cfg'],
|
||||
- 'distlib': ['t32.exe', 't64.exe', 'w32.exe', 'w64.exe'],
|
||||
- },
|
||||
cmdclass={
|
||||
'test': TestCommand,
|
||||
},
|
||||
Reference in New Issue
Block a user