Skip to content

Commit

Permalink
Merge pull request #234 from vepadulano/6.30.04
Browse files Browse the repository at this point in the history 
6.30.04
  • Loading branch information
@chrisburr
chrisburr authored Feb 6, 2024
2 parents 9803b50 + a573365 commit 31e8174
Show file tree
Hide file tree
Showing 24 changed files with 42 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ librsvg:
libtiff:
- '4.6'
libxml2:
- '2.12'
- '2'
lz4_c:
- 1.9.3
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ librsvg:
libtiff:
- '4.6'
libxml2:
- '2.12'
- '2'
lz4_c:
- 1.9.3
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ librsvg:
libtiff:
- '4.6'
libxml2:
- '2.12'
- '2'
lz4_c:
- 1.9.3
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ librsvg:
libtiff:
- '4.6'
libxml2:
- '2.12'
- '2'
lz4_c:
- 1.9.3
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ librsvg:
libtiff:
- '4.6'
libxml2:
- '2.12'
- '2'
lz4_c:
- 1.9.3
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ librsvg:
libtiff:
- '4.6'
libxml2:
- '2.12'
- '2'
lz4_c:
- 1.9.3
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ librsvg:
libtiff:
- '4.6'
libxml2:
- '2.12'
- '2'
lz4_c:
- 1.9.3
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ librsvg:
libtiff:
- '4.6'
libxml2:
- '2.12'
- '2'
lz4_c:
- 1.9.3
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ librsvg:
libtiff:
- '4.6'
libxml2:
- '2.12'
- '2'
lz4_c:
- 1.9.3
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ librsvg:
libtiff:
- '4.6'
libxml2:
- '2.12'
- '2'
lz4_c:
- 1.9.3
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ librsvg:
libtiff:
- '4.6'
libxml2:
- '2.12'
- '2'
lz4_c:
- 1.9.3
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ librsvg:
libtiff:
- '4.6'
libxml2:
- '2.12'
- '2'
lz4_c:
- 1.9.3
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ librsvg:
libtiff:
- '4.6'
libxml2:
- '2.12'
- '2'
lz4_c:
- 1.9.3
macos_machine:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ librsvg:
libtiff:
- '4.6'
libxml2:
- '2.12'
- '2'
lz4_c:
- 1.9.3
macos_machine:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ librsvg:
libtiff:
- '4.6'
libxml2:
- '2.12'
- '2'
lz4_c:
- 1.9.3
macos_machine:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ librsvg:
libtiff:
- '4.6'
libxml2:
- '2.12'
- '2'
lz4_c:
- 1.9.3
macos_machine:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ librsvg:
libtiff:
- '4.6'
libxml2:
- '2.12'
- '2'
lz4_c:
- 1.9.3
macos_machine:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ librsvg:
libtiff:
- '4.6'
libxml2:
- '2.12'
- '2'
lz4_c:
- 1.9.3
macos_machine:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ librsvg:
libtiff:
- '4.6'
libxml2:
- '2.12'
- '2'
lz4_c:
- 1.9.3
macos_machine:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ librsvg:
libtiff:
- '4.6'
libxml2:
- '2.12'
- '2'
lz4_c:
- 1.9.3
macos_machine:
Expand Down
13 changes: 12 additions & 1 deletion .gitignore
View file

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

6 changes: 0 additions & 6 deletions .scripts/build_steps.sh
View file

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

6 changes: 6 additions & 0 deletions .scripts/run_docker_build.sh
View file

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

8 changes: 4 additions & 4 deletions recipe/meta.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{% set name = "root" %}
{% set tag_name = "6-30-02" %}
{% set tag_name = "6-30-04" %}
{% set version = ".".join(tag_name.split("-")|map("int")|map("string")) %}
{% set build_number = 1 %}
{% set build_number = 0 %}
{% set clang_version = "13.0.1" %}
{% set clang_patches_version = "root_63002" %}
{% set clang_patches_version = "root_63004" %}

{% set builtin_pyroot = True %}
{% set builtin_clang = False %}
Expand All @@ -26,7 +26,7 @@ source:
git_rev: {{ os.environ["ROOT_CONDA_GIT_REV"] }}
{%- else %}
url: https://github.com/root-project/root/archive/refs/tags/v{{ tag_name }}.tar.gz
sha256: 51a09c86ffa94089abac76daa3adc20812efc6c93b427697b843b12d73e145de
sha256: 1f6db8baf6a07856b57f7c0e3207ac092f5358ef02f86aecddf4612f93ecd93a
{%- endif %}
folder: root-source
patches:
Expand Down

0 comments on commit 31e8174

Please sign in to comment.