Skip to content

Commit

Permalink
Revert "Find python dependencies directly in python"
Browse files Browse the repository at this point in the history
This reverts commit e7188c2.
  • Loading branch information
casperlamboo committed Nov 2, 2023
1 parent b0d4d4a commit 293f2eb
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 3 deletions.
4 changes: 1 addition & 3 deletions CuraVersion.py.jinja
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# Copyright (c) 2023 UltiMaker
# Cura is released under the terms of the LGPLv3 or higher.

from pkg_resources import working_set

CuraAppName = "{{ cura_app_name }}"
CuraAppDisplayName = "{{ cura_app_display_name }}"
CuraVersion = "{{ cura_version }}"
Expand All @@ -16,4 +14,4 @@ CuraDigitalFactoryURL = "{{ cura_digital_factory_url }}"
CuraLatestURL = "{{ cura_latest_url }}"

ConanInstalls = {{ conan_installs }}
PythonInstalls = {package.key: {'version': package.version} for package in working_set}
PythonInstalls = {{ python_installs }}
20 changes: 20 additions & 0 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,25 @@ def _conan_installs(self):
}
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):
with open(os.path.join(self.recipe_folder, "CuraVersion.py.jinja"), "r") as f:
cura_version_py = Template(f.read())
Expand All @@ -178,6 +197,7 @@ def _generate_cura_version(self, location):
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"],
conan_installs=self._conan_installs(),
python_installs=self._python_installs(),
))

def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, entitlements_file):
Expand Down

0 comments on commit 293f2eb

Please sign in to comment.