diff options
| author | Daniel Holth <dholth@fastmail.fm> | 2012-08-25 15:26:08 -0400 |
|---|---|---|
| committer | Daniel Holth <dholth@fastmail.fm> | 2012-08-25 15:26:08 -0400 |
| commit | 776fdebc918822b57286ac7a2107f8766f43ce56 (patch) | |
| tree | 956ab58be2c232dbf2fcc0bde3ec8d8e23369dc6 /setuptools/tests/test_dist_info.py | |
| parent | 977f4db35a9390a3e10cd184f69fb2d42886b639 (diff) | |
| download | external_python_setuptools-776fdebc918822b57286ac7a2107f8766f43ce56.tar.gz external_python_setuptools-776fdebc918822b57286ac7a2107f8766f43ce56.tar.bz2 external_python_setuptools-776fdebc918822b57286ac7a2107f8766f43ce56.zip | |
add markerlib as _markerlib
--HG--
branch : distribute
extra : rebase_source : b9d8fa81db6c6fc3d89db54a70778eb3e8396e17
Diffstat (limited to 'setuptools/tests/test_dist_info.py')
| -rw-r--r-- | setuptools/tests/test_dist_info.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py index 001c4433..70dce2d4 100644 --- a/setuptools/tests/test_dist_info.py +++ b/setuptools/tests/test_dist_info.py @@ -7,7 +7,7 @@ import unittest import textwrap try: - import markerlib + import _markerlib except: pass @@ -34,8 +34,8 @@ class TestDistInfo(unittest.TestCase): assert versioned.version == '2.718' # from filename assert unversioned.version == '0.3' # from METADATA - @skipIf('markerlib' not in globals(), - "install markerlib to test conditional dependencies") + @skipIf('_markerlib' not in globals(), + "_markerlib is used to test conditional dependencies (Python >= 2.5)") def test_conditional_dependencies(self): requires = [pkg_resources.Requirement.parse('splort==4'), pkg_resources.Requirement.parse('quux>=1.1')] @@ -51,7 +51,8 @@ class TestDistInfo(unittest.TestCase): 'VersionedDistribution-2.718.dist-info') os.mkdir(versioned) open(os.path.join(versioned, 'METADATA'), 'w+').write(DALS( - """Metadata-Version: 1.2 + """ + Metadata-Version: 1.2 Name: VersionedDistribution Requires-Dist: splort (4) Provides-Extra: baz @@ -62,7 +63,8 @@ class TestDistInfo(unittest.TestCase): 'UnversionedDistribution.dist-info') os.mkdir(unversioned) open(os.path.join(unversioned, 'METADATA'), 'w+').write(DALS( - """Metadata-Version: 1.2 + """ + Metadata-Version: 1.2 Name: UnversionedDistribution Version: 0.3 Requires-Dist: splort (==4) |