Skip to content

Commit

Permalink
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.43.2, and co…
Browse files Browse the repository at this point in the history
…nda-forge-pinning 2024.11.01.21.49.52
  • Loading branch information
adrianinsaval committed Nov 2, 2024
1 parent ef6272c commit 2585980
Show file tree
Hide file tree
Showing 10 changed files with 103 additions and 93 deletions.
18 changes: 8 additions & 10 deletions .ci_support/linux_64_python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,32 +1,30 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- freecad/label/dev,conda-forge,defaults
- freecad/label/dev,conda-forge
channel_targets:
- freecad dev
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
freetype:
- '2'
hdf5:
- 1.14.3
libboost_devel:
- '1.82'
- '1.84'
occt:
- 7.7.2
- 7.8.1
pcl:
- 1.14.0
- 1.14.1
pin_run_as_build:
occt:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
Expand All @@ -37,7 +35,7 @@ qt_main:
target_platform:
- linux-64
vtk:
- 9.2.6
- 9.3.0
xerces_c:
- '3.2'
zip_keys:
Expand Down
14 changes: 6 additions & 8 deletions .ci_support/linux_aarch64_python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,26 @@ cdt_arch:
cdt_name:
- cos7
channel_sources:
- freecad/label/dev,conda-forge,defaults
- freecad/label/dev,conda-forge
channel_targets:
- freecad dev
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
freetype:
- '2'
hdf5:
- 1.14.3
libboost_devel:
- '1.82'
- '1.84'
occt:
- 7.7.2
- 7.8.1
pcl:
- 1.14.0
- 1.14.1
pin_run_as_build:
occt:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
Expand All @@ -41,7 +39,7 @@ qt_main:
target_platform:
- linux-aarch64
vtk:
- 9.2.6
- 9.3.0
xerces_c:
- '3.2'
zip_keys:
Expand Down
16 changes: 7 additions & 9 deletions .ci_support/osx_64_python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,34 +1,32 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.13'
MACOSX_SDK_VERSION:
- '11.0'
- '10.13'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
channel_sources:
- freecad/label/dev,conda-forge,defaults
- freecad/label/dev,conda-forge
channel_targets:
- freecad dev
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '18'
freetype:
- '2'
hdf5:
- 1.14.3
libboost_devel:
- '1.82'
- '1.84'
macos_machine:
- x86_64-apple-darwin13.4.0
occt:
- 7.7.2
- 7.8.1
pcl:
- 1.14.0
- 1.14.1
pin_run_as_build:
occt:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
Expand All @@ -39,7 +37,7 @@ qt_main:
target_platform:
- osx-64
vtk:
- 9.2.6
- 9.3.0
xerces_c:
- '3.2'
zlib:
Expand Down
14 changes: 6 additions & 8 deletions .ci_support/osx_arm64_python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,26 @@ c_stdlib:
c_stdlib_version:
- '11.0'
channel_sources:
- freecad/label/dev,conda-forge,defaults
- freecad/label/dev,conda-forge
channel_targets:
- freecad dev
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '18'
freetype:
- '2'
hdf5:
- 1.14.3
libboost_devel:
- '1.82'
- '1.84'
macos_machine:
- arm64-apple-darwin20.0.0
occt:
- 7.7.2
- 7.8.1
pcl:
- 1.14.0
- 1.14.1
pin_run_as_build:
occt:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
Expand All @@ -39,7 +37,7 @@ qt_main:
target_platform:
- osx-arm64
vtk:
- 9.2.6
- 9.3.0
xerces_c:
- '3.2'
zlib:
Expand Down
12 changes: 5 additions & 7 deletions .ci_support/win_64_python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_stdlib:
- vs
channel_sources:
- freecad/label/dev,conda-forge,defaults
- freecad/label/dev,conda-forge
channel_targets:
- freecad dev
cxx_compiler:
Expand All @@ -11,14 +11,12 @@ freetype:
hdf5:
- 1.14.3
libboost_devel:
- '1.82'
- '1.84'
occt:
- 7.7.2
- 7.8.1
pcl:
- 1.14.0
- 1.14.1
pin_run_as_build:
occt:
max_pin: x.x
python:
min_pin: x.x
max_pin: x.x
Expand All @@ -29,7 +27,7 @@ qt_main:
target_platform:
- win-64
vtk:
- 9.2.6
- 9.3.0
xerces_c:
- '3.2'
zlib:
Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/conda-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,6 @@ jobs:
fi
./.scripts/run_osx_build.sh
- name: Install Miniconda for windows
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
with:
miniforge-version: latest
miniforge-variant: Mambaforge
if: matrix.os == 'windows'

- name: Build on windows
shell: cmd
run: |
Expand All @@ -110,6 +103,7 @@ jobs:
set "sha=%GITHUB_SHA%"
call ".scripts\run_win_build.bat"
env:
MINIFORGE_HOME: D:\Miniforge
PYTHONUNBUFFERED: 1
CONFIG: ${{ matrix.CONFIG }}
CI: github_actions
Expand Down
21 changes: 7 additions & 14 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 27 additions & 16 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2585980

Please sign in to comment.