Skip to content

Commit

Permalink
merge master -Dorg -Ssuccess-only
Browse files Browse the repository at this point in the history
Repository: ome/bio-formats-build
Excluded PRs:
  - PR 632 dependabot[bot] 'Bump ZarrReader from `9a9e662` to `b17c3ab`' (status: failure)
Already up to date.

Merged PRs:
  - PR 658 dependabot[bot] 'Bump bio-formats-documentation from `b07c8df` to `8dc4ea1`'
  - PR 660 dependabot[bot] 'Bump bioformats from `df36e69` to `862723a`'

Repository: ome/ZarrReader
Excluded PRs:
  - PR 95 dgault 'Class cast exception when parsing metadata' (status: failure)
  - PR 20 dgault 'ZarrReader: Use chunk API' (exclude comment)
Updating 9a9e662..b17c3ab
Previously merged:
  - PR 93 dgault 'Bump version to 0.5.3-SNAPSHOT'
  - PR 92 dgault 'Bump version to 0.5.2'
  - PR 91 dgault 'Bump Bio-Formats version to 7.3.1'

Merged PRs:
  - PR 97 melissalinkert 'Bump Bio-Formats version to 8.0.1'
  - PR 98 dominikl 'Fix class cast and labels issue.'

Repository: ome/bio-formats-documentation
Already up to date.

Merged PRs:
  - PR 394 pwalczysko 'Add sas.upenn.edu to ignore list linkchecker'

Repository: ome/bio-formats-examples
Already up to date.

Merged PRs:
  - PR 69 dgault 'Add macro examples from OME 2020 NGFF workshop'

Repository: openmicroscopy/bioformats
Excluded PRs:
  - PR 4254 melissalinkert 'Memoizer: ask any ImageReader instances to remove all but the current reader' (stage: draft)
  - PR 4196 melissalinkert 'DICOM: use FrameTimePointer to detect timelapse data' (label: exclude)
  - PR 4131 dgault 'VirtualImagePlus: Retain B&C settings for each slice' (status: failure)
  - PR 4092 NicoKiaru 'Commits an alternative Zeiss CZI Reader' (user: NicoKiaru)
  - PR 4000 XLEFReaderForBioformats 'Reworking LMSMetadata package and adding a new lif reader' (user: XLEFReaderForBioformats)
  - PR 3794 dgault 'Chunk API: Add new API and functionality for reading and writing chunks' (label: exclude)
  - PR 3618 dgault 'Memoizer: Persist caching to sub readers' (label: breaking)
Already up to date.

Merged PRs:
  - PR 4130 carandraug 'matlab/bfGetPlane.m: avoid use of makeDataArray2D when Octave (ome/bio-formats-octave-docker#29)'
  - PR 4195 WalkerKnapp 'Andor SIF: Support files larger than 4 GB and with non-fixed-size footers'
  - PR 4243 melissalinkert 'Update IExtraMetadataWriter.setExtraMetadata(...) to accept an Object'
  - PR 4249 marcobitplane 'Imaris Reader: support for LZ4 compression and performance improvements'

Repository: ome/ome-codecs
Already up to date.

Merged PRs:
  - PR 41 rharkes 'Add LZ4 compression/decompression'

Repository: ome/ome-common-java
Already up to date.

Repository: ome/ome-jai
Already up to date.

Repository: ome/ome-mdbtools
Already up to date.

Repository: ome/ome-metakit
Already up to date.

Repository: ome/ome-model
Updating be5b189c..5d681a64
Previously merged:
  - PR 174 jburel 'Remove docs'
  - PR 192 jburel 'Remove py38'

Merged PRs:
  - PR 193 jburel 'Build'

Repository: ome/ome-poi
Already up to date.

Repository: ome/ome-stubs
Already up to date.

Generated by BIOFORMATS-push#275 (https://merge-ci.openmicroscopy.org/jenkins/job/BIOFORMATS-push/275/)
  • Loading branch information
snoopycrimecop committed Nov 25, 2024
1 parent 6f392cb commit 46e1a55
Show file tree
Hide file tree
Showing 13 changed files with 36 additions and 36 deletions.
48 changes: 24 additions & 24 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@
[submodule "ome-common-java"]
path = ome-common-java
url = https://github.com/ome/ome-common-java.git
branch = master
url = https://github.com/snoopycrimecop/ome-common-java.git
branch = merge_ci
[submodule "ome-model"]
path = ome-model
url = https://github.com/ome/ome-model.git
branch = master
url = https://github.com/snoopycrimecop/ome-model.git
branch = merge_ci
[submodule "ome-poi"]
path = ome-poi
url = https://github.com/ome/ome-poi.git
branch = master
url = https://github.com/snoopycrimecop/ome-poi.git
branch = merge_ci
[submodule "ome-mdbtools"]
path = ome-mdbtools
url = https://github.com/ome/ome-mdbtools.git
branch = master
url = https://github.com/snoopycrimecop/ome-mdbtools.git
branch = merge_ci
[submodule "ome-jai"]
path = ome-jai
url = https://github.com/ome/ome-jai.git
branch = master
url = https://github.com/snoopycrimecop/ome-jai.git
branch = merge_ci
[submodule "ome-codecs"]
path = ome-codecs
url = https://github.com/ome/ome-codecs.git
branch = master
url = https://github.com/snoopycrimecop/ome-codecs.git
branch = merge_ci
[submodule "ome-metakit"]
path = ome-metakit
url = https://github.com/ome/ome-metakit.git
branch = master
url = https://github.com/snoopycrimecop/ome-metakit.git
branch = merge_ci
[submodule "ome-stubs"]
path = ome-stubs
url = https://github.com/ome/ome-stubs.git
branch = master
url = https://github.com/snoopycrimecop/ome-stubs.git
branch = merge_ci
[submodule "bioformats"]
path = bioformats
url = https://github.com/openmicroscopy/bioformats.git
branch = develop
url = https://github.com/snoopycrimecop/bioformats.git
branch = merge_ci
[submodule "bio-formats-documentation"]
path = bio-formats-documentation
url = https://github.com/ome/bio-formats-documentation.git
branch = master
url = https://github.com/snoopycrimecop/bio-formats-documentation.git
branch = merge_ci
[submodule "bio-formats-examples"]
path = bio-formats-examples
url = https://github.com/ome/bio-formats-examples.git
branch = master
url = https://github.com/snoopycrimecop/bio-formats-examples.git
branch = merge_ci
[submodule "ZarrReader"]
path = ZarrReader
url = https://github.com/ome/ZarrReader.git
branch = main
url = https://github.com/snoopycrimecop/ZarrReader.git
branch = merge_ci
2 changes: 1 addition & 1 deletion ZarrReader
2 changes: 1 addition & 1 deletion bioformats
2 changes: 1 addition & 1 deletion ome-codecs
2 changes: 1 addition & 1 deletion ome-common-java
Submodule ome-common-java updated 0 files
2 changes: 1 addition & 1 deletion ome-jai
Submodule ome-jai updated 0 files
2 changes: 1 addition & 1 deletion ome-mdbtools
Submodule ome-mdbtools updated 0 files
2 changes: 1 addition & 1 deletion ome-metakit
Submodule ome-metakit updated 0 files
2 changes: 1 addition & 1 deletion ome-model
Submodule ome-model updated 87 files
+1 −1 .github/workflows/maven.yml
+4 −4 .github/workflows/publish_pypi.yml
+0 −1 .github/workflows/tox.yml
+5 −5 README.md
+0 −10 docs/sphinx/Makefile
+0 −1 docs/sphinx/_ext/.gitignore
+0 −45 docs/sphinx/_ext/edit_on_github.py
+0 −0 docs/sphinx/_static/.gitignore
+0 −8 docs/sphinx/_templates/layout.html
+0 −4 docs/sphinx/_templates/pagetoc.html
+0 −15 docs/sphinx/_templates/sourcelink.html
+0 −15 docs/sphinx/assembly.xml
+0 −367 docs/sphinx/conf.py
+0 −212 docs/sphinx/developers/6d-7d-and-8d-storage.rst
+0 −170 docs/sphinx/developers/compression.rst
+0 −280 docs/sphinx/developers/filter-and-filterset.rst
+0 −86 docs/sphinx/developers/id-and-lsid.rst
+0 −130 docs/sphinx/developers/index.rst
+0 −10 docs/sphinx/developers/legacy/index.rst
+0 −296 docs/sphinx/developers/legacy/spim-initial-support.rst
+0 −128 docs/sphinx/developers/legacy/tiled-images.rst
+0 −79 docs/sphinx/developers/model-overview.rst
+0 −257 docs/sphinx/developers/ome-units.rst
+0 −138 docs/sphinx/developers/roi.rst
+0 −15 docs/sphinx/developers/sample-files.rst
+0 −250 docs/sphinx/developers/screen-plate-well.rst
+0 −37 docs/sphinx/developers/structured-annotations.rst
+0 −439 docs/sphinx/developers/using-ome-xml.rst
+ docs/sphinx/images/FilterSet-Overview.png
+ docs/sphinx/images/OME-schema-table-formatted_final.png
+ docs/sphinx/images/OMEXML.png
+ docs/sphinx/images/Sample2x2Images.png
+ docs/sphinx/images/annotation_points.png
+ docs/sphinx/images/filter_lightpath.png
+ docs/sphinx/images/filter_lightpath_details.png
+ docs/sphinx/images/hcs_structures.png
+ docs/sphinx/images/image_branch.png
+ docs/sphinx/images/image_lightpath.png
+ docs/sphinx/images/instrument_branch.png
+ docs/sphinx/images/instrument_filterset.png
+ docs/sphinx/images/ome-tiff-chart.png
+ docs/sphinx/images/ome-tiff-header.png
+0 −32 docs/sphinx/images/ome.svg
+ docs/sphinx/images/organization.png
+ docs/sphinx/images/ownership.png
+ docs/sphinx/images/roi_branch.png
+ docs/sphinx/images/screen_well_plate.png
+ docs/sphinx/images/shape_types.png
+ docs/sphinx/images/structured_annotation_branch.png
+ docs/sphinx/images/transformations_quality.png
+0 −160 docs/sphinx/index.rst
+0 −144 docs/sphinx/ome-tiff/code.rst
+0 −294 docs/sphinx/ome-tiff/data.rst
+0 −88 docs/sphinx/ome-tiff/file-structure.rst
+0 −75 docs/sphinx/ome-tiff/index.rst
+0 −541 docs/sphinx/ome-tiff/specification.rst
+0 −163 docs/sphinx/ome-tiff/tools.rst
+0 −70 docs/sphinx/ome-xml/index.rst
+0 −42 docs/sphinx/ome-xml/java-library.rst
+0 −27 docs/sphinx/omero-pyramid/index.rst
+0 −165 docs/sphinx/pom.xml
+0 −136 docs/sphinx/schemas/april-2010.rst
+0 −129 docs/sphinx/schemas/february-2008.rst
+0 −117 docs/sphinx/schemas/index.rst
+0 −168 docs/sphinx/schemas/january-2015.rst
+0 −91 docs/sphinx/schemas/june-2007-2.rst
+0 −184 docs/sphinx/schemas/june-2007.rst
+0 −81 docs/sphinx/schemas/june-2010.rst
+0 −67 docs/sphinx/schemas/june-2011.rst
+0 −155 docs/sphinx/schemas/june-2012.rst
+0 −92 docs/sphinx/schemas/june-2013.rst
+0 −29 docs/sphinx/schemas/june-2016-2.rst
+0 −80 docs/sphinx/schemas/june-2016.rst
+0 −3 docs/sphinx/schemas/september-2007.rst
+0 −178 docs/sphinx/schemas/september-2008.rst
+0 −110 docs/sphinx/schemas/september-2009.rst
+0 −101 docs/sphinx/schemas/transformations.rst
+0 −30 docs/sphinx/specifications/compliant-hcs.rst
+0 −44 docs/sphinx/specifications/deltavision.ome.xml
+0 −54 docs/sphinx/specifications/hcs.ome.xml
+0 −73 docs/sphinx/specifications/index.rst
+0 −23 docs/sphinx/specifications/minimum-specification.ome.xml
+0 −23 docs/sphinx/specifications/minimum.rst
+0 −17 docs/sphinx/specifications/olympus.ome.xml
+0 −1 pom.xml
+0 −1 requirements.txt
+1 −1 tox.ini
2 changes: 1 addition & 1 deletion ome-poi
Submodule ome-poi updated 0 files
2 changes: 1 addition & 1 deletion ome-stubs
Submodule ome-stubs updated 0 files

0 comments on commit 46e1a55

Please sign in to comment.