Skip to content

Commit 8d8f983

Browse files
authored
Merge pull request #1157 from tpaviot/review/force-swig-402
Review/force swig 402
2 parents 418a195 + 3849095 commit 8d8f983

File tree

5 files changed

+10
-34
lines changed

5 files changed

+10
-34
lines changed

azure-pipelines.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,68 +19,68 @@ jobs:
1919
vmImage: 'ubuntu-22.04'
2020
py_maj: 3
2121
py_min: 8
22-
conda_bld: 3.21
22+
conda_bld: 3.23
2323

2424
- template: conda-build.yml
2525
parameters:
2626
name: macOS_11_python38
2727
vmImage: 'macOS-11'
2828
py_maj: 3
2929
py_min: 8
30-
conda_bld: 3.21
30+
conda_bld: 3.23
3131

3232
- template: conda-build.yml
3333
parameters:
3434
name: Windows_VS2022_python38
3535
vmImage: 'windows-2022'
3636
py_maj: 3
3737
py_min: 8
38-
conda_bld: 3.21
38+
conda_bld: 3.23
3939

4040
- template: conda-build.yml
4141
parameters:
4242
name: Ubuntu_22_04_python39
4343
vmImage: 'ubuntu-22.04'
4444
py_maj: 3
4545
py_min: 9
46-
conda_bld: 3.21
46+
conda_bld: 3.23
4747

4848
- template: conda-build.yml
4949
parameters:
5050
name: macOS_11_python39
5151
vmImage: 'macOS-11'
5252
py_maj: 3
5353
py_min: 9
54-
conda_bld: 3.21
54+
conda_bld: 3.23
5555

5656
- template: conda-build.yml
5757
parameters:
5858
name: Windows_VS2022_python39
5959
vmImage: 'windows-2022'
6060
py_maj: 3
6161
py_min: 9
62-
conda_bld: 3.21
62+
conda_bld: 3.23
6363

6464
- template: conda-build.yml
6565
parameters:
6666
name: Ubuntu_22_04_python310
6767
vmImage: 'ubuntu-22.04'
6868
py_maj: 3
6969
py_min: 10
70-
conda_bld: 3.21
70+
conda_bld: 3.23
7171

7272
- template: conda-build.yml
7373
parameters:
7474
name: macOS_11_python310
7575
vmImage: 'macOS-11'
7676
py_maj: 3
7777
py_min: 10
78-
conda_bld: 3.21
78+
conda_bld: 3.23
7979

8080
- template: conda-build.yml
8181
parameters:
8282
name: Windows_VS2022_python310
8383
vmImage: 'windows-2022'
8484
py_maj: 3
8585
py_min: 10
86-
conda_bld: 3.21
86+
conda_bld: 3.23

ci/conda/build.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
#!/bin/bash
22
# make an in source build do to some problems with install
33

4-
declare -a CMAKE_PLATFORM_FLAGS
5-
if [[ ${HOST} =~ .*linux.* ]]; then
6-
CMAKE_PLATFORM_FLAGS+=(-DCMAKE_TOOLCHAIN_FILE="${RECIPE_DIR}/cross-linux.cmake")
7-
fi
8-
94
# Configure step
105
cmake -G Ninja \
116
-DPYTHONOCC_BUILD_TYPE=Release \

ci/conda/conda_build_config.yaml

Lines changed: 0 additions & 2 deletions
This file was deleted.

ci/conda/cross-linux.cmake

Lines changed: 0 additions & 16 deletions
This file was deleted.

ci/conda/meta.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ requirements:
2222
- {{ cdt('libxi-devel') }} # [linux]
2323
- ninja
2424
- cmake
25-
- swig >=4.0.2
25+
- swig ==4.0.2
2626

2727
host:
2828
- python {{ python }}
@@ -31,7 +31,6 @@ requirements:
3131

3232
run:
3333
- occt ==7.6.3
34-
- python
3534
- six
3635
- numpy >=1.17
3736

0 commit comments

Comments
 (0)