mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-07-08 17:41:46 +08:00
Revert "Find python dependencies directly in python"
This reverts commit e7188c2f9f92b6c9a695d850a987aab0bed5de08.
This commit is contained in:
parent
b0d4d4a0e7
commit
293f2ebda9
@ -1,8 +1,6 @@
|
|||||||
# Copyright (c) 2023 UltiMaker
|
# Copyright (c) 2023 UltiMaker
|
||||||
# Cura is released under the terms of the LGPLv3 or higher.
|
# Cura is released under the terms of the LGPLv3 or higher.
|
||||||
|
|
||||||
from pkg_resources import working_set
|
|
||||||
|
|
||||||
CuraAppName = "{{ cura_app_name }}"
|
CuraAppName = "{{ cura_app_name }}"
|
||||||
CuraAppDisplayName = "{{ cura_app_display_name }}"
|
CuraAppDisplayName = "{{ cura_app_display_name }}"
|
||||||
CuraVersion = "{{ cura_version }}"
|
CuraVersion = "{{ cura_version }}"
|
||||||
@ -16,4 +14,4 @@ CuraDigitalFactoryURL = "{{ cura_digital_factory_url }}"
|
|||||||
CuraLatestURL = "{{ cura_latest_url }}"
|
CuraLatestURL = "{{ cura_latest_url }}"
|
||||||
|
|
||||||
ConanInstalls = {{ conan_installs }}
|
ConanInstalls = {{ conan_installs }}
|
||||||
PythonInstalls = {package.key: {'version': package.version} for package in working_set}
|
PythonInstalls = {{ python_installs }}
|
||||||
|
20
conanfile.py
20
conanfile.py
@ -152,6 +152,25 @@ class CuraConan(ConanFile):
|
|||||||
}
|
}
|
||||||
return conan_installs
|
return conan_installs
|
||||||
|
|
||||||
|
def _python_installs(self):
|
||||||
|
python_installs = {}
|
||||||
|
|
||||||
|
# list of python installs
|
||||||
|
outer = '"' if self.settings.os == "Windows" else "'"
|
||||||
|
inner = "'" if self.settings.os == "Windows" else '"'
|
||||||
|
python_ins_cmd = f"python -c {outer}import pkg_resources; print({inner};{inner}.join([(s.key+{inner},{inner}+ s.version) for s in pkg_resources.working_set])){outer}"
|
||||||
|
from six import StringIO
|
||||||
|
buffer = StringIO()
|
||||||
|
self.run(python_ins_cmd, run_environment= True, env = "conanrun", output=buffer)
|
||||||
|
|
||||||
|
packages = str(buffer.getvalue()).split("-----------------\n")
|
||||||
|
packages = packages[1].strip('\r\n').split(";")
|
||||||
|
for package in packages:
|
||||||
|
name, version = package.split(",")
|
||||||
|
python_installs[name] = {"version": version}
|
||||||
|
|
||||||
|
return python_installs
|
||||||
|
|
||||||
def _generate_cura_version(self, location):
|
def _generate_cura_version(self, location):
|
||||||
with open(os.path.join(self.recipe_folder, "CuraVersion.py.jinja"), "r") as f:
|
with open(os.path.join(self.recipe_folder, "CuraVersion.py.jinja"), "r") as f:
|
||||||
cura_version_py = Template(f.read())
|
cura_version_py = Template(f.read())
|
||||||
@ -178,6 +197,7 @@ class CuraConan(ConanFile):
|
|||||||
cura_digital_factory_url = self.conan_data["urls"][self._urls]["digital_factory_url"],
|
cura_digital_factory_url = self.conan_data["urls"][self._urls]["digital_factory_url"],
|
||||||
cura_latest_url=self.conan_data["urls"][self._urls]["cura_latest_url"],
|
cura_latest_url=self.conan_data["urls"][self._urls]["cura_latest_url"],
|
||||||
conan_installs=self._conan_installs(),
|
conan_installs=self._conan_installs(),
|
||||||
|
python_installs=self._python_installs(),
|
||||||
))
|
))
|
||||||
|
|
||||||
def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, entitlements_file):
|
def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, entitlements_file):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user