Merge pull request #1157 from tpaviot/review/force-swig-402

Review/force swig 402
tpaviot · Nov 21, 2022 · 8d8f983 · 8d8f983
2 parents 418a195 + 3849095
commit 8d8f983
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 34 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -19,68 +19,68 @@ jobs:
     vmImage: 'ubuntu-22.04'
     py_maj: 3
     py_min: 8
-    conda_bld: 3.21
+    conda_bld: 3.23
 
 - template:  conda-build.yml
   parameters:
     name: macOS_11_python38
     vmImage: 'macOS-11'
     py_maj: 3
     py_min: 8
-    conda_bld: 3.21
+    conda_bld: 3.23
 
 - template:  conda-build.yml
   parameters:
     name: Windows_VS2022_python38
     vmImage: 'windows-2022'
     py_maj: 3
     py_min: 8
-    conda_bld: 3.21
+    conda_bld: 3.23
 
 - template: conda-build.yml
   parameters:
     name: Ubuntu_22_04_python39
     vmImage: 'ubuntu-22.04'
     py_maj: 3
     py_min: 9
-    conda_bld: 3.21
+    conda_bld: 3.23
 
 - template:  conda-build.yml
   parameters:
     name: macOS_11_python39
     vmImage: 'macOS-11'
     py_maj: 3
     py_min: 9
-    conda_bld: 3.21
+    conda_bld: 3.23
 
 - template:  conda-build.yml
   parameters:
     name: Windows_VS2022_python39
     vmImage: 'windows-2022'
     py_maj: 3
     py_min: 9
-    conda_bld: 3.21
+    conda_bld: 3.23
 
 - template: conda-build.yml
   parameters:
     name: Ubuntu_22_04_python310
     vmImage: 'ubuntu-22.04'
     py_maj: 3
     py_min: 10
-    conda_bld: 3.21
+    conda_bld: 3.23
 
 - template:  conda-build.yml
   parameters:
     name: macOS_11_python310
     vmImage: 'macOS-11'
     py_maj: 3
     py_min: 10
-    conda_bld: 3.21
+    conda_bld: 3.23
 
 - template:  conda-build.yml
   parameters:
     name: Windows_VS2022_python310
     vmImage: 'windows-2022'
     py_maj: 3
     py_min: 10
-    conda_bld: 3.21
+    conda_bld: 3.23
diff --git a/ci/conda/build.sh b/ci/conda/build.sh
@@ -1,11 +1,6 @@
 #!/bin/bash
 # make an in source build do to some problems with install
 
-declare -a CMAKE_PLATFORM_FLAGS
-if [[ ${HOST} =~ .*linux.* ]]; then
-    CMAKE_PLATFORM_FLAGS+=(-DCMAKE_TOOLCHAIN_FILE="${RECIPE_DIR}/cross-linux.cmake")
-fi
-
 # Configure step
 cmake -G Ninja \
  -DPYTHONOCC_BUILD_TYPE=Release \

diff --git a/ci/conda/conda_build_config.yaml b/ci/conda/conda_build_config.yaml
diff --git a/ci/conda/cross-linux.cmake b/ci/conda/cross-linux.cmake
diff --git a/ci/conda/meta.yaml b/ci/conda/meta.yaml
@@ -22,7 +22,7 @@ requirements:
     - {{ cdt('libxi-devel') }}          # [linux]
     - ninja
     - cmake
-    - swig >=4.0.2
+    - swig ==4.0.2
 
   host:
     - python {{ python }}
@@ -31,7 +31,6 @@ requirements:
 
   run:
     - occt ==7.6.3
-    - python
     - six
     - numpy >=1.17