Skip to content

Commit

Permalink
Merge pull request #1 from DavidStirling/master
Browse files Browse the repository at this point in the history
Update bioformats
  • Loading branch information
chris-allan authored Nov 8, 2024
2 parents 05f7af3 + f7eec10 commit ddcb28d
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 16 deletions.
18 changes: 13 additions & 5 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ name: Java CI with Maven
on:
push:
branches: [ master ]
tags:
- '*'
pull_request:
branches: [ master ]

Expand All @@ -15,13 +17,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
architecture: x64
python-version: 3.8
- name: Setup Java JDK
uses: actions/setup-java@v2.1.0
uses: actions/setup-java@v4
with:
java-version: 8
distribution: adopt
Expand All @@ -32,10 +34,16 @@ jobs:
- name: Build Python package
run: python setup.py sdist
- name: Upload a Build Artifact
uses: actions/upload-artifact@v2.2.4
uses: actions/upload-artifact@v4
with:
# Artifact name
name: prokaryote-2.4.4.tar.gz
name: prokaryote-2.4.5.tar.gz
path: dist/
- name: Release
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
files: dist/*tar.gz



18 changes: 8 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.cellprofiler</groupId>
<artifactId>prokaryote</artifactId>
<version>2.4.4</version>
<version>2.4.5</version>
<dependencies>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>scijava-common</artifactId>
<version>2.56.0</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
Expand All @@ -14,7 +20,7 @@
<dependency>
<groupId>ome</groupId>
<artifactId>formats-gpl</artifactId>
<version>5.7.1</version>
<version>7.3.1</version>
<exclusions>
<!-- Only has the side effect of rendering
loci.formats.gui.CacheComponent inoperable.
Expand Down Expand Up @@ -307,14 +313,6 @@
<scope>test</scope>
</dependency>
</dependencies>
<parent>
<groupId>org.scijava</groupId>
<artifactId>pom-scijava</artifactId>
<version>10.4.1</version>
</parent>
<properties>
<bio-formats.version>5.7.1</bio-formats.version>
</properties>
<build>
<plugins>
<plugin>
Expand Down
2 changes: 1 addition & 1 deletion prokaryote/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "2.4.4"
__version__ = "2.4.5"

0 comments on commit ddcb28d

Please sign in to comment.