Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Fix colors #190

Merged
merged 3 commits into from
Jul 6, 2023
Merged

fix: Fix colors #190

merged 3 commits into from
Jul 6, 2023

Conversation

tlambert03
Copy link
Owner

FillColor and StrokeColor are now Color objects, rather than ints

@tlambert03 tlambert03 merged commit bd3a799 into v2 Jul 6, 2023
19 checks passed
@tlambert03 tlambert03 deleted the fix-colors branch July 6, 2023 20:17
tlambert03 added a commit that referenced this pull request Jul 6, 2023
@tlambert03 @pre-commit-ci
Merge pull request #176 from tlambert03/v2
91198fb 
* 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

* checkin xsdata-pydantic

* style(pre-commit.ci): auto fixes [...]

* test: add more tests (#177)

* test: adding tests

* remove branch restriction on pr tests

* fix color

* fix aicsimageio test

* working on canonicalization and exclude_unset

* minimize roundtrip test code

* add report

* add  more tests

* add more tests

* fix py38 types

* fix: more robust id conversion (#180)

* more robust ids

* add uuid factory, commented out

* fix: clear converted ids at the beginning of each OME instance

* update precommit

* add test file

* fix version

* test: add typing tests (#178)

* test: adding typesafety

* fix manifest

* add test dep

* test on push to v2

* don't warn unused

* feat: better rich_repr (#181)

* fix: fix rich repr

* bring back plain repr for non rich

* fix: fix metadata only (#184)

* fix: fix metadata only

* fix pre-commit

* fix: use date time instead of xsdata XMLDateTime (#182)

* fix: use datetime instead of XMLDateTime

* add more test

* fix: better sequence for structured annotations (#186)

* fix: better sequence for structured annotations

* fix iter

* test: Omero-cli-transfer test (#187)

* wip

* fix: better sequence for structured annotations

* fix iter

* test: add omero-cli-test

* fix skip

* test: add nd2 test (#188)

* test: add nd2 test

* fix command

* build: add back py37 support (#189)

* fix: Fix colors (#190)

* fix: fix colors

* test

* fix mypy

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@tlambert03 tlambert03 added the bug Something isn't working label Jul 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
bug Something isn't working
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@tlambert03