From 53366583023887cabbd20f6151fc3a3bf6c9a054 Mon Sep 17 00:00:00 2001 From: Jeremy Wright Date: Mon, 6 Oct 2025 06:46:44 -0400 Subject: [PATCH 1/5] Changed CQ pin to stable version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 63626b4..a354c15 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "hatchling.build" name = "assembly_mesh_plugin" version = "0.1.1" dependencies = [ - "cadquery@git+https://github.com/CadQuery/cadquery.git", + "cadquery>=2.6.0", "gmsh", ] requires-python = ">=3.9" From 775a46e2584bb5ade6b8508711132a0178bc94c7 Mon Sep 17 00:00:00 2001 From: Jeremy Wright Date: Mon, 6 Oct 2025 06:53:14 -0400 Subject: [PATCH 2/5] Fix conda version pin too --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 8127879..5a7ca5b 100644 --- a/environment.yml +++ b/environment.yml @@ -1,7 +1,7 @@ name: tagged-meshes channels: - conda-forge - - cadquery + - cadquery>=2.6.0 dependencies: - python>=3.9,<=3.12 - cadquery=master From 07238bd4d7e35b1e5718c4522f311c49260b0fc2 Mon Sep 17 00:00:00 2001 From: Jeremy Wright Date: Mon, 6 Oct 2025 07:05:55 -0400 Subject: [PATCH 3/5] Apply suggestion from @shimwell Co-authored-by: Jonathan Shimwell --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 5a7ca5b..8127879 100644 --- a/environment.yml +++ b/environment.yml @@ -1,7 +1,7 @@ name: tagged-meshes channels: - conda-forge - - cadquery>=2.6.0 + - cadquery dependencies: - python>=3.9,<=3.12 - cadquery=master From de4a939760ba7ad09fc8db8a0326a532f06ef8bd Mon Sep 17 00:00:00 2001 From: Jeremy Wright Date: Mon, 6 Oct 2025 07:08:06 -0400 Subject: [PATCH 4/5] Fixed conda version pin --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 8127879..a395a3a 100644 --- a/environment.yml +++ b/environment.yml @@ -4,7 +4,7 @@ channels: - cadquery dependencies: - python>=3.9,<=3.12 - - cadquery=master + - cadquery=2.6.0 - pytest - gmsh - python-gmsh From 220398a9ac03f7c6c652e5a13203fe22247a0fd1 Mon Sep 17 00:00:00 2001 From: Jeremy Wright Date: Mon, 6 Oct 2025 14:43:20 -0400 Subject: [PATCH 5/5] Updating version pin now that CadQuery 2.6.0 is available on conda-forge --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index a395a3a..0c8ce5d 100644 --- a/environment.yml +++ b/environment.yml @@ -4,7 +4,7 @@ channels: - cadquery dependencies: - python>=3.9,<=3.12 - - cadquery=2.6.0 + - cadquery>=2.6.0 - pytest - gmsh - python-gmsh