diff options
Diffstat (limited to 'build_scripts')
| -rw-r--r-- | build_scripts/config.py | 5 | ||||
| -rw-r--r-- | build_scripts/main.py | 4 | ||||
| -rw-r--r-- | build_scripts/utils.py | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/build_scripts/config.py b/build_scripts/config.py index cad4e2f57..edd7fdbf7 100644 --- a/build_scripts/config.py +++ b/build_scripts/config.py @@ -88,8 +88,6 @@ class Config(object): 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.3', - 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', @@ -135,6 +133,8 @@ class Config(object): setup_kwargs['zip_safe'] = False setup_kwargs['cmdclass'] = cmd_class_dict setup_kwargs['version'] = package_version + setup_kwargs['python_requires'] = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <3.8" + if quiet: # Tells distutils / setuptools to be quiet, and only print warnings or errors. @@ -174,6 +174,7 @@ class Config(object): 'Environment :: Win32 (MS Windows)', 'Intended Audience :: Developers', 'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)', + 'License :: Other/Proprietary License', 'Operating System :: MacOS :: MacOS X', 'Operating System :: POSIX', 'Operating System :: POSIX :: Linux', diff --git a/build_scripts/main.py b/build_scripts/main.py index 4d9f95b14..5f536792a 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -705,7 +705,7 @@ class PysideBuild(_build): log.info("Creating install folder {}...".format(self.install_dir)) os.makedirs(self.install_dir) - if not (OPTION_ONLYPACKAGE + if (not OPTION_ONLYPACKAGE and not config.is_internal_shiboken_generator_build_and_part_of_top_level_all()): # Build extensions for ext in config.get_buildable_extensions(): @@ -1056,7 +1056,7 @@ class PysideBuild(_build): OPTION_MACOS_SYSROOT)) else: latest_sdk_path = run_process_output(['xcrun', - '--show-sdk-path']) + '--sdk', 'macosx', '--show-sdk-path']) if latest_sdk_path: latest_sdk_path = latest_sdk_path[0] cmake_cmd.append("-DCMAKE_OSX_SYSROOT={}".format( diff --git a/build_scripts/utils.py b/build_scripts/utils.py index 5375e9f8a..85a2f9e36 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -1141,7 +1141,8 @@ def run_instruction(instruction, error, initial_env=None): def acceptCITestConfiguration(hostOS, hostOSVer, targetArch, compiler): # Disable unsupported CI configs for now # NOTE: String must match with QT CI's storagestruct thrift - if hostOSVer in ["WinRT_10", "WebAssembly", "Ubuntu_18_04"]: + if hostOSVer in ["WinRT_10", "WebAssembly", "Ubuntu_18_04", "Android_ANY"] \ + or hostOSVer.startswith("SLES_"): print("Disabled " + hostOSVer + " from Coin configuration") return False # With 5.11 CI will create two sets of release binaries, one with msvc 2015 and one with msvc 2017 |