From 93b10cb770f6d25c8d3db85cd43a6ccc6a187e9f Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 28 Aug 2023 14:49:51 +0200 Subject: [PATCH 1/6] Revert "Update conan version" This reverts commit 413aa181ff782de33ffc971f20691a8b2ba9d682. --- .github/workflows/requirements-conan-package.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/requirements-conan-package.txt b/.github/workflows/requirements-conan-package.txt index 6b4d4cffc8..26d167db2b 100644 --- a/.github/workflows/requirements-conan-package.txt +++ b/.github/workflows/requirements-conan-package.txt @@ -1,2 +1,2 @@ -conan==1.60.2 +conan==1.56.0 sip From c3354472929b4576edca14ea528d593389d9267b Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Mon, 28 Aug 2023 16:37:09 +0200 Subject: [PATCH 2/6] Update requirements-conan-package.txt --- .github/workflows/requirements-conan-package.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/requirements-conan-package.txt b/.github/workflows/requirements-conan-package.txt index 26d167db2b..5efbf3f18b 100644 --- a/.github/workflows/requirements-conan-package.txt +++ b/.github/workflows/requirements-conan-package.txt @@ -1,2 +1,2 @@ conan==1.56.0 -sip +sip==6.7.9 From 72db652aecfad6e6523fc5cfc7c550cfb6190391 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Mon, 28 Aug 2023 17:32:45 +0200 Subject: [PATCH 3/6] Update requirements-conan-package.txt --- .github/workflows/requirements-conan-package.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/requirements-conan-package.txt b/.github/workflows/requirements-conan-package.txt index 5efbf3f18b..48121932b8 100644 --- a/.github/workflows/requirements-conan-package.txt +++ b/.github/workflows/requirements-conan-package.txt @@ -1,2 +1,2 @@ conan==1.56.0 -sip==6.7.9 +sip==6.7.1 From 2f166a545cedc90486364c5e24b6c54b5dae81e8 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 29 Aug 2023 08:25:35 +0200 Subject: [PATCH 4/6] Use pyarcus from CURA-10951 Contributes to CURA-10951 and CURA-10446 --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 608a450c39..a4a752a2f2 100644 --- a/conanfile.py +++ b/conanfile.py @@ -302,7 +302,7 @@ class CuraConan(ConanFile): def requirements(self): self.requires("boost/1.81.0") - self.requires("pyarcus/(latest)@ultimaker/cura_10475") + self.requires("pyarcus/(latest)@ultimaker/cura_10951") self.requires("curaengine/(latest)@ultimaker/cura_10446") self.requires("pysavitar/5.2.2") self.requires("pynest2d/5.2.2") From ea43f61ae4e34fb08f230227eb98d63ca1b57904 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 29 Aug 2023 09:03:39 +0200 Subject: [PATCH 5/6] Use pynest from CURA-10951 Contributes to CURA-10951 and CURA-10446 --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index a4a752a2f2..2813daa79b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -305,7 +305,7 @@ class CuraConan(ConanFile): self.requires("pyarcus/(latest)@ultimaker/cura_10951") self.requires("curaengine/(latest)@ultimaker/cura_10446") self.requires("pysavitar/5.2.2") - self.requires("pynest2d/5.2.2") + self.requires("pynest2d/(latest)@ultimaker/cura_10951") self.requires("uranium/(latest)@ultimaker/cura_10475") self.requires("cura_binary_data/(latest)@ultimaker/testing") self.requires("cpython/3.10.4") From 8a4dd000f1faf1b2e9e1b6d88ed69d9edc755eb6 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 29 Aug 2023 09:26:08 +0200 Subject: [PATCH 6/6] Use pysavitar from CURA-10951 Contributes to CURA-10951 and CURA-10446 --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 2813daa79b..7725ade370 100644 --- a/conanfile.py +++ b/conanfile.py @@ -304,7 +304,7 @@ class CuraConan(ConanFile): self.requires("boost/1.81.0") self.requires("pyarcus/(latest)@ultimaker/cura_10951") self.requires("curaengine/(latest)@ultimaker/cura_10446") - self.requires("pysavitar/5.2.2") + self.requires("pysavitar/(latest)@ultimaker/cura_10951") self.requires("pynest2d/(latest)@ultimaker/cura_10951") self.requires("uranium/(latest)@ultimaker/cura_10475") self.requires("cura_binary_data/(latest)@ultimaker/testing")