From 97dc0cc27f44313339e95fb910281ae3222b481c Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 4 Dec 2024 11:20:52 +0100 Subject: [PATCH] Prepare for merge CURA-11622 --- .github/workflows/conan-package.yml | 3 +-- conandata.yml | 2 +- conanfile.py | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index b5f4927..4f74f17 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -19,7 +19,6 @@ on: - '[0-9].[0-9][0-9]*' jobs: -# FIXME: Use main once merged conan-package: - uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@main secrets: inherit diff --git a/conandata.yml b/conandata.yml index dfbd975..dbb2d8d 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,3 +1,3 @@ version: "5.4.0-alpha.0" requirements: - - "savitar/[>=5.4.0]@ultimaker/cura_11622" + - "savitar/[>=5.4.0]@ultimaker/stable" diff --git a/conanfile.py b/conanfile.py index eb5a644..782f31f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -25,7 +25,7 @@ class PySavitarConan(ConanFile): exports = "LICENSE*" generators = "CMakeDeps" - python_requires = "pyprojecttoolchain/[>=0.2.0]@ultimaker/cura_11622", "sipbuildtool/[>=0.3.0]@ultimaker/cura_11622" # FIXME: use stable after merge + python_requires = "pyprojecttoolchain/[>=0.2.0]@ultimaker/stable", "sipbuildtool/[>=0.3.0]@ultimaker/stable" options = { "shared": [True, False], @@ -83,8 +83,8 @@ def validate(self): ) def build_requirements(self): - self.test_requires("standardprojectsettings/[>=0.2.0]@ultimaker/cura_11622") # FIXME: use stable after merge - self.test_requires("sipbuildtool/[>=0.3.0]@ultimaker/cura_11622") # FIXME: use stable after merge + self.test_requires("standardprojectsettings/[>=0.2.0]@ultimaker/stable") + self.test_requires("sipbuildtool/[>=0.3.0]@ultimaker/stable") def config_options(self): if self.settings.os == "Windows":