diff options
author | joeydelarago <joeydelarago@gmail.com> | 2022-08-15 16:59:08 +0300 |
---|---|---|
committer | joeydelarago <joeydelarago@gmail.com> | 2022-08-15 16:59:08 +0300 |
commit | a20e7bf8d9792c81e655c2003e55d7f12daa6ff2 (patch) | |
tree | be1d52387f007a98f2d376f9f4f869a9de3d9e1c | |
parent | 57d739a848dc96a4d38b7ae6f8d3a61b69c2467c (diff) |
Add cura latest.json url to template so it can be set from the conanfile.
CURA-9272
-rw-r--r-- | CuraVersion.py.jinja | 1 | ||||
-rw-r--r-- | conanfile.py | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/CuraVersion.py.jinja b/CuraVersion.py.jinja index 1c30a0b5af..1c8ff0551c 100644 --- a/CuraVersion.py.jinja +++ b/CuraVersion.py.jinja @@ -11,3 +11,4 @@ CuraCloudAPIVersion = "{{ cura_cloud_api_version }}" CuraCloudAccountAPIRoot = "{{ cura_cloud_account_api_root }}" CuraMarketplaceRoot = "{{ cura_marketplace_root }}" CuraDigitalFactoryURL = "{{ cura_digital_factory_url }}" +CuraLatestURL = "{{ cura_latest_url }}" diff --git a/conanfile.py b/conanfile.py index a07500e17a..87dfd175ad 100644 --- a/conanfile.py +++ b/conanfile.py @@ -101,6 +101,10 @@ class CuraConan(ConanFile): return "https://digitalfactory-staging.ultimaker.com" if self._staging else "https://digitalfactory.ultimaker.com" @property + def _cura_latest_url(self): + return "https://raw.githubusercontent.com/Ultimaker/Uranium/CURA-9272_semver_postfix/tests/latest.json" + + @property def requirements_txts(self): if self.options.devtools: return ["requirements.txt", "requirements-ultimaker.txt", "requirements-dev.txt"] @@ -161,7 +165,8 @@ class CuraConan(ConanFile): cura_cloud_api_version = self.options.cloud_api_version, cura_cloud_account_api_root = self._cloud_account_api_root, cura_marketplace_root = self._marketplace_root, - cura_digital_factory_url = self._digital_factory_url)) + cura_digital_factory_url = self._digital_factory_url, + cura_latest_url = self._cura_latest_url)) def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, entitlements_file): pyinstaller_metadata = self._um_data()["pyinstaller"] |