diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-12-25 23:44:24 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-12-25 23:44:24 -0500 |
| commit | ad94a89f7d3103b1dc23553fbb72de75eac68f1d (patch) | |
| tree | a0505145c55df1fc230bb5ad76cec6ee33e8d935 /setuptools | |
| parent | 886e99ae6c47087b29bc28e81cbd1d3dfec84b4f (diff) | |
| parent | 7648e18df3bb35335f455d6026252393a3e84a2d (diff) | |
| download | python-setuptools-git-ad94a89f7d3103b1dc23553fbb72de75eac68f1d.tar.gz | |
Merge master with remove-svn
Diffstat (limited to 'setuptools')
| -rw-r--r-- | setuptools/tests/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py index d6a4542e..48b29c4c 100644 --- a/setuptools/tests/__init__.py +++ b/setuptools/tests/__init__.py @@ -20,7 +20,7 @@ from setuptools.depends import Require def additional_tests(): suite = unittest.TestSuite(( doctest.DocFileSuite( - os.path.join('tests', 'api_tests.txt'), + 'api_tests.txt', optionflags=doctest.ELLIPSIS, package='pkg_resources', ), )) |