Skip to content

Commit

Permalink
Prepare for merge
Browse files Browse the repository at this point in the history
CURA-11622
wawanbreton committed Dec 4, 2024
1 parent c74b9bc commit b1a3a77
Showing 3 changed files with 6 additions and 7 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/conan-package.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion conandata.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version: "5.4.0-alpha.0"
requirements:
- "nest2d/[>=5.4.0]@ultimaker/cura_11622"
- "nest2d/[>=5.4.0]@ultimaker/stable"
8 changes: 4 additions & 4 deletions conanfile.py
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ class PyNest2DConan(ConanFile):
exports = "LICENSE*"
package_type = "library"

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],
@@ -74,7 +74,7 @@ def requirements(self):
self.requires("nlopt/2.7.1")

# Although not a direct dependency, clipper is for some reason required at link-time
self.requires("clipper/6.4.2@ultimaker/cura_11622") # FIXME: use main after merge
self.requires("clipper/6.4.2@ultimaker/stable")

def validate(self):
if self.settings.compiler.cppstd:
@@ -88,8 +88,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":

0 comments on commit b1a3a77

Please sign in to comment.