Skip to content

Commit 33ae384

Browse files
committed
Squashed commit of the following:
commit 271df84 Author: Talley Lambert <[email protected]> Date: Sun Jul 2 12:18:40 2023 -0400 remove import warnings, more test coverage commit df1cfde Author: Talley Lambert <[email protected]> Date: Sun Jul 2 11:13:39 2023 -0400 drop 37 commit 10e213b Author: Talley Lambert <[email protected]> Date: Sun Jul 2 11:11:16 2023 -0400 fix wheel and sdist commit ea5e35d Author: Talley Lambert <[email protected]> Date: Sun Jul 2 11:07:26 2023 -0400 no relative imports commit d27488d Author: Talley Lambert <[email protected]> Date: Sun Jul 2 11:06:22 2023 -0400 use _autogenerated folder instead commit 634c0f3 Author: Talley Lambert <[email protected]> Date: Sun Jul 2 10:53:15 2023 -0400 update paquo test commit 5f28b98 Author: Talley Lambert <[email protected]> Date: Sun Jul 2 10:14:47 2023 -0400 fix typing commit 0d5d1e6 Author: Talley Lambert <[email protected]> Date: Sun Jul 2 10:12:33 2023 -0400 tests working now? commit 557ae05 Author: Talley Lambert <[email protected]> Date: Sun Jul 2 08:47:16 2023 -0400 fix py38 commit 590b888 Author: Talley Lambert <[email protected]> Date: Sun Jul 2 08:05:37 2023 -0400 add paquo test commit 366daea Author: Talley Lambert <[email protected]> Date: Sat Jul 1 16:24:06 2023 -0400 mid work on paquo tests... (still broken) commit 995a203 Author: Talley Lambert <[email protected]> Date: Sat Jul 1 14:15:35 2023 -0400 catch deprecated imports commit f2f53db Author: Talley Lambert <[email protected]> Date: Sat Jul 1 14:15:25 2023 -0400 better roi unions commit 8eba2c7 Author: Talley Lambert <[email protected]> Date: Sat Jul 1 11:11:24 2023 -0400 add back validate_xml commit d1b4b52 Author: Talley Lambert <[email protected]> Date: Sat Jul 1 10:00:32 2023 -0400 update aicsimageio test commit 01761f2 Author: Talley Lambert <[email protected]> Date: Sat Jul 1 09:51:20 2023 -0400 fix fixture name commit cbdebf0 Author: Talley Lambert <[email protected]> Date: Sat Jul 1 09:49:24 2023 -0400 update test commit 25d1505 Author: Talley Lambert <[email protected]> Date: Sat Jul 1 09:38:05 2023 -0400 comment commit 9fb0ac5 Author: Talley Lambert <[email protected]> Date: Sat Jul 1 09:37:34 2023 -0400 remove comment commit ba9df67 Author: Talley Lambert <[email protected]> Date: Sat Jul 1 09:36:53 2023 -0400 pyproject format commit 9482226 Author: Talley Lambert <[email protected]> Date: Sat Jul 1 09:32:47 2023 -0400 remove aics data for now commit 1b7e425 Author: Talley Lambert <[email protected]> Date: Sat Jul 1 09:31:43 2023 -0400 update workflows commit 4cd3a23 Author: Talley Lambert <[email protected]> Date: Sat Jul 1 09:22:08 2023 -0400 avoid ome_types import during build commit e44f7d8 Author: Talley Lambert <[email protected]> Date: Sat Jul 1 09:17:53 2023 -0400 fix buildpytest commit 37ad16c Author: Talley Lambert <[email protected]> Date: Sat Jul 1 09:11:20 2023 -0400 add concurrency limits commit f9cb4e9 Author: Talley Lambert <[email protected]> Date: Sat Jul 1 09:09:50 2023 -0400 fix enum names commit c3f669d Author: Talley Lambert <[email protected]> Date: Sat Jul 1 07:28:05 2023 -0400 fix weakref type commit f74de81 Author: Talley Lambert <[email protected]> Date: Sat Jul 1 07:01:25 2023 -0400 typing again commit 7403cad Author: Talley Lambert <[email protected]> Date: Fri Jun 30 21:24:15 2023 -0400 more type fixes commit 30cd47d Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri Jun 30 22:09:14 2023 +0000 style(pre-commit.ci): auto fixes [...] commit a2c386a Author: Talley Lambert <[email protected]> Date: Fri Jun 30 18:08:58 2023 -0400 Update _reference.py commit c9b7f8b Author: Talley Lambert <[email protected]> Date: Fri Jun 30 17:23:14 2023 -0400 fix type commit 3d378a2 Author: Talley Lambert <[email protected]> Date: Fri Jun 30 17:20:55 2023 -0400 move aicsimageio test commit be6cfda Author: Talley Lambert <[email protected]> Date: Fri Jun 30 17:19:54 2023 -0400 fix type commit 9cfb2a7 Author: Talley Lambert <[email protected]> Date: Fri Jun 30 17:17:20 2023 -0400 add dev deps to test commit 58e06f9 Author: Talley Lambert <[email protected]> Date: Fri Jun 30 17:15:58 2023 -0400 update main print commit 610f6e3 Author: Talley Lambert <[email protected]> Date: Fri Jun 30 16:52:55 2023 -0400 remove typealias commit 7f1d315 Author: Talley Lambert <[email protected]> Date: Fri Jun 30 16:51:51 2023 -0400 remove char commit 522d389 Author: Talley Lambert <[email protected]> Date: Fri Jun 30 16:47:24 2023 -0400 add back autogen test commit 4d1b13e Author: Talley Lambert <[email protected]> Date: Fri Jun 30 16:17:02 2023 -0400 remove unicode commit bb871e4 Author: Talley Lambert <[email protected]> Date: Fri Jun 30 16:15:39 2023 -0400 add future imports commit d509338 Author: Talley Lambert <[email protected]> Date: Fri Jun 30 16:12:27 2023 -0400 change build requirements commit 0d002a1 Author: Talley Lambert <[email protected]> Date: Fri Jun 30 16:09:55 2023 -0400 add back roundtrip commit 72eaabe Author: Talley Lambert <[email protected]> Date: Fri Jun 30 16:07:59 2023 -0400 working tests! commit 68b4351 Author: Talley Lambert <[email protected]> Date: Fri Jun 30 12:47:35 2023 -0400 working on aics commit 30eea00 Author: Talley Lambert <[email protected]> Date: Fri Jun 30 10:59:41 2023 -0400 fix some tests, add more data commit db76f52 Author: Talley Lambert <[email protected]> Date: Fri Jun 30 09:41:40 2023 -0400 add dep commit 2742b5c Author: Talley Lambert <[email protected]> Date: Fri Jun 30 09:27:40 2023 -0400 remove tiled reader commit 04b1a6a Author: Talley Lambert <[email protected]> Date: Fri Jun 30 09:23:16 2023 -0400 add names to simpletypes commit c002ee6 Author: Talley Lambert <[email protected]> Date: Fri Jun 30 09:12:39 2023 -0400 fix pre-commit commit fa4548c Author: Talley Lambert <[email protected]> Date: Fri Jun 30 09:09:20 2023 -0400 fix check manifest commit 13f9c55 Author: Talley Lambert <[email protected]> Date: Fri Jun 30 09:06:45 2023 -0400 remove unused script commit af494fa Author: Talley Lambert <[email protected]> Date: Fri Jun 30 09:06:08 2023 -0400 fix aics test commit a6b35be Author: Talley Lambert <[email protected]> Date: Fri Jun 30 08:58:04 2023 -0400 update aics script commit 3b90236 Author: Talley Lambert <[email protected]> Date: Fri Jun 30 08:50:57 2023 -0400 test aicsimage on pr commit 03d6cdf Author: Talley Lambert <[email protected]> Date: Fri Jun 30 08:49:31 2023 -0400 list packages in aics test commit 457e9be Author: Talley Lambert <[email protected]> Date: Fri Jun 30 08:41:45 2023 -0400 move tests back commit 9f37c02 Author: Talley Lambert <[email protected]> Date: Fri Jun 30 08:30:06 2023 -0400 adding deprecated names commit a5940d1 Author: Talley Lambert <[email protected]> Date: Fri Jun 30 06:43:26 2023 -0400 misc commit da4c173 Author: Talley Lambert <[email protected]> Date: Thu Jun 29 16:55:20 2023 -0400 wip commit 7e042c7 Author: Talley Lambert <[email protected]> Date: Thu Jun 29 16:45:55 2023 -0400 fixed various tests commit b7b857c Author: Talley Lambert <[email protected]> Date: Thu Jun 29 08:35:59 2023 -0400 wip on validation commit af3ec09 Author: Talley Lambert <[email protected]> Date: Wed Jun 28 15:42:57 2023 -0400 add deps commit 61f52d3 Author: Talley Lambert <[email protected]> Date: Wed Jun 28 15:41:03 2023 -0400 misc commit 3f98d8c Author: Talley Lambert <[email protected]> Date: Wed Jun 28 15:25:00 2023 -0400 update deps changetest commit 3e455a4 Author: Talley Lambert <[email protected]> Date: Wed Jun 28 15:24:52 2023 -0400 update test, change deps commit e51a1a0 Author: Talley Lambert <[email protected]> Date: Wed Jun 28 15:22:21 2023 -0400 more deps update commit ca6a00d Author: Talley Lambert <[email protected]> Date: Wed Jun 28 14:46:32 2023 -0400 more cleanup remove tox, update pyproject commit 430fce7 Author: Talley Lambert <[email protected]> Date: Wed Jun 28 11:29:55 2023 -0400 working on tests commit df72bd9 Author: Talley Lambert <[email protected]> Date: Wed Jun 28 10:40:52 2023 -0400 remove ome_types v1 commit 1a35d39 Author: Talley Lambert <[email protected]> Date: Wed Jun 28 10:38:10 2023 -0400 move units commit f5ee006 Author: Talley Lambert <[email protected]> Date: Wed Jun 28 10:36:54 2023 -0400 fix kwargs commit 12a4416 Author: Talley Lambert <[email protected]> Date: Wed Jun 28 09:59:10 2023 -0400 fix tests commit f6c9752 Author: Talley Lambert <[email protected]> Date: Wed Jun 28 09:56:42 2023 -0400 add serialization commit acbe2e5 Author: Talley Lambert <[email protected]> Date: Tue Jun 27 17:11:34 2023 -0400 working tests! commit 4f16b0d Author: Talley Lambert <[email protected]> Date: Tue Jun 27 14:04:39 2023 -0400 config and main changes commit 9c7a6b1 Author: Talley Lambert <[email protected]> Date: Tue Jun 27 09:35:43 2023 -0400 buncha changes commit d79a438 Author: Talley Lambert <[email protected]> Date: Mon Jun 26 17:59:33 2023 -0400 wip2 commit eda6b22 Author: Talley Lambert <[email protected]> Date: Thu Jun 22 20:35:30 2023 -0400 wip on xsdata commit a674cd9 Author: Talley Lambert <[email protected]> Date: Wed Jun 21 17:43:15 2023 -0400 working on tests commit 337340b Author: Talley Lambert <[email protected]> Date: Wed Jun 21 14:53:36 2023 -0400 making ome_types2 commit 74380d3 Author: Talley Lambert <[email protected]> Date: Wed Jun 21 14:53:19 2023 -0400 move tests commit 2e733f0 Author: Talley Lambert <[email protected]> Date: Wed Jun 21 10:55:11 2023 -0400 undo change commit 2b7784b Author: Talley Lambert <[email protected]> Date: Tue Jun 20 19:17:26 2023 -0400 ruff example commit 8a7ac3c Author: Talley Lambert <[email protected]> Date: Tue Jun 20 18:07:23 2023 -0400 wip commit 8909afc Author: Talley Lambert <[email protected]> Date: Tue Jun 20 17:39:52 2023 -0400 misc commit 05856b9 Author: Talley Lambert <[email protected]> Date: Tue Jun 20 16:24:31 2023 -0400 use old autogen name commit 8f3373c Author: Talley Lambert <[email protected]> Date: Tue Jun 20 11:52:20 2023 -0400 rename old autogen
1 parent 45219cc commit 33ae384

Some content is hidden

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

60 files changed

+2612
-3235
lines changed

.github/scripts/download_aics_test_data.py

-25
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
1-
name: build branch
1+
name: update built branch
22

33
on:
44
push:
55
branches:
66
- "main"
7-
schedule:
8-
# <minute [0,59]> <hour [0,23]> <day of the month [1,31]> <month of the year [1,12]> <day of the week [0,6]>
9-
# https://pubs.opengroup.org/onlinepubs/9699919799/utilities/crontab.html#tag_20_25_07
10-
# Run every Monday at 18:00:00 UTC (Monday at 10:00:00 PST)
11-
- cron: '0 18 * * 1'
127

138
jobs:
149
build:
@@ -17,24 +12,27 @@ jobs:
1712
- name: Checkout built branch
1813
uses: actions/checkout@v3
1914
with:
20-
ref: 'built'
15+
ref: "built"
16+
fetch-depth: 0
17+
2118
- uses: actions/setup-python@v4
2219
with:
23-
python-version: 3.9
20+
python-version: "3.x"
21+
2422
- name: Clone main
2523
run: git clone https://github.com/tlambert03/ome-types
2624
- name: Build
2725
run: |
28-
python -m pip install --upgrade pip
29-
pip install build
26+
python -m pip install --upgrade pip build
3027
python -m build ome-types --wheel
3128
rm -rf ome_types
3229
unzip ome-types/dist/ome_types-*
30+
3331
- name: Commit
3432
if: github.event_name == 'push'
3533
run: |
3634
git config user.name "Talley Lambert"
3735
git config user.email "[email protected]"
3836
git add ome_types
39-
git commit -m 'Commit from GitHub Actions (build.yml)'
37+
git commit -m 'Commit from GitHub Actions (built_branch.yml)'
4038
git push --set-upstream origin built

.github/workflows/release.yml

-44
This file was deleted.

.github/workflows/test.yml

+46-16
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@ on:
44
push:
55
branches:
66
- "main"
7+
tags:
8+
- "v*" # Push events to matching v*, i.e. v1.0, v20.15.10
79
pull_request:
810
branches:
911
- "main"
1012

13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.ref }}
15+
cancel-in-progress: true
16+
1117
jobs:
1218
check_manifest:
1319
name: check-manifest
@@ -28,16 +34,8 @@ jobs:
2834
strategy:
2935
fail-fast: false
3036
matrix:
31-
python-version: ['3.8', '3.9', '3.10']
37+
python-version: ["3.8", "3.9", "3.10", "3.11"]
3238
platform: [ubuntu-latest, macos-latest, windows-latest]
33-
include:
34-
- platform: ubuntu-latest
35-
python-version: '3.7'
36-
- platform: macos-latest
37-
python-version: '3.11'
38-
- platform: ubuntu-latest
39-
python-version: '3.11'
40-
# skipping windows 3.11 until lxml has wheels
4139

4240
steps:
4341
- uses: actions/checkout@v3
@@ -47,10 +45,42 @@ jobs:
4745
python-version: ${{ matrix.python-version }}
4846
- name: Install dependencies
4947
run: |
50-
python -m pip install --upgrade pip
51-
pip install tox tox-gh-actions
52-
pip install -e .[autogen]
53-
- name: Test with tox
54-
run: tox
55-
env:
56-
PLATFORM: ${{ matrix.platform }}
48+
python -m pip install -U pip
49+
python -m pip install .[test,dev]
50+
- name: Test
51+
run: pytest --cov --cov-report=xml
52+
53+
- uses: codecov/codecov-action@v2
54+
55+
deploy:
56+
name: Deploy
57+
runs-on: ubuntu-latest
58+
needs: [test, check_manifest]
59+
if: success() && startsWith(github.ref, 'refs/tags/') && github.event_name != 'schedule'
60+
61+
steps:
62+
- uses: actions/checkout@v3
63+
with:
64+
fetch-depth: 0
65+
66+
- name: Set up Python
67+
uses: actions/setup-python@v4
68+
with:
69+
python-version: "3.x"
70+
71+
- name: Build
72+
run: |
73+
pip install -U pip build
74+
python -m build .
75+
76+
- name: Publish PyPI Package
77+
uses: pypa/gh-action-pypi-publish@master
78+
with:
79+
user: __token__
80+
password: ${{ secrets.TWINE_API_KEY }}
81+
82+
- name: Create Release
83+
uses: softprops/action-gh-release@v1
84+
with:
85+
generate_release_notes: true
86+
files: "dist/*"

.github/workflows/test_aics.yml

-50
This file was deleted.

.github/workflows/test_dependents.yml

+95
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
name: test dependents
2+
3+
on:
4+
push:
5+
branches:
6+
- "main"
7+
pull_request:
8+
branches:
9+
- "main"
10+
11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: true
14+
15+
jobs:
16+
test-aicsimageio:
17+
name: test aicsimageio
18+
runs-on: ubuntu-latest
19+
steps:
20+
- uses: actions/checkout@v3
21+
with:
22+
repository: AllenCellModeling/aicsimageio
23+
submodules: true
24+
- uses: actions/checkout@v3
25+
with:
26+
path: ome-types
27+
fetch-depth: 0
28+
29+
- name: Set up Python
30+
uses: actions/setup-python@v4
31+
with:
32+
python-version: "3.11"
33+
34+
- name: Install aicsimageio
35+
run: |
36+
python -m pip install --upgrade pip
37+
python -m pip install .[test]
38+
python -m pip install bioformats_jar
39+
40+
- uses: actions/cache@v3
41+
id: cache
42+
with:
43+
path: aicsimageio/tests/resources
44+
key: ${{ hashFiles('scripts/TEST_RESOURCES_HASH.txt') }}
45+
46+
- name: Download Test Resources
47+
if: steps.cache.outputs.cache-hit != 'true'
48+
run: python scripts/download_test_resources.py --debug
49+
50+
- name: Install ome-types
51+
run: pip install .
52+
working-directory: ome-types
53+
54+
- name: Run Tests
55+
run: |
56+
pytest --color=yes -k "not test_known_errors_without_cleaning" \
57+
aicsimageio/tests/readers/test_ome_tiff_reader.py \
58+
aicsimageio/tests/readers/extra_readers/test_bioformats_reader.py \
59+
aicsimageio/tests/readers/extra_readers/test_ome_zarr_reader.py
60+
61+
test-paquo:
62+
name: test paquo
63+
runs-on: ubuntu-latest
64+
env:
65+
QUPATH_VERSION: 0.4.3
66+
steps:
67+
- uses: actions/checkout@v3
68+
- name: Set up Python ${{ matrix.python-version }}
69+
uses: actions/setup-python@v4
70+
with:
71+
python-version: ${{ matrix.python-version }}
72+
- name: Install dependencies
73+
run: |
74+
python -m pip install -U pip
75+
python -m pip install .[test,dev]
76+
python -m pip install paquo
77+
78+
- name: Restore qupath cache
79+
uses: actions/cache@v3
80+
env:
81+
CACHE_NUMBER: 0
82+
with:
83+
path: ./qupath/download
84+
key: ${{ runner.os }}-qupath-v${{ env.CACHE_NUMBER }}
85+
86+
- name: Install qupath and set PAQUO_QUPATH_DIR
87+
shell: bash
88+
run: |
89+
python -c "import os; os.makedirs('qupath/download', exist_ok=True)"
90+
python -c "import os; os.makedirs('qupath/apps', exist_ok=True)"
91+
python -m paquo get_qupath --install-path ./qupath/apps --download-path ./qupath/download ${{ env.QUPATH_VERSION }} \
92+
| grep -v "^#" | sed "s/^/PAQUO_QUPATH_DIR=/" >> $GITHUB_ENV
93+
94+
- name: Test with pytest
95+
run: pytest tests/test_paquo.py

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,9 @@ venv.bak/
107107

108108
.DS_Store
109109
_test_data
110-
src/ome_types/model/
110+
src/ome_types/_autogenerated/
111111
src/ome_types/_version.py
112112
docs/source/_autosummary
113113
.benchmarks/
114114
_build/
115+
qupath/

.pre-commit-config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ repos:
1313
exclude: ^tests|^docs
1414

1515
- repo: https://github.com/charliermarsh/ruff-pre-commit
16-
rev: v0.0.270
16+
rev: v0.0.275
1717
hooks:
1818
- id: ruff
1919
args: [--fix]
@@ -25,7 +25,7 @@ repos:
2525
exclude: ^docs
2626

2727
- repo: https://github.com/pre-commit/mirrors-mypy
28-
rev: v1.3.0
28+
rev: v1.4.1
2929
hooks:
3030
- id: mypy
3131
exclude: ^tests|^docs|_napari_plugin|widgets

README.md

-3
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,3 @@ python src/ome_autogen.py
304304
To run tests quickly, just install and run `pytest`. Note, however, that this
305305
requires that the `ome_types.model` module has already been built with `python
306306
src/ome_autogen.py`.
307-
308-
Alternatively, you can install and run `tox` which will run tests and
309-
code-quality checks in an isolated environment.

0 commit comments

Comments
 (0)