Merge pull request #113 from FreeCAD/occt-variants

unpin occt
conda-forge · Nov 20, 2023 · 7c17351 · 7c17351
2 parents 822582e + ee347d7
commit 7c17351
Show file tree

Hide file tree

Showing 22 changed files with 89 additions and 9 deletions.
diff --git a/.ci_support/README b/.ci_support/README
diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml
@@ -14,9 +14,13 @@ freetype:
 - '2'
 hdf5:
 - 1.14.2
+occt:
+- 7.7.2
 pcl:
 - 1.13.1
 pin_run_as_build:
+  occt:
+    max_pin: x.x
   python:
     min_pin: x.x
     max_pin: x.x

diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml
@@ -14,9 +14,13 @@ freetype:
 - '2'
 hdf5:
 - 1.14.2
+occt:
+- 7.7.2
 pcl:
 - 1.13.1
 pin_run_as_build:
+  occt:
+    max_pin: x.x
   python:
     min_pin: x.x
     max_pin: x.x

diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml
@@ -14,9 +14,13 @@ freetype:
 - '2'
 hdf5:
 - 1.14.2
+occt:
+- 7.7.2
 pcl:
 - 1.13.1
 pin_run_as_build:
+  occt:
+    max_pin: x.x
   python:
     min_pin: x.x
     max_pin: x.x

diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml
@@ -14,9 +14,13 @@ freetype:
 - '2'
 hdf5:
 - 1.14.2
+occt:
+- 7.7.2
 pcl:
 - 1.13.1
 pin_run_as_build:
+  occt:
+    max_pin: x.x
   python:
     min_pin: x.x
     max_pin: x.x

diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml
@@ -18,9 +18,13 @@ freetype:
 - '2'
 hdf5:
 - 1.14.2
+occt:
+- 7.7.2
 pcl:
 - 1.13.1
 pin_run_as_build:
+  occt:
+    max_pin: x.x
   python:
     min_pin: x.x
     max_pin: x.x

diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml
@@ -18,9 +18,13 @@ freetype:
 - '2'
 hdf5:
 - 1.14.2
+occt:
+- 7.7.2
 pcl:
 - 1.13.1
 pin_run_as_build:
+  occt:
+    max_pin: x.x
   python:
     min_pin: x.x
     max_pin: x.x

diff --git a/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpython.yaml
@@ -18,9 +18,13 @@ freetype:
 - '2'
 hdf5:
 - 1.14.2
+occt:
+- 7.7.2
 pcl:
 - 1.13.1
 pin_run_as_build:
+  occt:
+    max_pin: x.x
   python:
     min_pin: x.x
     max_pin: x.x

diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml
@@ -18,9 +18,13 @@ freetype:
 - '2'
 hdf5:
 - 1.14.2
+occt:
+- 7.7.2
 pcl:
 - 1.13.1
 pin_run_as_build:
+  occt:
+    max_pin: x.x
   python:
     min_pin: x.x
     max_pin: x.x

diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml
@@ -14,9 +14,13 @@ hdf5:
 - 1.14.2
 macos_machine:
 - x86_64-apple-darwin13.4.0
+occt:
+- 7.7.2
 pcl:
 - 1.13.1
 pin_run_as_build:
+  occt:
+    max_pin: x.x
   python:
     min_pin: x.x
     max_pin: x.x

diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml
@@ -14,9 +14,13 @@ hdf5:
 - 1.14.2
 macos_machine:
 - x86_64-apple-darwin13.4.0
+occt:
+- 7.7.2
 pcl:
 - 1.13.1
 pin_run_as_build:
+  occt:
+    max_pin: x.x
   python:
     min_pin: x.x
     max_pin: x.x

diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml
@@ -14,9 +14,13 @@ hdf5:
 - 1.14.2
 macos_machine:
 - x86_64-apple-darwin13.4.0
+occt:
+- 7.7.2
 pcl:
 - 1.13.1
 pin_run_as_build:
+  occt:
+    max_pin: x.x
   python:
     min_pin: x.x
     max_pin: x.x

diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml
@@ -14,9 +14,13 @@ hdf5:
 - 1.14.2
 macos_machine:
 - x86_64-apple-darwin13.4.0
+occt:
+- 7.7.2
 pcl:
 - 1.13.1
 pin_run_as_build:
+  occt:
+    max_pin: x.x
   python:
     min_pin: x.x
     max_pin: x.x

diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml
@@ -14,9 +14,13 @@ hdf5:
 - 1.14.2
 macos_machine:
 - arm64-apple-darwin20.0.0
+occt:
+- 7.7.2
 pcl:
 - 1.13.1
 pin_run_as_build:
+  occt:
+    max_pin: x.x
   python:
     min_pin: x.x
     max_pin: x.x

diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml
@@ -14,9 +14,13 @@ hdf5:
 - 1.14.2
 macos_machine:
 - arm64-apple-darwin20.0.0
+occt:
+- 7.7.2
 pcl:
 - 1.13.1
 pin_run_as_build:
+  occt:
+    max_pin: x.x
   python:
     min_pin: x.x
     max_pin: x.x

diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml
@@ -14,9 +14,13 @@ hdf5:
 - 1.14.2
 macos_machine:
 - arm64-apple-darwin20.0.0
+occt:
+- 7.7.2
 pcl:
 - 1.13.1
 pin_run_as_build:
+  occt:
+    max_pin: x.x
   python:
     min_pin: x.x
     max_pin: x.x

diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml
@@ -14,9 +14,13 @@ hdf5:
 - 1.14.2
 macos_machine:
 - arm64-apple-darwin20.0.0
+occt:
+- 7.7.2
 pcl:
 - 1.13.1
 pin_run_as_build:
+  occt:
+    max_pin: x.x
   python:
     min_pin: x.x
     max_pin: x.x

diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml
@@ -8,9 +8,13 @@ freetype:
 - '2'
 hdf5:
 - 1.14.2
+occt:
+- 7.7.2
 pcl:
 - 1.13.1
 pin_run_as_build:
+  occt:
+    max_pin: x.x
   python:
     min_pin: x.x
     max_pin: x.x

diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml
@@ -8,9 +8,13 @@ freetype:
 - '2'
 hdf5:
 - 1.14.2
+occt:
+- 7.7.2
 pcl:
 - 1.13.1
 pin_run_as_build:
+  occt:
+    max_pin: x.x
   python:
     min_pin: x.x
     max_pin: x.x

diff --git a/.ci_support/win_64_python3.8.____cpython.yaml b/.ci_support/win_64_python3.8.____cpython.yaml
@@ -8,9 +8,13 @@ freetype:
 - '2'
 hdf5:
 - 1.14.2
+occt:
+- 7.7.2
 pcl:
 - 1.13.1
 pin_run_as_build:
+  occt:
+    max_pin: x.x
   python:
     min_pin: x.x
     max_pin: x.x

diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml
@@ -8,9 +8,13 @@ freetype:
 - '2'
 hdf5:
 - 1.14.2
+occt:
+- 7.7.2
 pcl:
 - 1.13.1
 pin_run_as_build:
+  occt:
+    max_pin: x.x
   python:
     min_pin: x.x
     max_pin: x.x

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,6 +1,6 @@
 {% set name = "freecad" %}
 {% set version = "0.21.2" %}
-{% set build_number = 0 %}
+{% set build_number = 1 %}
 {% set build_number = build_number + 500 %}  # [FEATURE_DEBUG]
 
 package:
@@ -35,6 +35,7 @@ requirements:
         - {{ cdt('libxau') }}                # [linux]
         - {{ cdt('libxi-devel') }}           # [linux]
         - cmake
+        - swig
         - ninja
         - sed                                    # [unix]
         - python                                 # [build_platform != target_platform]
@@ -44,11 +45,10 @@ requirements:
         - python
         - qt-main
         - qt-webengine
-        - occt ==7.6.3
+        - occt
         - xerces-c
         - zlib
         - vtk
-        - swig
         - eigen
         - pybind11
         - coin3d