From 63bcb1ba4a1b211f219b1b47aa4b3ad85a8b7a77 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 6 Mar 2018 08:23:59 +0100 Subject: Clean up submodules Remove obsolete modules and superfluous logic. Change-Id: I35d3a1c2feca20da1a255eb497257ff386138138 Reviewed-by: Cristian Maureira-Fredes Reviewed-by: Alexandru Croitor --- setup.py | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index ccce48e9c..94fecfb4e 100644 --- a/setup.py +++ b/setup.py @@ -161,9 +161,7 @@ __version__ = get_package_version() containedModules = ['shiboken2', 'pyside2', 'pyside2-tools'] # Git submodules: ["submodule_name", "location_relative_to_sources_folder"] -submodules = [["pyside2-tools"], - ["pyside2-examples"], - ["wiki", ".."]] +submodules = [["pyside2-tools"]] pyside_package_dir_name = "pyside_package" @@ -223,14 +221,6 @@ from utils import find_files_using_glob from textwrap import dedent -# guess a close folder name for extensions -def get_extension_folder(ext): - candidates = list(containedModules) - for gitModules in submodules: - candidates.append(gitModules[0]) - folder = difflib.get_close_matches(ext, candidates)[0] - return folder - # make sure that setup.py is run with an allowed python version def check_allowed_python_version(): import re @@ -368,12 +358,6 @@ if os.path.dirname(this_file): def is_debug_python(): return getattr(sys, "gettotalrefcount", None) is not None -if OPTION_NOEXAMPLES: - # Remove pyside2-examples from submodules so they will not be included. - for idx, item in enumerate(submodules): - if item[0].startswith('pyside2-examples'): - del submodules[idx] - # Return a prefix suitable for the _install/_build directory def prefix(): virtualEnvName = os.environ.get('VIRTUAL_ENV', None) @@ -991,7 +975,6 @@ class pyside_build(_build): def build_extension(self, extension): # calculate the subrepos folder name - folder = get_extension_folder(extension) log.info("Building module %s..." % extension) @@ -1019,7 +1002,7 @@ class pyside_build(_build): os.makedirs(module_build_dir) os.chdir(module_build_dir) - module_src_dir = os.path.join(self.sources_dir, folder) + module_src_dir = os.path.join(self.sources_dir, extension) # Build module cmake_cmd = [ -- cgit v1.2.3