Skip to content

Commit 405657e

Browse files
authored
Merge branch 'AcademySoftwareFoundation:main' into JPEG2K
2 parents 3f05268 + 85cca81 commit 405657e

548 files changed

Lines changed: 24018 additions & 9208 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.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: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
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

88
---
99

10-
**PLEASE DO NOT REPORT BUILD TROUBLES AS GITHUB "ISSUES" UNLESS YOU ARE RALLY SURE IT'S A BUG**
10+
**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: 35 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,49 @@
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 read the [Policy on AI Coding Assistants](https://github.com/AcademySoftwareFoundation/OpenImageIO/blob/main/docs/dev/AI_Policy.md)**
34+
and if I used AI coding assistants, I have an `Assisted-by: TOOL / MODEL`
35+
line in the pull request description above.
36+
- [ ] **I have updated the documentation** if my PR adds features or changes
37+
behavior.
38+
- [ ] **I am sure that this PR's changes are tested in the testsuite**.
39+
- [ ] **I have run and passed the testsuite in CI** *before* submitting the
40+
PR, by pushing the changes to my fork and seeing that the automated CI
41+
passed there. (Exceptions: If most tests pass and you can't figure out why
42+
the remaining ones fail, it's ok to submit the PR and ask for help. Or if
43+
any failures seem entirely unrelated to your change; sometimes things break
44+
on the GitHub runners.)
45+
- [ ] **My code follows the prevailing code style of this project** and I
46+
fixed any problems reported by the clang-format CI test.
47+
- [ ] If I added or modified a public C++ API call, I have also amended the
48+
corresponding Python bindings. If altering ImageBufAlgo functions, I also
49+
exposed the new functionality as oiiotool options.

.github/workflows/analysis.yml

Lines changed: 5 additions & 3 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
@@ -51,7 +52,7 @@ jobs:
5152
name: "SonarCloud Analysis"
5253
# Exclude runs on forks, since only the main org has the SonarCloud
5354
# account credentials.
54-
if: github.repository == 'AcademySoftwareFoundation/OpenImageIO'
55+
if: github.event.repository.fork == false
5556
uses: ./.github/workflows/build-steps.yml
5657
# Must let the called steps workflow inherit necessary secrets
5758
secrets:
@@ -87,13 +88,14 @@ jobs:
8788
fail-fast: false
8889
matrix:
8990
include:
90-
- desc: sonar gcc11/C++17 py310 exr3.2 ocio2.3
91+
- desc: sonar gcc11/C++17 py311 exr3.2 ocio2.3
9192
nametag: static-analysis-sonar
9293
os: ubuntu-latest
93-
container: aswf/ci-osl:2024-clang17
94+
container: aswf/ci-oiio:2024.2
9495
cxx_std: 17
9596
python_ver: "3.11"
9697
simd: "avx2,f16c"
98+
opencolorio_ver: v2.3.2
9799
fmt_ver: 10.1.1
98100
pybind11_ver: v2.12.0
99101
coverage: 1

0 commit comments

Comments
 (0)