Commit 4072145a authored by tarek's avatar tarek

unknown setuptools version can be added in the working set, refs #90

--HG--
branch : distribute
extra : rebase_source : c0aabd45025465b61ffd23a2196994f4afece233
parent a0ca582d
......@@ -2,6 +2,13 @@
CHANGES
=======
-----
0.6.9
-----
* Issue 90: unknown setuptools version can be added in the working set
*
-----
0.6.8
-----
......
......@@ -52,6 +52,7 @@ test_suite = setuptools.dist:check_test_suite
eager_resources = setuptools.dist:assert_string_list
zip_safe = setuptools.dist:assert_bool
test_loader = setuptools.dist:check_importable
packages = setuptools.dist:check_packages
convert_2to3_doctests = setuptools.dist:assert_string_list
tests_require = setuptools.dist:check_requirements
......
......@@ -2253,7 +2253,11 @@ class Distribution(object):
loc = loc or self.location
if self.project_name == 'setuptools':
if '0.7' in self.version:
try:
version = self.version
except ValueError:
version = ''
if '0.7' in version:
raise ValueError(
"A 0.7-series setuptools cannot be installed "
"with distribute")
......
......@@ -203,15 +203,12 @@ class DistroTests(TestCase):
version="0.6c9")
ws.add(d2)
# a unexisting version needs to work
ws = WorkingSet([])
d3 = Distribution(
"/some/path",
project_name="setuptools")
ws.add(d3)
class EntryPointTests(TestCase):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment