Skip to content

Commit a9e0974

Browse files
committed
Merge branch 'main' into display-interop-id-io
2 parents a9ce0c7 + 0a30218 commit a9e0974

File tree

36 files changed

+896
-249
lines changed

36 files changed

+896
-249
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
---
22
name: Bug report
33
about: I think I have identified a legit bug and can describe it.
4-
title: "[BUG]"
4+
title: "bug:"
55
labels: ''
66
assignees: ''
77

88
---
99

10+
<!-- THESE ARE JUST SUGGESTIONS. FEEL FREE TO DELETE ALL OF THIS AND -->
11+
<!-- WRITE YOUR OWN THOROUGH BUG REPORT. -->
12+
1013
**Describe the bug**
1114

1215
A clear and concise description of what the bug is. What happened, and

.github/ISSUE_TEMPLATE/build_problem.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: Build problems
33
about: I'm having trouble building OIIO. Help!
4-
title: "[BUILD]"
4+
title: "build:"
55
labels: ''
66
assignees: ''
77

@@ -10,7 +10,8 @@ assignees: ''
1010
**PLEASE DO NOT REPORT BUILD TROUBLES AS GITHUB "ISSUES" UNLESS YOU ARE REALLY SURE IT'S A BUG**
1111

1212
The best way to get help with your build problems is to ask a question on the
13-
[oiio-dev developer mail list](https://lists.aswf.io/g/oiio-dev).
13+
[oiio-dev developer mail list](https://lists.aswf.io/g/oiio-dev) or on the
14+
[ASWF Slack](https://slack.aswf.io) `#openimageio` channel.
1415

1516
When you email about this, please attach one or both of the following:
1617
1. The full verbose build log, which you can create like this:

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
---
22
name: Feature request
33
about: I have a concrete idea about how to improve OpenImageIO.
4-
title: "[FEATURE REQUEST]"
4+
title: "feat:"
55
labels: ''
66
assignees: ''
77

88
---
99

10+
<!-- THESE ARE JUST SUGGESTIONS. FEEL FREE TO DELETE ALL OF THIS AND -->
11+
<!-- WRITE YOUR OWN THOROUGH FEATURE REQUEST. -->
12+
1013
**Is your feature request related to a problem? Please describe.**
1114
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
1215

.github/ISSUE_TEMPLATE/question.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: Question
33
about: How do I... I need help with...
4-
title: "[HELP]"
4+
title: "help:"
55
labels: ''
66
assignees: ''
77

@@ -18,8 +18,8 @@ But if you are just asking a question:
1818
* Am I doing something wrong?
1919
* I can't build OpenImageIO
2020

21-
For anything of this nature, the best way to get help using OpenImageIO is
22-
to ask a question on the [oiio-dev developer mail list](https://lists.aswf.io/g/oiio-dev).
21+
For anything of this nature, the best way to get help using OpenImageIO is to
22+
ask a question on the [oiio-dev developer mail list](https://lists.aswf.io/g/oiio-dev) or the [ASWF Slack](https://slack.aswf.io) `#openimageio` channel.
2323

2424
The [documentation](https://docs.openimageio.org)
2525
is pretty comprehensive, so please check there first; you may find the answer

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,47 @@
1-
<!-- This is just a guideline and set of reminders about what constitutes -->
2-
<!-- a good PR. Feel free to delete all this matter and replace it with -->
3-
<!-- your own detailed message about the PR, assuming you hit all the -->
4-
<!-- important points made below. -->
51

62

7-
## Description
3+
4+
------ :scissors: -------------------------------------------------------------------
5+
6+
YOU MAY DELETE ALL OF THIS IF YOU ALREADY HAVE A DESCRIPTIVE COMMIT MESSAGE!
7+
8+
This is just a template and set of reminders about what constitutes a good PR.
9+
But please look over the checklist at the bottom.
10+
11+
If THIS TEXT is still in your PR description, we'll know you didn't read the
12+
instructions!
13+
14+
15+
16+
17+
### Description
818

919
<!-- Please provide a description of what this PR is meant to fix, and -->
1020
<!-- how it works (if it's not going to be very clear from the code). -->
1121

12-
## Tests
22+
### Tests
1323

1424
<!-- Did you / should you add a testsuite case (new test, or add to an -->
1525
<!-- existing test) to verify that this works? -->
1626

1727

18-
## Checklist:
28+
### Checklist:
1929

2030
<!-- Put an 'x' in the boxes as you complete the checklist items -->
2131

22-
- [ ] I have read the [contribution guidelines](https://github.com/AcademySoftwareFoundation/OpenImageIO/blob/main/CONTRIBUTING.md).
23-
- [ ] I have updated the documentation, if applicable. (Check if there is no
24-
need to update the documentation, for example if this is a bug fix that
25-
doesn't change the API.)
26-
- [ ] I have ensured that the change is tested somewhere in the testsuite
27-
(adding new test cases if necessary).
28-
- [ ] If I added or modified a C++ API call, I have also amended the
29-
corresponding Python bindings (and if altering ImageBufAlgo functions, also
30-
exposed the new functionality as oiiotool options).
31-
- [ ] My code follows the prevailing code style of this project. If I haven't
32-
already run clang-format before submitting, I definitely will look at the CI
33-
test that runs clang-format and fix anything that it highlights as being
34-
nonconforming.
32+
- [ ] **I have read the guidelines** on [contributions](https://github.com/AcademySoftwareFoundation/OpenImageIO/blob/main/CONTRIBUTING.md) and [code review procedures](https://github.com/AcademySoftwareFoundation/OpenImageIO/blob/main/docs/dev/CodeReview.md).
33+
- [ ] **I have updated the documentation** if my PR adds features or changes
34+
behavior.
35+
- [ ] **I am sure that this PR's changes are tested somewhere in the
36+
testsuite**.
37+
- [ ] **I have run and passed the testsuite in CI** *before* submitting the
38+
PR, by pushing the changes to my fork and seeing that the automated CI
39+
passed there. (Exceptions: If most tests pass and you can't figure out why
40+
the remaining ones fail, it's ok to submit the PR and ask for help. Or if
41+
any failures seem entirely unrelated to your change; sometimes things break
42+
on the GitHub runners.)
43+
- [ ] **My code follows the prevailing code style of this project** and I
44+
fixed any problems reported by the clang-format CI test.
45+
- [ ] If I added or modified a public C++ API call, I have also amended the
46+
corresponding Python bindings. If altering ImageBufAlgo functions, I also
47+
exposed the new functionality as oiiotool options.

.github/workflows/analysis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ on:
2626
- '!**/scorecard.yml'
2727
- '!**/wheel.yml'
2828
- '!**.properties'
29+
- '!pyproject.toml'
2930
- '!docs/**'
3031
# Run analysis on PRs only if the branch name indicates that the purpose of
3132
# the PR is related to the Sonar analysis. We don't run on every PR because

.github/workflows/ci.yml

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ on:
1616
- '!**/scorecard.yml'
1717
- '!**/wheel.yml'
1818
- '!**.properties'
19+
- '!pyproject.toml'
1920
- '!docs/**'
2021
pull_request:
2122
paths:
@@ -460,13 +461,13 @@ jobs:
460461
simd: avx2,f16c
461462
setenvs: export LIBJPEGTURBO_VERSION=3.1.2
462463
LIBPNG_VERSION=v1.6.50
463-
LIBRAW_VERSION=0.21.4
464+
LIBRAW_VERSION=0.21.5
464465
LIBTIFF_VERSION=v4.7.1
465466
OPENJPEG_VERSION=v2.5.4
466467
PTEX_VERSION=v2.5.0
467468
PUGIXML_VERSION=v1.15
468469
WEBP_VERSION=v1.6.0
469-
FREETYPE_VERSION=VER-2-14-0
470+
FREETYPE_VERSION=VER-2-14-1
470471
USE_OPENVDB=0
471472
# Ensure we are testing all the deps we think we are. We would
472473
# like this test to have minimal missing dependencies.
@@ -502,7 +503,7 @@ jobs:
502503
# Ensure we are testing all the deps we think we are. We would
503504
# like this test to have minimal missing dependencies.
504505
required_deps: all
505-
optional_deps: 'CUDAToolkit;DCMTK;JXL;Nuke;OpenCV;OpenGL;OpenVDB;R3DSDK'
506+
optional_deps: 'CUDAToolkit;DCMTK;JXL;libuhdr;Nuke;OpenCV;OpenGL;openjph;R3DSDK;'
506507
- desc: all local builds gcc12 C++17 avx2 exr3.2 ocio2.3
507508
nametag: linux-local-builds
508509
runner: ubuntu-22.04
@@ -513,22 +514,23 @@ jobs:
513514
simd: avx2,f16c
514515
setenvs: export OpenImageIO_BUILD_LOCAL_DEPS=all
515516
OpenImageIO_DEPENDENCY_BUILD_VERBOSE=ON
516-
LIBRAW_VERSION=0.21.4
517+
LIBRAW_VERSION=0.21.5
517518
PTEX_VERSION=v2.4.2
518519
PUGIXML_VERSION=v1.14
519520
WEBP_VERSION=v1.4.0
520-
- desc: clang15 C++17 avx2 exr3.1 ocio2.3
521-
nametag: linux-clang15
522-
runner: ubuntu-22.04
523-
cxx_compiler: clang++-15
524-
cc_compiler: clang-15
521+
- desc: clang18 C++17 avx2 exr3.1 ocio2.3
522+
nametag: linux-clang18
523+
runner: ubuntu-24.04
524+
cxx_compiler: clang++
525+
cc_compiler: clang
525526
cxx_std: 17
526527
fmt_ver: 10.1.1
527528
opencolorio_ver: v2.3.0
528529
openexr_ver: v3.1.13
529530
pybind11_ver: v2.12.0
530-
python_ver: "3.10"
531+
python_ver: "3.12"
531532
simd: avx2,f16c
533+
setenvs: export USE_OPENVDB=0
532534
- desc: Linux ARM latest releases gcc14 C++20 py3.12 exr3.4 ocio2.4
533535
nametag: linux-arm-latest-releases
534536
runner: ubuntu-24.04-arm
@@ -542,13 +544,13 @@ jobs:
542544
python_ver: "3.12"
543545
setenvs: export LIBJPEGTURBO_VERSION=3.1.2
544546
LIBPNG_VERSION=v1.6.50
545-
LIBRAW_VERSION=0.21.4
547+
LIBRAW_VERSION=0.21.5
546548
LIBTIFF_VERSION=v4.7.1
547549
OPENJPEG_VERSION=v2.5.4
548550
PTEX_VERSION=v2.4.3
549551
PUGIXML_VERSION=v1.15
550552
WEBP_VERSION=v1.6.0
551-
FREETYPE_VERSION=VER-2-14-0
553+
FREETYPE_VERSION=VER-2-14-1
552554
USE_OPENVDB=0
553555
- desc: Linux ARM latest releases clang18 C++20 py3.12 exr3.4 ocio2.4
554556
nametag: linux-arm-latest-releases-clang
@@ -563,13 +565,13 @@ jobs:
563565
python_ver: "3.12"
564566
setenvs: export LIBJPEGTURBO_VERSION=3.1.2
565567
LIBPNG_VERSION=v1.6.50
566-
LIBRAW_VERSION=0.21.4
568+
LIBRAW_VERSION=0.21.5
567569
LIBTIFF_VERSION=v4.7.1
568570
OPENJPEG_VERSION=v2.5.4
569571
PTEX_VERSION=v2.4.3
570572
PUGIXML_VERSION=v1.15
571573
WEBP_VERSION=v1.6.0
572-
FREETYPE_VERSION=VER-2-14-0
574+
FREETYPE_VERSION=VER-2-14-1
573575
USE_OPENVDB=0
574576

575577

@@ -625,7 +627,7 @@ jobs:
625627
python_ver: "3.13"
626628
simd: sse4.2,avx2
627629
ctest_test_timeout: 1200
628-
setenvs: export MACOSX_DEPLOYMENT_TARGET=12.0
630+
setenvs: export MACOSX_DEPLOYMENT_TARGET=12.0 INSTALL_QT=0
629631
benchmark: 1
630632
- desc: MacOS-14-ARM aclang15/C++20/py3.13
631633
runner: macos-14
@@ -682,7 +684,7 @@ jobs:
682684
# built. But we would like to add more dependencies and reduce this list
683685
# of exceptions in the future.
684686
required_deps: ${{ matrix.required_deps || 'all' }}
685-
optional_deps: ${{ matrix.optional_deps || 'CUDAToolkit;DCMTK;FFmpeg;GIF;JXL;Libheif;LibRaw;Nuke;OpenCV;OpenGL;OpenJPEG;openjph;OpenCV;OpenVDB;Ptex;pystring;Qt5;Qt6;TBB;R3DSDK;${{matrix.optional_deps_append}}' }}
687+
optional_deps: ${{ matrix.optional_deps || 'BZip2;CUDAToolkit;DCMTK;FFmpeg;GIF;JXL;Libheif;LibRaw;Nuke;OpenCV;OpenGL;OpenJPEG;openjph;OpenCV;OpenVDB;Ptex;pystring;Qt5;Qt6;TBB;R3DSDK;${{matrix.optional_deps_append}}' }}
686688
strategy:
687689
fail-fast: false
688690
matrix:

.github/workflows/docs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ on:
2020
- '**/run.py'
2121
- 'src/build-scripts/**'
2222
- './*.md'
23+
- 'pyproject.toml'
2324
pull_request:
2425
paths-ignore:
2526
- '**/ci.yml'
@@ -33,6 +34,7 @@ on:
3334
- '**/run.py'
3435
- 'src/build-scripts/**'
3536
- './*.md'
37+
- 'pyproject.toml'
3638
schedule:
3739
# Full nightly build
3840
- cron: "0 8 * * *"

0 commit comments

Comments
 (0)