Skip to content

Commit

Permalink
Remove webengine dependency
Browse files Browse the repository at this point in the history
fully move CI to github since osx_arm64 is now supported and crosscompiled linux_aarch64 seems to work
MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.34.1, and conda-forge-pinning 2024.04.22.21.39.55
  • Loading branch information
adrianinsaval committed Apr 22, 2024
1 parent d8f8907 commit 7bbf33e
Show file tree
Hide file tree
Showing 9 changed files with 44 additions and 76 deletions.
9 changes: 8 additions & 1 deletion .ci_support/linux_64_python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -19,7 +23,7 @@ libboost_devel:
occt:
- 7.7.2
pcl:
- 1.13.1
- 1.14.0
pin_run_as_build:
occt:
max_pin: x.x
Expand All @@ -36,5 +40,8 @@ vtk:
- 9.2.6
xerces_c:
- '3.2'
zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
11 changes: 9 additions & 2 deletions .ci_support/linux_aarch64_python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -13,7 +17,7 @@ cxx_compiler:
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
- quay.io/condaforge/linux-anvil-cos7-x86_64
freetype:
- '2'
hdf5:
Expand All @@ -23,7 +27,7 @@ libboost_devel:
occt:
- 7.7.2
pcl:
- 1.13.1
- 1.14.0
pin_run_as_build:
occt:
max_pin: x.x
Expand All @@ -40,5 +44,8 @@ vtk:
- 9.2.6
xerces_c:
- '3.2'
zip_keys:
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
6 changes: 5 additions & 1 deletion .ci_support/osx_64_python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.13'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
channel_sources:
- freecad/label/dev,conda-forge,defaults
channel_targets:
Expand All @@ -19,7 +23,7 @@ macos_machine:
occt:
- 7.7.2
pcl:
- 1.13.1
- 1.14.0
pin_run_as_build:
occt:
max_pin: x.x
Expand Down
6 changes: 5 additions & 1 deletion .ci_support/osx_arm64_python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- freecad/label/dev,conda-forge,defaults
channel_targets:
Expand All @@ -19,7 +23,7 @@ macos_machine:
occt:
- 7.7.2
pcl:
- 1.13.1
- 1.14.0
pin_run_as_build:
occt:
max_pin: x.x
Expand Down
4 changes: 3 additions & 1 deletion .ci_support/win_64_python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
c_stdlib:
- vs
channel_sources:
- freecad/label/dev,conda-forge,defaults
channel_targets:
Expand All @@ -13,7 +15,7 @@ libboost_devel:
occt:
- 7.7.2
pcl:
- 1.13.1
- 1.14.0
pin_run_as_build:
occt:
max_pin: x.x
Expand Down
64 changes: 0 additions & 64 deletions .cirrus.yml

This file was deleted.

9 changes: 9 additions & 0 deletions .github/workflows/conda-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,19 @@ jobs:
os: ubuntu
runs_on: ['ubuntu-latest']
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
- CONFIG: linux_aarch64_python3.11.____cpython
UPLOAD_PACKAGES: True
os: ubuntu
runs_on: ['ubuntu-latest']
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
- CONFIG: osx_64_python3.11.____cpython
UPLOAD_PACKAGES: True
os: macos
runs_on: ['macos-latest']
- CONFIG: osx_arm64_python3.11.____cpython
UPLOAD_PACKAGES: True
os: macos
runs_on: ['macos-14']
- CONFIG: win_64_python3.11.____cpython
UPLOAD_PACKAGES: True
os: windows
Expand Down
6 changes: 3 additions & 3 deletions conda-forge.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
provider:
win: github_actions
linux_64: github_actions
linux_aarch64: azure
linux_aarch64: github_actions
osx_64: github_actions
osx_arm64: azure
osx_arm64: github_actions
build_platform:
osx_arm64: osx_arm64
linux_aarch64: linux_aarch64
linux_aarch64: linux_64
test: native_and_emulated
5 changes: 2 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set name = "freecad" %}
{% set version = "0.22.pre" %}
{% set build_number = 52 %}
{% set build_number = 53 %}
{% set build_number = build_number + 500 %} # [FEATURE_DEBUG]

package:
Expand All @@ -12,7 +12,6 @@ source:
fn: freecad_source_{{ build_number }}.tar.gz
# sha256:
patches:
- patches/qtwebengine_disable_sandbox.patch # [linux]
- patches/osx_arm64_cross_compiling.patch # [build_platform != target_platform and osx]

build:
Expand Down Expand Up @@ -44,7 +43,6 @@ requirements:
- libboost-devel
- python
- qt-main
- qt-webengine
- occt
- xerces-c
- zlib
Expand All @@ -68,6 +66,7 @@ requirements:
- vtk
- {{ pin_compatible('occt', max_pin='x.x.x') }}
- qt
- qt-wayland # [linux]
- xerces-c
- zlib
- hdf5
Expand Down

0 comments on commit 7bbf33e

Please sign in to comment.