From ed22402b7b41f608eaacebaae67c805503904f7d Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Wed, 14 Nov 2018 18:07:37 +0000 Subject: Backend should not say that setuptools is needed to build --- setuptools/build_meta.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'setuptools/build_meta.py') diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py index 0067a7ac..463d3757 100644 --- a/setuptools/build_meta.py +++ b/setuptools/build_meta.py @@ -112,12 +112,12 @@ 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, requirements=['setuptools', 'wheel']) + return _get_build_requires(config_settings, requirements=['wheel']) def get_requires_for_build_sdist(config_settings=None): config_settings = _fix_config(config_settings) - return _get_build_requires(config_settings, requirements=['setuptools']) + return _get_build_requires(config_settings, requirements=[]) def prepare_metadata_for_build_wheel(metadata_directory, config_settings=None): -- cgit v1.2.3 From 731df905fb0282c7255e4e0d4acf339a98e3db7e Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Wed, 2 Jan 2019 14:28:33 -0500 Subject: Always specify formats=gztar, overriding the project's legacy expectation that a zip sdist should be generated. Fixes #1623. --- setuptools/build_meta.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setuptools/build_meta.py') diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py index 463d3757..75178a7a 100644 --- a/setuptools/build_meta.py +++ b/setuptools/build_meta.py @@ -170,7 +170,7 @@ def build_wheel(wheel_directory, config_settings=None, def build_sdist(sdist_directory, config_settings=None): config_settings = _fix_config(config_settings) sdist_directory = os.path.abspath(sdist_directory) - sys.argv = sys.argv[:1] + ['sdist'] + \ + sys.argv = sys.argv[:1] + ['sdist', '--formats', 'gztar'] + \ config_settings["--global-option"] + \ ["--dist-dir", sdist_directory] _run_setup() -- cgit v1.2.3 From cc9305b9106eaf409c01e8a399a00137583e2a04 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Wed, 2 Jan 2019 14:37:45 -0500 Subject: Rely on iterable unpacking to extract one element from generator expression. --- setuptools/build_meta.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'setuptools/build_meta.py') diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py index 463d3757..7f2786c4 100644 --- a/setuptools/build_meta.py +++ b/setuptools/build_meta.py @@ -160,11 +160,11 @@ def build_wheel(wheel_directory, config_settings=None, shutil.rmtree(wheel_directory) shutil.copytree('dist', wheel_directory) - wheels = [f for f in os.listdir(wheel_directory) - if f.endswith('.whl')] + wheels = (f for f in os.listdir(wheel_directory) + if f.endswith('.whl')) - assert len(wheels) == 1 - return wheels[0] + wheel, = wheels + return wheel def build_sdist(sdist_directory, config_settings=None): @@ -175,8 +175,8 @@ def build_sdist(sdist_directory, config_settings=None): ["--dist-dir", sdist_directory] _run_setup() - sdists = [f for f in os.listdir(sdist_directory) - if f.endswith('.tar.gz')] + sdists = (f for f in os.listdir(sdist_directory) + if f.endswith('.tar.gz')) - assert len(sdists) == 1 - return sdists[0] + sdist, = sdists + return sdist -- cgit v1.2.3 From 7378e6be2f8f8a0d96b748e256dfa6b53821c3f6 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Wed, 2 Jan 2019 14:39:37 -0500 Subject: Avoid hanging indent --- setuptools/build_meta.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'setuptools/build_meta.py') diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py index 7f2786c4..5a69d284 100644 --- a/setuptools/build_meta.py +++ b/setuptools/build_meta.py @@ -160,8 +160,10 @@ def build_wheel(wheel_directory, config_settings=None, shutil.rmtree(wheel_directory) shutil.copytree('dist', wheel_directory) - wheels = (f for f in os.listdir(wheel_directory) - if f.endswith('.whl')) + wheels = ( + f for f in os.listdir(wheel_directory) + if f.endswith('.whl') + ) wheel, = wheels return wheel @@ -175,8 +177,10 @@ def build_sdist(sdist_directory, config_settings=None): ["--dist-dir", sdist_directory] _run_setup() - sdists = (f for f in os.listdir(sdist_directory) - if f.endswith('.tar.gz')) + sdists = ( + f for f in os.listdir(sdist_directory) + if f.endswith('.tar.gz') + ) sdist, = sdists return sdist -- cgit v1.2.3 From 2bb8225a6efa6f429d4522f47308b779a48cd07f Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Wed, 2 Jan 2019 14:42:23 -0500 Subject: Extract common behavior into a function --- setuptools/build_meta.py | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'setuptools/build_meta.py') diff --git a/setuptools/build_meta.py b/setuptools/build_meta.py index 5a69d284..02de4427 100644 --- a/setuptools/build_meta.py +++ b/setuptools/build_meta.py @@ -149,6 +149,15 @@ def prepare_metadata_for_build_wheel(metadata_directory, config_settings=None): return dist_infos[0] +def _file_with_extension(directory, extension): + matching = ( + f for f in os.listdir(directory) + if f.endswith(extension) + ) + file, = matching + return file + + def build_wheel(wheel_directory, config_settings=None, metadata_directory=None): config_settings = _fix_config(config_settings) @@ -160,13 +169,7 @@ def build_wheel(wheel_directory, config_settings=None, shutil.rmtree(wheel_directory) shutil.copytree('dist', wheel_directory) - wheels = ( - f for f in os.listdir(wheel_directory) - if f.endswith('.whl') - ) - - wheel, = wheels - return wheel + return _file_with_extension(wheel_directory, '.whl') def build_sdist(sdist_directory, config_settings=None): @@ -177,10 +180,4 @@ def build_sdist(sdist_directory, config_settings=None): ["--dist-dir", sdist_directory] _run_setup() - sdists = ( - f for f in os.listdir(sdist_directory) - if f.endswith('.tar.gz') - ) - - sdist, = sdists - return sdist + return _file_with_extension(sdist_directory, '.tar.gz') -- cgit v1.2.3