Переход на python 3.10

master 3.7.2.20
parent a8e657dae8
commit 6996934968

@ -4,9 +4,9 @@ import sys
if not any("calculate/contrib" in x for x in sys.path):
for sitedir in site.getsitepackages():
if sitedir.endswith("python3.9/site-packages"):
if sitedir.endswith("python3.10/site-packages"):
for i, syspathdir in enumerate(sys.path):
if syspathdir.endswith("python3.9/site-packages"):
if syspathdir.endswith("python3.10/site-packages"):
contribpath = "%s/calculate/contrib" % syspathdir
if os.path.exists(contribpath):
sys.path.insert(i, contribpath)

@ -3601,7 +3601,7 @@ class templateFunction(_error, _warning, _shareTemplate, _shareTermsFunction,
else:
usrlib = SystemPath(self.objVar.Get('cl_chroot_path')).usrlib
module_path = os.path.join(
usrlib, "python3.9/site-packages/calculate/%s/variables"
usrlib, "python3.10/site-packages/calculate/%s/variables"
% funArgv)
if os.path.exists(module_path):
pkg = "sys-apps/calculate-utils:3"

@ -34,7 +34,7 @@ class X86():
self.cusrlib = path.join(rootdn, "usr/lib")
self.clib = path.join(rootdn, "lib")
self.libmodules = path.join(rootdn, "lib/modules")
self.pythonsite = path.join(rootdn, "usr/lib/python3.9/site-packages")
self.pythonsite = path.join(rootdn, "usr/lib/python3.10/site-packages")
self.libopengl = path.join(rootdn, "usr/lib/opengl")
class Amd64():
@ -45,7 +45,7 @@ class Amd64():
self.cusrlib = path.join(rootdn, "usr/lib")
self.clib = path.join(rootdn, "lib")
self.libmodules = path.join(rootdn, "lib/modules")
self.pythonsite = path.join(rootdn, "usr/lib64/python3.9/site-packages")
self.pythonsite = path.join(rootdn, "usr/lib64/python3.10/site-packages")
self.libopengl = path.join(rootdn, "usr/lib64/opengl")
@cached(each_instance=True)

Loading…
Cancel
Save