summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2018-09-16 10:38:22 -0400
committerGitHub <noreply@github.com>2018-09-16 10:38:22 -0400
commitf4286295ce94ccac860b418e074a384349612b25 (patch)
treef8a00d3aae75e75495a5bfff8559c05a682f8036
parent5a58c69518337e8f0d309cb0c9a9027840cd676e (diff)
parent2fabfd3a66e6984bd6fccf07b46356f956af0297 (diff)
downloadpython-setuptools-git-f4286295ce94ccac860b418e074a384349612b25.tar.gz
Merge pull request #1477 from gaborbernat/no-sdist-wheel
build_meta.get_requires_for_build_sdist does not include wheel
-rw-r--r--changelog.d/1474.change.rst1
-rw-r--r--setuptools/build_meta.py11
-rw-r--r--setuptools/tests/test_build_meta.py6
3 files changed, 12 insertions, 6 deletions
diff --git a/changelog.d/1474.change.rst b/changelog.d/1474.change.rst
new file mode 100644
index 00000000..9d40e785
--- /dev/null
+++ b/changelog.d/1474.change.rst
@@ -0,0 +1 @@
+``build_meta.get_requires_for_build_sdist`` now does not include the ``wheel`` package anymore
diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py
index fb657a54..f7f9bda2 100644
--- a/setuptools/build_meta.py
+++ b/setuptools/build_meta.py
@@ -91,9 +91,8 @@ def _fix_config(config_settings):
return config_settings
-def _get_build_requires(config_settings):
+def _get_build_requires(config_settings, requirements):
config_settings = _fix_config(config_settings)
- requirements = ['setuptools', 'wheel']
sys.argv = sys.argv[:1] + ['egg_info'] + \
config_settings["--global-option"]
@@ -113,20 +112,20 @@ def _get_immediate_subdirectories(a_dir):
def get_requires_for_build_wheel(config_settings=None):
config_settings = _fix_config(config_settings)
- return _get_build_requires(config_settings)
+ return _get_build_requires(config_settings, requirements=['setuptools', 'wheel'])
def get_requires_for_build_sdist(config_settings=None):
config_settings = _fix_config(config_settings)
- return _get_build_requires(config_settings)
+ return _get_build_requires(config_settings, requirements=['setuptools'])
def prepare_metadata_for_build_wheel(metadata_directory, config_settings=None):
sys.argv = sys.argv[:1] + ['dist_info', '--egg-base', _to_str(metadata_directory)]
_run_setup()
-
+
dist_info_directory = metadata_directory
- while True:
+ while True:
dist_infos = [f for f in os.listdir(dist_info_directory)
if f.endswith('.dist-info')]
diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index a5aa75a3..f1d517bb 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -107,6 +107,12 @@ def test_get_requires_for_build_wheel(build_backend):
assert sorted(actual) == sorted(expected)
+def test_get_requires_for_build_sdist(build_backend):
+ actual = build_backend.get_requires_for_build_sdist()
+ expected = ['six', 'setuptools']
+ assert sorted(actual) == sorted(expected)
+
+
def test_build_wheel(build_backend):
dist_dir = os.path.abspath('pip-wheel')
os.makedirs(dist_dir)