aboutsummaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2018-03-06 08:23:59 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2018-03-06 11:43:44 +0000
commit63bcb1ba4a1b211f219b1b47aa4b3ad85a8b7a77 (patch)
tree27d2a5eee1c0b7a98eae60af4b39e62baea312d9 /setup.py
parentc229b32bf7567adebd08a0b1671b0fe9241d3945 (diff)
Clean up submodules
Remove obsolete modules and superfluous logic. Change-Id: I35d3a1c2feca20da1a255eb497257ff386138138 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py21
1 files changed, 2 insertions, 19 deletions
diff --git a/setup.py b/setup.py
index ccce48e9..94fecfb4 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 = [