diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2019-12-21 22:04:09 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2019-12-21 22:28:35 -0500 |
| commit | edaf1b50fa59eff57fdcaddf0a53431b9612e7a7 (patch) | |
| tree | b8c5d520c0901ddae5d1420a9d2afb64371baac6 | |
| parent | 88c70244ba0ac03a1c6fbe32838ad34b9864f24d (diff) | |
| download | python-setuptools-git-pr1887-rebase.tar.gz | |
Simplify warning.pr1887-rebase
| -rw-r--r-- | setuptools/command/sdist.py | 5 | ||||
| -rw-r--r-- | setuptools/tests/test_manifest.py | 7 |
2 files changed, 4 insertions, 8 deletions
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py index f40b782b..7a1f7915 100644 --- a/setuptools/command/sdist.py +++ b/setuptools/command/sdist.py @@ -136,9 +136,8 @@ class sdist(sdist_add_defaults, orig.sdist): """ if self.distribution.include_package_data: self.warn( - "Either specify package_data manually, or use " - "include_package_data=True, but not both. Proceeding as if " - "package_data was not specified." + "Distutils 'package_data' ignored due to " + "'include_package_data'." ) return () return build_py.data_files diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py index c83f9a7c..25e65ce5 100644 --- a/setuptools/tests/test_manifest.py +++ b/setuptools/tests/test_manifest.py @@ -624,8 +624,5 @@ class TestFileListTest(TempDirTestCase): mm.warn = mock.Mock() mm.run() - mm.warn.assert_called_with( - "Either specify package_data manually, or use " - "include_package_data=True, but not both. Proceeding as if " - "package_data was not specified." - ) + msg = "Distutils 'package_data' ignored due to 'include_package_data'." + mm.warn.assert_called_with(msg) |