diff options
| author | Paul Ganssle <pganssle@users.noreply.github.com> | 2018-12-28 10:00:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-28 10:00:31 -0500 |
| commit | 4a5f856d87b81772d5e9ba5332b6cb2ebf29b07a (patch) | |
| tree | 21bd5d1584e7640a9e6095b99cccc77209e752a2 | |
| parent | 0902f02d9d68f18e906e727cbafa4a05fe5c9c91 (diff) | |
| parent | a0735f223b82695cc45eb127e072496aa1dbe8f0 (diff) | |
| download | python-setuptools-git-4a5f856d87b81772d5e9ba5332b6cb2ebf29b07a.tar.gz | |
Merge pull request #1613 from pganssle/fix_doctest
Import distribution in doctest
| -rw-r--r-- | setuptools/command/develop.py | 1 | ||||
| -rw-r--r-- | setuptools/tests/test_packageindex.py | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py index 707494eb..009e4f93 100644 --- a/setuptools/command/develop.py +++ b/setuptools/command/develop.py @@ -202,6 +202,7 @@ class VersionlessRequirement: name as the 'requirement' so that scripts will work across multiple versions. + >>> from pkg_resources import Distribution >>> dist = Distribution(project_name='foo', version='1.0') >>> str(dist.as_requirement()) 'foo==1.0' diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py index b7276682..13cffb7e 100644 --- a/setuptools/tests/test_packageindex.py +++ b/setuptools/tests/test_packageindex.py @@ -7,6 +7,7 @@ import distutils.errors from setuptools.extern import six from setuptools.extern.six.moves import urllib, http_client import mock +import pytest import pkg_resources import setuptools.package_index @@ -266,8 +267,9 @@ class TestPackageIndex: url = 'svn+https://svn.example/project#egg=foo' index = setuptools.package_index.PackageIndex() - with mock.patch("os.system") as os_system_mock: - result = index.download(url, str(tmpdir)) + with pytest.warns(UserWarning): + with mock.patch("os.system") as os_system_mock: + result = index.download(url, str(tmpdir)) os_system_mock.assert_called() |