diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index ebd51de1ac..3d5da55d6a 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -159,7 +159,9 @@ jobs: else: channel_metadata = f"{channel}_{no_commits}" if is_release_branch: - if latest_branch_version.prerelease == "": + if latest_branch_version.prerelease == "" and branch_version > latest_branch_version: + actual_version = f"{branch_version.major}.{branch_version.minor}.0-beta.1+{buildmetadata}{channel_metadata}" + elif latest_branch_version.prerelease == "": # An actual full release has been created, we are working on patch bump_up_patch = int(latest_branch_version.patch) + 1 actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{bump_up_patch}-beta.1+{buildmetadata}{channel_metadata}" diff --git a/conandata.yml b/conandata.yml index 5c5dcd452d..b615341776 100644 --- a/conandata.yml +++ b/conandata.yml @@ -10,15 +10,15 @@ # requirements (use the /(latest)@ultimaker/testing) # # Subject to change in the future! -"5.3.0": +"5.3.0-beta": requirements: - "pyarcus/5.2.2" - - "curaengine/5.3.0" + - "curaengine/(latest)@ultimaker/stable" - "pysavitar/5.2.2" - "pynest2d/5.2.2" - - "uranium/5.3.0" - - "fdm_materials/5.3.0" - - "cura_binary_data/5.3.0" + - "uranium/(latest)@ultimaker/stable" + - "fdm_materials/(latest)@ultimaker/stable" + - "cura_binary_data/(latest)@ultimaker/stable" - "cpython/3.10.4" internal_requirements: - "fdm_materials_private/(latest)@ultimaker/testing" @@ -120,15 +120,15 @@ Windows: "./icons/Cura.ico" Macos: "./icons/cura.icns" Linux: "./icons/cura-128.png" -"5.3.0-beta": +"5.3.0": requirements: - "pyarcus/5.2.2" - - "curaengine/(latest)@ultimaker/stable" + - "curaengine/5.3.0" - "pysavitar/5.2.2" - "pynest2d/5.2.2" - - "uranium/(latest)@ultimaker/stable" - - "fdm_materials/(latest)@ultimaker/stable" - - "cura_binary_data/(latest)@ultimaker/stable" + - "uranium/5.3.0" + - "fdm_materials/5.3.0" + - "cura_binary_data/5.3.0" - "cpython/3.10.4" internal_requirements: - "fdm_materials_private/(latest)@ultimaker/testing" diff --git a/conanfile.py b/conanfile.py index 7dd3c9db9b..eec875efe6 100644 --- a/conanfile.py +++ b/conanfile.py @@ -179,7 +179,7 @@ class CuraConan(ConanFile): 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"] + pyinstaller_metadata = self.conan_data[self.version]["pyinstaller"] datas = [(str(self._base_dir.joinpath("conan_install_info.json")), ".")] for data in pyinstaller_metadata["datas"].values(): if not self.options.internal and data.get("internal", False): @@ -275,10 +275,10 @@ class CuraConan(ConanFile): raise ConanInvalidConfiguration("Only versions 5+ are support") def requirements(self): - for req in self._um_data()["requirements"]: + for req in self.conan_data[self.version]["requirements"]: self.requires(req) if self.options.internal: - for req in self._um_data()["internal_requirements"]: + for req in self.conan_data[self.version]["internal_requirements"]: self.requires(req) def build_requirements(self): @@ -319,8 +319,8 @@ class CuraConan(ConanFile): if self.options.devtools: entitlements_file = "'{}'".format(Path(self.source_folder, "packaging", "MacOS", "cura.entitlements")) self._generate_pyinstaller_spec(location = self.generators_folder, - entrypoint_location = "'{}'".format(Path(self.source_folder, self._um_data()["runinfo"]["entrypoint"])).replace("\\", "\\\\"), - icon_path = "'{}'".format(Path(self.source_folder, "packaging", self._um_data()["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"), + entrypoint_location = "'{}'".format(Path(self.source_folder, self.conan_data[self.version]["runinfo"]["entrypoint"])).replace("\\", "\\\\"), + icon_path = "'{}'".format(Path(self.source_folder, "packaging", self.conan_data[self.version]["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"), entitlements_file = entitlements_file if self.settings.os == "Macos" else "None") # Update the po files @@ -447,8 +447,8 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV entitlements_file = "'{}'".format(Path(self.cpp_info.res_paths[2], "MacOS", "cura.entitlements")) self._generate_pyinstaller_spec(location = self._base_dir, - entrypoint_location = "'{}'".format(Path(self.cpp_info.bin_paths[0], self._um_data()["runinfo"]["entrypoint"])).replace("\\", "\\\\"), - icon_path = "'{}'".format(Path(self.cpp_info.res_paths[2], self._um_data()["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"), + entrypoint_location = "'{}'".format(Path(self.cpp_info.bin_paths[0], self.conan_data[self.version]["runinfo"]["entrypoint"])).replace("\\", "\\\\"), + icon_path = "'{}'".format(Path(self.cpp_info.res_paths[2], self.conan_data[self.version]["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"), entitlements_file = entitlements_file if self.settings.os == "Macos" else "None") def package(self):