Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Initialize CodeQL
uses: github/codeql-action/init@v3
uses: github/codeql-action/init@v4
with:
languages: ${{ matrix.language }}
build-mode: ${{ matrix.build-mode }}

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
uses: github/codeql-action/analyze@v4
with:
category: "/language:${{matrix.language}}"
54 changes: 21 additions & 33 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,55 +13,43 @@ jobs:
contents: read
strategy:
matrix:
java: [8, 11, 17, 21]
java: [11, 17, 21, 25]
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
python-version: ['3.10', '3.11', '3.12', '3.13']
exclude:
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A consequence of this removal is the explosion of the number of jobs. Proposing to drop Python 3.9 from the list above and only cover all the Python versions for a particular Java version e.g. 17 or 21.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See 1c544cd. That should test one Python version each for Java 11/17/25, and all Python versions for Java 21. The matrix prior to this PR ended up excluding everything except Java 11 across all Python versions, which I think is not what we actually want.

- java: 8
python-version: '3.9'
- java: 8
python-version: '3.10'
- java: 8
python-version: '3.11'
- java: 8
python-version: '3.12'
- java: 8
python-version: '3.13'
- java: 11
python-version: 3.11
- java: 11
python-version: 3.12
- java: 11
python-version: 3.13
- java: 17
python-version: '3.9'
python-version: 3.10
- java: 17
python-version: '3.10'
python-version: 3.12
- java: 17
python-version: '3.11'
- java: 17
python-version: '3.12'
- java: 17
python-version: '3.13'
- java: 21
python-version: '3.9'
- java: 21
python-version: '3.10'
- java: 21
python-version: '3.11'
- java: 21
python-version: '3.12'
- java: 21
python-version: '3.13'
python-version: 3.13
- java: 25
python-version: 3.10
- java: 25
python-version: 3.11
- java: 25
python-version: 3.12
runs-on: ${{ matrix.os }}
env:
maven_commands: install
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Set up Python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
java-version: ${{ matrix.java }}
distribution: 'zulu'
Expand All @@ -75,7 +63,7 @@ jobs:
if: startsWith(github.ref, 'refs/tags')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Create a GitHub release
run: gh release create --generate-notes "${GITHUB_REF#refs/tags/}"
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
ruff:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: astral-sh/ruff-action@v3
- name: Lint with Ruff
run: ruff check --output-format=github
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ following before submitting a pull request:

* verify that the branch merges cleanly into ```master```
* verify that the branch compiles using Maven
* verify that the branch does not use syntax or API specific to Java 1.8+
* verify that the branch does not use syntax or API specific to Java > 11
* internal developers only: [run the data
tests](https://bio-formats.readthedocs.io/en/stable/developers/commit-testing.html)
against directories corresponding to the affected format(s)
Expand Down
29 changes: 5 additions & 24 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
<slf4j.version>2.0.9</slf4j.version>
<ome_common.version>6.1.1</ome_common.version>
<ome-common.version>${ome_common.version}</ome-common.version>
<testng.version>7.9.0</testng.version>

<ome.model.schemaver>2016-06</ome.model.schemaver>
<ome.model.schemapath>specification/src/main/resources/released-schema/${ome.model.schemaver}</ome.model.schemapath>
Expand Down Expand Up @@ -138,11 +139,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version>
<!-- Require the Java 8 platform. -->
<!-- Require the Java 11 platform. -->
<configuration>
<source>8</source>
<target>8</target>
<release>8</release>
<release>11</release>
</configuration>
</plugin>

Expand Down Expand Up @@ -240,11 +239,11 @@
<artifactId>maven-javadoc-plugin</artifactId>
<!-- NB: The same version declaration and configuration block also
appears in the <reporting> section, and must be kept in sync. -->
<version>3.0.1</version>
<version>3.12.0</version>
<configuration>
<failOnError>false</failOnError>
<links>
<link>http://docs.oracle.com/javase/7/docs/api/</link>
<link>https://docs.oracle.com/en/java/javase/11/docs/api/</link>
</links>
</configuration>
<executions>
Expand Down Expand Up @@ -377,23 +376,5 @@
</plugins>
</build>
</profile>
<profile>
<id>jdk8-only</id>
<activation>
<jdk>(,11)</jdk>
</activation>
<properties>
<testng.version>7.5</testng.version>
</properties>
</profile>
<profile>
<id>jdk11+</id>
<activation>
<jdk>[11,)</jdk>
</activation>
<properties>
<testng.version>7.9.0</testng.version>
</properties>
</profile>
</profiles>
</project>
Loading