Skip to content

Commit

Permalink
Merge pull request #41 from regro-cf-autotick-bot/9.0.0_hd0bc59
Browse files Browse the repository at this point in the history
[bot-automerge] gz-gui v9.0.0
  • Loading branch information
traversaro authored Sep 30, 2024
2 parents f2925e8 + 586beaa commit 8bf36c1
Show file tree
Hide file tree
Showing 11 changed files with 98 additions and 54 deletions.
10 changes: 8 additions & 2 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,15 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libabseil:
- '20240722'
- '20240116'
libprotobuf:
- 5.27.5
- 4.25.3
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.11.* *_cpython
qt_main:
- '5.15'
target_platform:
Expand Down
10 changes: 8 additions & 2 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,15 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libabseil:
- '20240722'
- '20240116'
libprotobuf:
- 5.27.5
- 4.25.3
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.11.* *_cpython
qt_main:
- '5.15'
target_platform:
Expand Down
10 changes: 8 additions & 2 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,15 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libabseil:
- '20240722'
- '20240116'
libprotobuf:
- 5.27.5
- 4.25.3
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.11.* *_cpython
qt_main:
- '5.15'
target_platform:
Expand Down

This file was deleted.

10 changes: 8 additions & 2 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,17 @@ cxx_compiler:
cxx_compiler_version:
- '17'
libabseil:
- '20240722'
- '20240116'
libprotobuf:
- 5.27.5
- 4.25.3
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.11.* *_cpython
qt_main:
- '5.15'
target_platform:
Expand Down
10 changes: 8 additions & 2 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,17 @@ cxx_compiler:
cxx_compiler_version:
- '17'
libabseil:
- '20240722'
- '20240116'
libprotobuf:
- 5.27.5
- 4.25.3
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.11.* *_cpython
qt_main:
- '5.15'
target_platform:
Expand Down
10 changes: 8 additions & 2 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,15 @@ channel_targets:
cxx_compiler:
- vs2019
libabseil:
- '20240722'
- '20240116'
libprotobuf:
- 5.27.5
- 4.25.3
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.11.* *_cpython
qt_main:
- '5.15'
target_platform:
Expand Down
26 changes: 13 additions & 13 deletions README.md

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

1 change: 1 addition & 0 deletions conda-forge.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
bot:
abi_migration_branches:
- v7
- v8
automerge: true
build_platform:
linux_aarch64: linux_64
Expand Down
20 changes: 20 additions & 0 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
# gz-gui requires Metal
MACOSX_SDK_VERSION: # [osx and x86_64]
- "11.0" # [osx and x86_64]


# Hardcode python version to avoid have one build job
# for python version as in the end the generated
# artifacts do not depend on Python version
zip_keys:
-
- python
- numpy
- python_impl

python:
# part of a zip_keys: python, python_impl, numpy
- 3.11.* *_cpython
python_impl:
# part of a zip_keys: python, python_impl, numpy
- cpython
numpy:
# part of a zip_keys: python, python_impl, numpy
- 1.23
27 changes: 16 additions & 11 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set component_name = "gui" %}
{% set repo_name = "gz-" + component_name %}
{% set version = "8.1.1" %}
{% set version = "9.0.0" %}
{% set major_version = version.split('.')[0] %}
{% set name = repo_name + major_version %}
{% set component_version = component_name + major_version %}
Expand All @@ -12,11 +12,11 @@ package:

source:
- url: https://github.com/gazebosim/{{ repo_name }}/archive/{{ repo_name }}{{ major_version }}_{{ version }}.tar.gz
sha256: f0365ee732133c4c173aa664eb3092a4a60c13c120a59500dcdafadd4a55ec17
sha256: 9c953875c8b2dedc39d6ca824d5d837f8eace6bc492192a085c42b30799c33b2


build:
number: 1
number: 0

outputs:
- name: {{ cxx_name }}
Expand All @@ -25,6 +25,8 @@ outputs:
build:
run_exports:
- {{ pin_subpackage(cxx_name, max_pin='x') }}
ignore_run_exports_from:
- python
requirements:
build:
- {{ compiler('cxx') }}
Expand All @@ -39,22 +41,25 @@ outputs:
- {{ cdt('libxdamage') }} # [linux]
- {{ cdt('libxxf86vm') }} # [linux]
- {{ cdt('libxext') }} # [linux]
- python # [build_platform != target_platform]
- cross-python_{{ target_platform }} # [build_platform != target_platform]
host:
- libgz-cmake3
- libgz-cmake4
- libabseil
- libprotobuf
- tinyxml2
- libgz-math7
- libgz-common5
- libgz-plugin2
- libgz-transport13
- libgz-rendering8
- libgz-msgs10
- libgz-math8
- libgz-common6
- libgz-plugin3
- libgz-transport14
- libgz-rendering9
- libgz-msgs11
- libgz-tools2
- libgz-utils2
- libgz-utils3
- qt-main
- xorg-libxfixes # [linux]
- ogre 1.10.*
- python
test:
commands:
- test -f ${PREFIX}/include/gz/{{ component_version }}/gz/{{ component_name }}.hh # [not win]
Expand Down

0 comments on commit 8bf36c1

Please sign in to comment.