dev-python/distlib: Clean old versions up

This commit is contained in:
Michał Górny
2017-05-02 10:11:04 +02:00
parent 48d5842ab6
commit b71e43c238
5 changed files with 0 additions and 256 deletions

View File

@@ -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)

View File

@@ -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,
},