From b0cc2f2822ab1d5cfa24142f6667b042f04bbc46 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Thu, 23 Feb 2023 16:41:01 +0100 Subject: [PATCH 1/4] clear the info --- conanfile.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index 16646e160f..bfa3b95b3b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -486,10 +486,7 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV self.runenv_info.append_path("PYTHONPATH", os.path.join(self.source_folder, "plugins")) def package_id(self): - del self.info.settings.os - del self.info.settings.compiler - del self.info.settings.build_type - del self.info.settings.arch + self.info.clear() # The following options shouldn't be used to determine the hash, since these are only used to set the CuraVersion.py # which will als be generated by the deploy method during the `conan install cura/5.1.0@_/_` From 9140553e70249b30dcccf9b31b3d6c17d22d43c2 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Thu, 23 Feb 2023 16:41:24 +0100 Subject: [PATCH 2/4] Revert "Use latest stable packages" This reverts commit 6c7223f92b13bf54e3a5a7f72dae37313503abe8. --- conanfile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conanfile.py b/conanfile.py index bfa3b95b3b..c6b73451ab 100644 --- a/conanfile.py +++ b/conanfile.py @@ -284,11 +284,11 @@ class CuraConan(ConanFile): def requirements(self): self.requires("pyarcus/5.2.2") - self.requires("curaengine/(latest)@ultimaker/stable") + self.requires("curaengine/5.3.0-beta") self.requires("pysavitar/5.2.2") self.requires("pynest2d/5.2.2") - self.requires("uranium/(latest)@ultimaker/stable") - self.requires("fdm_materials/(latest)@ultimaker/stable") + self.requires("uranium/5.3.0-beta.2") + self.requires("fdm_materials/5.3.0-beta.1+29@ultimaker/stable") self.requires("cura_binary_data/5.3.0-beta") self.requires("cpython/3.10.4") if self.options.internal: From de51e02fe688a29fa84d2e271cae4b75a5dedc0b Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Thu, 23 Feb 2023 17:10:09 +0100 Subject: [PATCH 3/4] Revert "Revert "Use latest stable packages"" This reverts commit 9140553e70249b30dcccf9b31b3d6c17d22d43c2. --- conanfile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conanfile.py b/conanfile.py index c6b73451ab..bfa3b95b3b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -284,11 +284,11 @@ class CuraConan(ConanFile): def requirements(self): self.requires("pyarcus/5.2.2") - self.requires("curaengine/5.3.0-beta") + self.requires("curaengine/(latest)@ultimaker/stable") self.requires("pysavitar/5.2.2") self.requires("pynest2d/5.2.2") - self.requires("uranium/5.3.0-beta.2") - self.requires("fdm_materials/5.3.0-beta.1+29@ultimaker/stable") + self.requires("uranium/(latest)@ultimaker/stable") + self.requires("fdm_materials/(latest)@ultimaker/stable") self.requires("cura_binary_data/5.3.0-beta") self.requires("cpython/3.10.4") if self.options.internal: From 396c7a23cdc4ae41ea30a5887d6353a87b71bdec Mon Sep 17 00:00:00 2001 From: jspijker Date: Mon, 27 Feb 2023 11:50:08 +0100 Subject: [PATCH 4/4] Fix for conan 2.0 --- .github/workflows/conan-recipe-version.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index 28a6a8cdc2..6d0218f609 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -91,8 +91,8 @@ jobs: run: | import subprocess import os - from conans import tools - from conans.errors import ConanException + from conan.tools.scm import Version + from conan.errors import ConanException from git import Repo repo = Repo('.') @@ -108,16 +108,16 @@ jobs: # FIXME: for when we push a tag (such as an release) channel = "testing" if is_tag: - branch_version = tools.Version(ref_name) + branch_version = Version(ref_name) is_release_branch = True channel = "_" user = "_" actual_version = f"{branch_version}" else: try: - branch_version = tools.Version(repo.active_branch.name) + branch_version = Version(repo.active_branch.name) except ConanException: - branch_version = tools.Version('0.0.0') + branch_version = Version('0.0.0') if ref_name == f"{branch_version.major}.{branch_version.minor}": channel = 'stable' is_release_branch = True @@ -130,16 +130,16 @@ jobs: channel = f"pr_{issue_number}" # %% Get the actual version - latest_branch_version = tools.Version("0.0.0") + latest_branch_version = Version("0.0.0") latest_branch_tag = None for tag in repo.git.tag(merged = True).splitlines(): if str(tag).startswith("firmware") or str(tag).startswith("master"): continue # Quick-fix for the versioning scheme name of the embedded team in fdm_materials(_private) repo try: - version = tools.Version(tag) + version = Version(tag) except ConanException: continue - if version > latest_branch_version and version < tools.Version("10.0.0"): + if version > latest_branch_version and version < Version("10.0.0"): # FIXME: stupid old Cura tags 13.04 etc. keep popping up latest_branch_version = version latest_branch_tag = repo.tag(tag) @@ -175,13 +175,13 @@ jobs: bump_up_release_tag = int(latest_branch_version.prerelease.split('.')[1]) + 1 actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.prerelease.split('.')[0]}.{bump_up_release_tag}+{buildmetadata}{channel_metadata}" else: - max_branches_version = tools.Version("0.0.0") + max_branches_version = Version("0.0.0") branches_no_commits = no_commits for branch in repo.references: try: if "remotes/origin" in branch.abspath: - b_version = tools.Version(branch.name.split("/")[-1]) - if b_version < tools.Version("10.0.0") and b_version > max_branches_version: + b_version = Version(branch.name.split("/")[-1]) + if b_version < Version("10.0.0") and b_version > max_branches_version: max_branches_version = b_version branches_no_commits = repo.commit().count() - branch.commit.count() except: