diff --git a/bin/BuildSystem/PipBuildSystem.py b/bin/BuildSystem/PipBuildSystem.py index 11290fd1f..476d49890 100644 --- a/bin/BuildSystem/PipBuildSystem.py +++ b/bin/BuildSystem/PipBuildSystem.py @@ -1,44 +1,66 @@ import shutil from BuildSystem.BuildSystemBase import * class PipBuildSystem(BuildSystemBase): def __init__(self): BuildSystemBase.__init__(self, "pip") self.python2 = True self.python3 = True + + def _getPython2(self): + if CraftPackageObject.get("dev-utils/python2").isInstalled: + return "python2" + python2 = CraftCore.cache.findApplication("python2.7") + if CraftCore.compiler.isWindows: + if not python2 and ("Paths", "PYTHON27") in CraftCore.settings: + python2 = CraftCore.cache.findApplication("python", CraftCore.settings.get("Paths", "PYTHON27")) + if not python2: + CraftCore.log.critical(f"Please have a look on {CraftCore.settings.iniPath} and make sure that\n" + "\t[Paths]\n" + "\tPYTHON27\n" + "Points to a valid Python installation.") + return None + return python2 + + def _getPython3(self): + if CraftPackageObject.get("dev-utils/python3").isInstalled: + return "python3" + return sys.executable + @property - def __pythons(self): + def _pythons(self): pythons = [] if self.python2: - pythons.append("python2") + pythons.append(("2", self._getPython2())) if self.python3: - pythons.append("python3") + pythons.append(("3", self._getPython3())) return pythons - def configure(self): - return True + def venvDir(self, ver): + return Path(CraftCore.standardDirs.etcDir()) / "venv" / ver def make(self): if self.subinfo.svnTarget(): - for python in self.__pythons: + for ver, python in self._pythons: if not utils.system([python, "setup.py", "sdist"], cwd=self.sourceDir()): - return True + return False return True def install(self): ok = True - - for python in self.__pythons: + for ver, python in self._pythons: command = [python, "-m", "pip", "install", "--upgrade"] + if not self.venvDir(ver).exists(): + command += ["--user"] if self.subinfo.svnTarget(): command += ["-e", self.sourceDir()] else: command += [self.package.name] ok = ok and utils.system(command) return ok def runTest(self): return False diff --git a/bin/CraftSetupHelper.py b/bin/CraftSetupHelper.py index 51e55c9c7..9a8c8eeb3 100644 --- a/bin/CraftSetupHelper.py +++ b/bin/CraftSetupHelper.py @@ -1,447 +1,451 @@ # -*- coding: utf-8 -*- # Copyright Hannah von Reth # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. import argparse import collections import os import platform import shutil import subprocess import sys from CraftCore import CraftCore from CraftOS.osutils import OsUtils from Utils.CaseInsensitiveDict import CaseInsensitiveDict # The minimum python version for craft please edit here # if you add code that changes this requirement MIN_PY_VERSION = (3, 6, 0) def log(msg, critical=False): if critical or not CraftCore.settings.getboolean("ContinuousIntegration", "Enabled", False): CraftCore.debug.print(msg, sys.stderr) else: CraftCore.log.debug(msg) if critical: exit(1) if sys.version_info[0:3] < MIN_PY_VERSION: log("Error: Python too old!\n" "Craft needs at least Python Version %s.%s.%s\n" "Please install it and adapt your CraftSettings.ini" % MIN_PY_VERSION, critical=True) if not platform.machine().endswith("64"): log(f"Craft requires a 64bit operating system. Your are using: {platform.machine()}", critical=True) class SetupHelper(object): CraftVersion = "master" NeedsSetup = "KDEROOT" not in os.environ def __init__(self, args=None): self.args = args if CraftCore.settings.getboolean("General", "AllowAnsiColor", False): OsUtils.enableAnsiColors() if SetupHelper.NeedsSetup: SetupHelper.NeedsSetup = False self.checkForEvilApplication() self.setupEnvironment() @staticmethod def _getOutput(command, shell=False): CraftCore.log.debug(f"SetupHelper._getOutput: {command}") p = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=shell, universal_newlines=True, errors="backslashreplace") out = p.stdout.strip() CraftCore.log.debug(f"SetupHelper._getOutput: return {p.returncode} {out}") return p.returncode, out def run(self): parser = argparse.ArgumentParser() parser.add_argument("--get", action="store_true") parser.add_argument("--print-banner", action="store_true") parser.add_argument("--getenv", action="store_true") parser.add_argument("--setup", action="store_true") parser.add_argument("rest", nargs=argparse.REMAINDER) args = parser.parse_args() if args.get: default = "" if len(args.rest) == 3: default = args.rest[2] CraftCore.log.info(CraftCore.settings.get(args.rest[0], args.rest[1], default)) elif args.print_banner: self.printBanner() elif args.getenv: self.printEnv() elif args.setup: self.printEnv() self.printBanner() def checkForEvilApplication(self): blackList = [] if OsUtils.isWin(): blackList += ["sh", "gcc", "g++", "cpp"] for app in blackList: location = shutil.which(app) if location: location = os.path.dirname(location) if not CraftCore.settings.getboolean("ContinuousIntegration", "Enabled", False): log( f"Found \"{app}\" in your PATH: \"{location}\"\n" f"This application is known to cause problems with your configuration of Craft.\n" f"Please remove it from PATH or manually set a value for PATH in your CraftSettings.ini:\n" f"\n" f"[Environment]\n" f"PATH=" f"\n") else: path = collections.OrderedDict.fromkeys(os.environ["Path"].split(os.path.pathsep)) del path[location] self.addEnvVar("Path", os.path.pathsep.join(path)) @staticmethod def printBanner(): def printRow(name, value): log(f"{name:20}: {value}") printRow("Craft", CraftCore.standardDirs.craftRoot()) printRow("Version", SetupHelper.CraftVersion) printRow("ABI", CraftCore.compiler) printRow("Download directory", CraftCore.standardDirs.downloadDir()) def addEnvVar(self, key, val): os.environ[key] = val def prependEnvVar(self, key : str, var : str, sep : str=os.path.pathsep) -> None: if not type(var) == list: var = [var] if key in os.environ: env = var + os.environ[key].split(sep) var = list(collections.OrderedDict.fromkeys(env)) val = sep.join(var) CraftCore.log.debug(f"Setting {key}={val}") os.environ[key] = val @staticmethod def stringToEnv(string : str): for line in string.strip().split("\n"): kv = line.strip().split("=", 1) if len(kv) != 2: log(f"Failed to parse environment variable: {line}\n{string}") continue # TODO: why? if kv[0] == "Path": kv[0] = "PATH" os.environ[kv[0]] = kv[1] return os.environ @staticmethod def _callVCVER(version : int, args : []=None, native : bool=True, prerelease : bool=False) -> str: if not args: args = [] vswhere = os.path.join(CraftCore.standardDirs.craftBin(), "3rdparty", "vswhere", "vswhere.exe") command = [vswhere, "-property", "installationPath", "-nologo", "-latest"] if prerelease: command += ["-prerelease"] if version: command += ["-version", f"[{version},{version+1})"] if version < 15: command.append("-legacy") else: if not args: args = ["-products", "*"] if native: # this fails with express versions args += ["-requires", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64"] return SetupHelper._getOutput(command + args)[1] @staticmethod def getMSVCEnv(version : int=0, architecture="x86", toolset=None, native=True) -> str: if native: architectures = {"x86": "amd64_x86", "x64": "amd64"} else: architectures = {"x86": "x86", "x64": "x86_amd64"} args = architectures[architecture] path = "" # we prefer newer compiler that provide legacy toolchains if version and version < 16: # are we using msvc2017 with "VC++ 2015.3 v14.00 (v140) toolset for desktop" component = "Microsoft.VisualStudio.Component.VC." if version == 14: component += str(CraftCore.compiler.getMsvcPlatformToolset()) else: component += f"v{CraftCore.compiler.getMsvcPlatformToolset()}.x86.x64" # todo directly get the correct version for v in [16, 15]: path = SetupHelper._callVCVER(v, args=["-products", "*", "-requires", component], native=native) if path: if not toolset: toolset = str(CraftCore.compiler.getMsvcPlatformToolset() / 10) break if toolset: args += f" -vcvars_ver={toolset}" if not path: path = SetupHelper._callVCVER(version, native=native) if not path: path = SetupHelper._callVCVER(version, native=native, prerelease=True) if path: log("Found MSVS only in a prerelease version. I will use that.") if not path: log("Unable to locate Visual Studio. Please install it with the C++ component. Aborting.", critical=True) path = os.path.join(path, "VC") if not os.path.exists(os.path.join(path, "vcvarsall.bat")): path = os.path.join(path, "Auxiliary", "Build") path = os.path.join(path, "vcvarsall.bat") if not os.path.isfile(path): log(f"Failed to setup msvc compiler.\n" f"{path} does not exist.", critical=True) status, result = SetupHelper._getOutput(f"\"{path}\" {args} > NUL && set", shell=True) if status != 0: log(f"Failed to setup msvc compiler.\n" f"Command: {result} ", critical=True) return SetupHelper.stringToEnv(result) def getEnv(self): if CraftCore.compiler.isMSVC(): return SetupHelper.getMSVCEnv(CraftCore.compiler.getInternalVersion(), CraftCore.compiler.architecture, CraftCore.compiler.msvcToolset, CraftCore.compiler.isNative()) elif CraftCore.compiler.isIntel(): architectures = {"x86": "ia32", "x64": "intel64"} programFiles = os.getenv("ProgramFiles(x86)") or os.getenv("ProgramFiles") status, result = SetupHelper._getOutput( "\"%s\\Intel\\Composer XE\\bin\\compilervars.bat\" %s > NUL && set" % ( programFiles, architectures[CraftCore.compiler.architecture]), shell=True) if status != 0: log("Failed to setup intel compiler", critical=True) return SetupHelper.stringToEnv(result) return os.environ def setXDG(self): self.prependEnvVar("XDG_DATA_DIRS", [os.path.join(CraftCore.standardDirs.craftRoot(), "share")]) if OsUtils.isUnix(): self.prependEnvVar("XDG_CONFIG_DIRS", [os.path.join(CraftCore.standardDirs.craftRoot(), "etc", "xdg")]) self.addEnvVar("XDG_DATA_HOME", os.path.join(CraftCore.standardDirs.craftRoot(), "home", os.getenv("USER"), ".local5", "share")) self.addEnvVar("XDG_CONFIG_HOME", os.path.join(CraftCore.standardDirs.craftRoot(), "home", os.getenv("USER"), ".config")) self.addEnvVar("XDG_CACHE_HOME", os.path.join(CraftCore.standardDirs.craftRoot(), "home", os.getenv("USER"), ".cache")) def _setupUnix(self): if CraftCore.compiler.isLinux: self.prependEnvVar("LDFLAGS", "-Wl,-rpath,'$ORIGIN/../lib'", sep=" ") self.prependEnvVar("LD_LIBRARY_PATH", [os.path.join(CraftCore.standardDirs.craftRoot(), "lib"), os.path.join(CraftCore.standardDirs.craftRoot(), "lib", "x86_64-linux-gnu")]) self.prependEnvVar("BISON_PKGDATADIR", os.path.join(CraftCore.standardDirs.craftRoot(), "share", "bison")) self.prependEnvVar("M4", os.path.join(CraftCore.standardDirs.craftRoot(), "dev-utils", "bin", "m4")) def _setupMac(self): #self.prependEnvVar("DYLD_LIBRARY_PATH", os.path.join(CraftCore.standardDirs.craftRoot(), "lib")) # we will later replace the hard coded path in BuildSystemBase.internalPostInstall self.prependEnvVar("LDFLAGS", f"-Wl,-rpath,{os.path.join(CraftCore.standardDirs.craftRoot(), 'lib')}", sep=" ") self.prependEnvVar("BISON_PKGDATADIR", os.path.join(CraftCore.standardDirs.craftRoot(), "share", "bison")) self.prependEnvVar("M4", os.path.join(CraftCore.standardDirs.craftRoot(), "dev-utils", "bin", "m4")) dbusInstalled = CraftCore.installdb.isInstalled("libs/dbus") if dbusInstalled: serviceAgent = os.path.join(CraftCore.standardDirs.craftRoot(), "Library", "LaunchAgents", "org.freedesktop.dbus-session.plist") if os.path.exists(serviceAgent): SetupHelper._getOutput(["launchctl", "load", "-Fw", serviceAgent]) def _setupWin(self): if not "HOME" in os.environ: self.addEnvVar("HOME", os.getenv("USERPROFILE")) if CraftCore.compiler.isMinGW(): if not CraftCore.settings.getboolean("QtSDK", "Enabled", "false"): if CraftCore.compiler.isX86(): self.prependEnvVar("PATH", os.path.join(CraftCore.standardDirs.craftRoot(), "mingw", "bin")) else: self.prependEnvVar("PATH", os.path.join(CraftCore.standardDirs.craftRoot(), "mingw64", "bin")) else: compilerName = CraftCore.settings.get("QtSDK", "Compiler") compilerMap = {"mingw53_32": "mingw530_32"} self.prependEnvVar("PATH", os.path.join(CraftCore.settings.get("QtSDK", "Path"), "Tools", compilerMap.get(compilerName, compilerName), "bin")) if CraftCore.settings.getboolean("QtSDK", "Enabled", "false"): self.prependEnvVar("PATH", os.path.join(CraftCore.settings.get("QtSDK", "Path"), CraftCore.settings.get("QtSDK", "Version"), CraftCore.settings.get("QtSDK", "Compiler"), "bin")) if CraftCore.compiler.isMinGW(): if not CraftCore.settings.getboolean("QtSDK", "Enabled", "false"): if CraftCore.compiler.isX86(): self.prependEnvVar("PATH", os.path.join(CraftCore.standardDirs.craftRoot(), "mingw", "bin")) else: self.prependEnvVar("PATH", os.path.join(CraftCore.standardDirs.craftRoot(), "mingw64", "bin")) else: compilerName = CraftCore.settings.get("QtSDK", "Compiler") compilerMap = {"mingw53_32": "mingw530_32"} self.prependEnvVar("PATH", os.path.join(CraftCore.settings.get("QtSDK", "Path"), "Tools", compilerMap.get(compilerName, compilerName), "bin")) def setupEnvironment(self): originaleEnv = CaseInsensitiveDict(os.environ) for var, value in CraftCore.settings.getSection("Environment"): # set and override existing values # the ini is case insensitive so sections are lowercase.... self.addEnvVar(var.upper(), value) self.prependEnvVar("PATH", os.path.dirname(sys.executable)) os.environ = self.getEnv() self.addEnvVar("KDEROOT", CraftCore.standardDirs.craftRoot()) self.addEnvVar("SSL_CERT_FILE", os.path.join(CraftCore.standardDirs.etcDir(), "cacert.pem")) self.addEnvVar("REQUESTS_CA_BUNDLE", os.path.join(CraftCore.standardDirs.etcDir(), "cacert.pem")) if CraftCore.settings.getboolean("Compile", "UseCCache", False): self.addEnvVar("CCACHE_DIR", CraftCore.settings.get("Paths", "CCACHE_DIR", os.path.join(CraftCore.standardDirs.craftRoot(), "build", "CCACHE"))) if CraftCore.settings.getboolean("QtSDK", "Enabled", "false"): sdkPath = os.path.join(CraftCore.settings.get("QtSDK", "Path"), CraftCore.settings.get("QtSDK", "Version"), CraftCore.settings.get("QtSDK", "Compiler"), "bin") if not os.path.exists(sdkPath): log(f"Please ensure that you have installed the Qt SDK in {sdkPath}", critical=True) self.prependEnvVar("PATH", sdkPath) if OsUtils.isWin(): self._setupWin() elif OsUtils.isMac(): self._setupMac() else: self._setupUnix() PKG_CONFIG_PATH = collections.OrderedDict.fromkeys([os.path.join(CraftCore.standardDirs.craftRoot(), "lib", "pkgconfig")]) if "PKG_CONFIG_PATH" in originaleEnv: PKG_CONFIG_PATH.update(collections.OrderedDict.fromkeys(originaleEnv["PKG_CONFIG_PATH"].split(os.path.pathsep))) else: pkgCOnfig = shutil.which("pkg-config", path=originaleEnv["PATH"]) if pkgCOnfig: out = self._getOutput("pkg-config --variable pc_path pkg-config", shell=True) if out[0] == 0: PKG_CONFIG_PATH.update(collections.OrderedDict.fromkeys(out[1].split(os.path.pathsep))) self.prependEnvVar("PKG_CONFIG_PATH", os.path.pathsep.join(PKG_CONFIG_PATH.keys())) self.prependEnvVar("QT_PLUGIN_PATH", [os.path.join(CraftCore.standardDirs.craftRoot(), "plugins"), os.path.join(CraftCore.standardDirs.craftRoot(), "lib", "plugins"), os.path.join(CraftCore.standardDirs.craftRoot(), "lib64", "plugins"), os.path.join(CraftCore.standardDirs.craftRoot(), "lib", "x86_64-linux-gnu", "plugins"), os.path.join(CraftCore.standardDirs.craftRoot(), "lib", "plugin") ]) self.prependEnvVar("QML2_IMPORT_PATH", [os.path.join(CraftCore.standardDirs.craftRoot(), "qml"), os.path.join(CraftCore.standardDirs.craftRoot(), "lib", "qml"), os.path.join(CraftCore.standardDirs.craftRoot(), "lib64", "qml"), os.path.join(CraftCore.standardDirs.craftRoot(), "lib", "x86_64-linux-gnu", "qml") ]) self.prependEnvVar("QML_IMPORT_PATH", os.environ["QML2_IMPORT_PATH"]) self.prependEnvVar("QT_DATA_DIRS", CraftCore.standardDirs.locations.data) if CraftCore.settings.getboolean("General", "UseSandboxConfig", True): self.setXDG() self.prependEnvVar("PATH", CraftCore.standardDirs.craftBin()) # make sure that craftroot bin is the first to look for dlls etc self.prependEnvVar("PATH", os.path.join(CraftCore.standardDirs.craftRoot(), "bin")) self.prependEnvVar("PATH", os.path.join(CraftCore.standardDirs.craftRoot(), "dev-utils", "bin")) # add python site packages to pythonpath self.prependEnvVar("PYTHONPATH", os.path.join(CraftCore.standardDirs.craftRoot(), "lib", "site-packages")) + # prepend our venv python + self.prependEnvVar("PATH", [os.path.join(CraftCore.standardDirs.etcDir(), "venv", "3", "Scripts")]) + + if CraftCore.compiler.isClang(): if OsUtils.isUnix(): self.addEnvVar("CC", "/usr/bin/clang") self.addEnvVar("CXX", "/usr/bin/clang++") else: if CraftCore.compiler.isMSVC(): self.addEnvVar("CC", "clang-cl") self.addEnvVar("CXX", "clang-cl") else: self.addEnvVar("CC", "clang") self.addEnvVar("CXX", "clang") elif CraftCore.compiler.isGCC(): if not CraftCore.compiler.isNative() and CraftCore.compiler.isX86(): self.addEnvVar("CC", "gcc -m32") self.addEnvVar("CXX", "g++ -m32") self.addEnvVar("AS", "gcc -c -m32") else: self.addEnvVar("CC", "gcc") self.addEnvVar("CXX", "g++") if CraftCore.settings.getboolean("General", "AllowAnsiColor", False): # different non standard env switches self.addEnvVar("CLICOLOR_FORCE", "1") self.addEnvVar("CLICOLOR", "1") self.addEnvVar("ANSICON", "1") if CraftCore.compiler.isClang() and CraftCore.compiler.isMSVC(): self.prependEnvVar("CFLAGS", "-fcolor-diagnostics -fansi-escape-codes", sep=" ") self.prependEnvVar("CXXFLAGS", "-fcolor-diagnostics -fansi-escape-codes", sep=" ") elif CraftCore.compiler.isGCCLike(): self.prependEnvVar("CFLAGS", "-fdiagnostics-color=always", sep=" ") self.prependEnvVar("CXXFLAGS", "-fdiagnostics-color=always", sep=" ") if OsUtils.isWin(): os.environ["TERM"] = "xterm-color" # pretend to be a common smart terminal def printEnv(self): self.setupEnvironment() for key, val in os.environ.items(): if "\n" in val: log(f"Not adding ${key} to environment since it contains " "a newline character and that breaks craftenv.sh") continue if key.startswith("BASH_FUNC_"): continue # weird protected env vars if key in {"PROFILEREAD"}: continue CraftCore.log.info(f"{key}={val}") @property def version(self): return CraftCore.settings.version helper = SetupHelper() if __name__ == '__main__': helper.run() diff --git a/bin/Package/PipPackageBase.py b/bin/Package/PipPackageBase.py index 47b52ac85..af746b6d8 100644 --- a/bin/Package/PipPackageBase.py +++ b/bin/Package/PipPackageBase.py @@ -1,28 +1,33 @@ from BuildSystem.PipBuildSystem import * from Package.PackageBase import * from Packager.PackagerBase import * from Package.VirtualPackageBase import * from Source.MultiSource import * class PipPackageBase(PackageBase, PipBuildSystem, PackagerBase): """provides a base class for pip packages""" def __init__(self): CraftCore.log.debug("PipPackageBase.__init__ called") PackageBase.__init__(self) if self.subinfo.svnTarget(): self.__class__.__bases__ += (MultiSource,) MultiSource.__init__(self) else: self.__class__.__bases__ += (VirtualPackageBase,) VirtualPackageBase.__init__(self) PipBuildSystem.__init__(self) PackagerBase.__init__(self) - # from PackagerBase def createPackage(self): return True def preArchive(self): return True + + def make(self): + return PipBuildSystem.make(self) + + def install(self): + return PipBuildSystem.install(self) diff --git a/blueprints/dev-utils/python2/python2.py b/blueprints/dev-utils/python2/python2.py index 747dc2ffc..b503dce04 100644 --- a/blueprints/dev-utils/python2/python2.py +++ b/blueprints/dev-utils/python2/python2.py @@ -1,34 +1,26 @@ import info from Package.BinaryPackageBase import * class subinfo(info.infoclass): def setTargets(self): self.targets["2"] = "" self.defaultTarget = "2" self.targetInstallPath["2"] = "dev-utils" self.patchLevel["2"] = 2 + def setDependencies(self): + self.runtimeDependencies["python-modules/pip"] = None + self.runtimeDependencies["python-modules/virtualenv"] = None class Package(BinaryPackageBase): def __init__(self): BinaryPackageBase.__init__(self) self.subinfo.options.package.disableBinaryCache = True def install(self): if not BinaryPackageBase.install(self): return False - python2 = CraftCore.cache.findApplication("python2.7") - if CraftCore.compiler.isWindows: - if not python2 and ("Paths", "PYTHON27") in CraftCore.settings: - python2 = CraftCore.cache.findApplication("python", CraftCore.settings.get("Paths", "PYTHON27")) - if not python2: - CraftCore.log.critical(f"Please have a look on {CraftCore.settings.iniPath} and make sure that\n" - "\t[Paths]\n" - "\tPYTHON27\n" - "Points to a valid Python installation.") - return False - return (utils.createShim(os.path.join(self.installDir(), "bin", f"python{CraftCore.compiler.executableSuffix}"), python2, useAbsolutePath=True) and - utils.createShim(os.path.join(self.installDir(), "bin", f"python2{CraftCore.compiler.executableSuffix}"), python2, useAbsolutePath=True)) - - + return utils.createShim(os.path.join(self.installDir(), "bin", f"python2{CraftCore.compiler.executableSuffix}"), + Path(CraftCore.standardDirs.etcDir()) / f"venv/2/Scripts/python{CraftCore.compiler.executableSuffix}", + useAbsolutePath=True) \ No newline at end of file diff --git a/blueprints/dev-utils/python3/python3.py b/blueprints/dev-utils/python3/python3.py index fe6fef866..882330905 100644 --- a/blueprints/dev-utils/python3/python3.py +++ b/blueprints/dev-utils/python3/python3.py @@ -1,21 +1,26 @@ import info from Package.BinaryPackageBase import * class subinfo(info.infoclass): def setTargets(self): self.targets["3"] = "" self.patchLevel["3"] = 3 self.targetInstallPath["3"] = "dev-utils" self.defaultTarget = "3" + def setDependencies(self): + self.runtimeDependencies["python-modules/pip"] = None + self.runtimeDependencies["python-modules/virtualenv"] = None class Package(BinaryPackageBase): def __init__(self): BinaryPackageBase.__init__(self) self.subinfo.options.package.disableBinaryCache = True def install(self): if not BinaryPackageBase.install(self): return False - return utils.createShim(os.path.join(self.installDir(), "bin", f"python3{CraftCore.compiler.executableSuffix}"), sys.executable, useAbsolutePath=True) + return utils.createShim(os.path.join(self.installDir(), "bin", f"python3{CraftCore.compiler.executableSuffix}"), + Path(CraftCore.standardDirs.etcDir()) / f"venv/3/Scripts/python{CraftCore.compiler.executableSuffix}", + useAbsolutePath=True) diff --git a/blueprints/python-modules/pip/pip.py b/blueprints/python-modules/pip/pip.py index d525c19d5..ecd7bcda5 100644 --- a/blueprints/python-modules/pip/pip.py +++ b/blueprints/python-modules/pip/pip.py @@ -1,41 +1,36 @@ import info from Package.MaybeVirtualPackageBase import * from pathlib import Path import sys from Package.PipPackageBase import PipPackageBase class subinfo(info.infoclass): def setTargets(self): self.targets["master"] = f"https://bootstrap.pypa.io/get-pip.py" self.defaultTarget = "master" - def setDependencies(self): - self.runtimeDependencies["virtual/bin-base"] = None - - from Package.BinaryPackageBase import * - class PPackage(BinaryPackageBase): def __init__(self): BinaryPackageBase.__init__(self) def unpack(self): get_pip = self.localFilePathe()[0] return (utils.system([sys.executable, get_pip]) and utils.deleteFile(get_pip)) class PipPackage(PipPackageBase): def __init__(self, **args): PipPackageBase.__init__(self) class Package(MaybeVirtualPackageBase): def __init__(self): root = Path(CraftCore.standardDirs.craftRoot()) py = Path(sys.executable) MaybeVirtualPackageBase.__init__(self, condition=root in py.parents, classA=PPackage, classB=PipPackage) diff --git a/blueprints/python-modules/virtualenv/virtualenv.py b/blueprints/python-modules/virtualenv/virtualenv.py new file mode 100644 index 000000000..106ec6a4b --- /dev/null +++ b/blueprints/python-modules/virtualenv/virtualenv.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +import info +from Package.PipPackageBase import * + + +class subinfo(info.infoclass): + + def setTargets(self): + self.svnTargets['master'] = '' + self.defaultTarget = 'master' + + def setDependencies(self): + self.runtimeDependencies["python-modules/pip"] = None + +class Package(PipPackageBase): + def __init__(self, **args): + PipPackageBase.__init__(self) + + def postInstall(self): + for ver, python in self._pythons: + if not self.venvDir(ver).exists(): + if not utils.system([python, "-m", "venv" if ver == "3" else "virtualenv", self.venvDir(ver)]): + return False + return True diff --git a/blueprints/virtual/base/base.py b/blueprints/virtual/base/base.py index 853d6996f..df89c7043 100644 --- a/blueprints/virtual/base/base.py +++ b/blueprints/virtual/base/base.py @@ -1,56 +1,59 @@ import info from Package.VirtualPackageBase import * class subinfo(info.infoclass): def setTargets(self): self.targets['0.2'] = "" self.defaultTarget = '0.2' def setDependencies(self): # The order is important self.buildDependencies["core/cacert"] = None if CraftCore.compiler.isWindows: self.buildDependencies["dev-utils/7zip"] = None self.buildDependencies["dev-utils/wget"] = None self.buildDependencies["dev-utils/git"] = None self.buildDependencies["dev-utils/kshimgen"] = None self.buildDependencies["dev-utils/cmake"] = None else: self.buildDependencies["dev-utils/cmake"] = None self.buildDependencies["dev-utils/7zip"] = None + self.buildDependencies["python-modules/virtualenv"] = None + self.buildDependencies["dev-utils/python3"] = None + self.buildDependencies["dev-utils/patch"] = None self.buildDependencies["dev-utils/sed"] = None self.buildDependencies["dev-utils/automake"] = None self.buildDependencies["dev-utils/libtool"] = None if CraftCore.compiler.isMacOS: self.buildDependencies["dev-utils/create-dmg"] = None if CraftCore.compiler.isMinGW(): self.buildDependencies["dev-utils/mingw-w64"] = None if CraftCore.settings.get("Compile", "MakeProgram", "") == "jom": self.buildDependencies["dev-utils/jom"] = None if CraftCore.settings.getboolean("Compile", "UseNinja", False): self.buildDependencies["dev-utils/ninja"] = None if CraftCore.settings.getboolean("Compile", "UseCCache", False): self.buildDependencies["dev-utils/ccache"] = None # needed by CollectionPackagerBase if (CraftCore.settings.getboolean("QtSDK", "Enabled", False) and CraftCore.settings.getboolean("QtSDK","PackageQtSDK",True)): self.buildDependencies["dev-utils/dependencies"] = None self.buildDependencies["craft/craft-blueprints-kde"] = None self.buildDependencies["craft/craft-core"] = None self.runtimeDependencies["libs/runtime"] = None if CraftCore.settings.getboolean("General", "AllowAnsiColor", False): self.buildDependencies["python-modules/coloredlogs"] = None class Package(VirtualPackageBase): def __init__(self): VirtualPackageBase.__init__(self)