From 2ef18a67ad29cb0856bd9142c732c36fd84a71bd Mon Sep 17 00:00:00 2001 From: Arcadiy Ivanov Date: Wed, 8 Apr 2020 16:46:39 -0400 Subject: [PATCH] Scaffolding doesn't need `install_dependencies` plugin in startup project fixes #686 --- src/main/python/pybuilder/scaffolding.py | 5 ++--- src/unittest/python/scaffolding_tests.py | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/python/pybuilder/scaffolding.py b/src/main/python/pybuilder/scaffolding.py index 8cdff227f..b6bb546fb 100644 --- a/src/main/python/pybuilder/scaffolding.py +++ b/src/main/python/pybuilder/scaffolding.py @@ -45,8 +45,7 @@ def collect_project_information(): dir_source_main_python = prompt_user('Source directory', DEFAULT_SOURCE_DIRECTORY) dir_docs = prompt_user('Docs directory', DEFAULT_DOCS_DIRECTORY) - dir_source_unittest_python = prompt_user( - 'Unittest directory', DEFAULT_UNITTEST_DIRECTORY) + dir_source_unittest_python = prompt_user('Unittest directory', DEFAULT_UNITTEST_DIRECTORY) dir_source_main_scripts = prompt_user("Scripts directory", DEFAULT_SCRIPTS_DIRECTORY) plugins = suggest_plugins(PLUGINS_TO_SUGGEST) @@ -242,7 +241,7 @@ def __init__(self, project_name): self.dir_source_main_scripts = DEFAULT_SCRIPTS_DIRECTORY self.dir_docs = DEFAULT_DOCS_DIRECTORY self.core_imports = ['use_plugin'] - self.plugins = ['python.core', 'python.unittest', 'python.install_dependencies'] + self.plugins = ['python.core', 'python.unittest'] self.initializer = '' def add_plugins(self, plugins): diff --git a/src/unittest/python/scaffolding_tests.py b/src/unittest/python/scaffolding_tests.py index 33b5e6563..2a939c087 100644 --- a/src/unittest/python/scaffolding_tests.py +++ b/src/unittest/python/scaffolding_tests.py @@ -84,7 +84,6 @@ def test_should_render_build_descriptor_with_custom_dirs(self): use_plugin("python.core") use_plugin("python.unittest") -use_plugin("python.install_dependencies") name = "some-project" @@ -105,7 +104,6 @@ def test_should_render_build_descriptor_without_custom_dirs(self): use_plugin("python.core") use_plugin("python.unittest") -use_plugin("python.install_dependencies") name = "some-project"