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

add support for de/serializing objects with json and msgpack #230

Merged
merged 22 commits into from Nov 4, 2022
Merged

add support for de/serializing objects with json and msgpack #230

merged 22 commits into from Nov 4, 2022

Commits on Nov 3, 2022

  1. WIP: add support for de/serializing objects with json, msgpack or pickle

    @anthrotype
    anthrotype committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    5a53459 View commit details
    Browse the repository at this point in the history

  2. LayerSet/Layer: record self._lazy and make unlazify idempotent 

    similar to Font, DataSet, ImageSet
    @anthrotype
    anthrotype committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    bc82a2a View commit details
    Browse the repository at this point in the history

  3. remove unused Attribute.metadata[copyable] 

    we currently don't have any attributes that are init=True and copyable=False, the only copyable=False is Font.path which is also init=False, so simply checking if init=False is enough
    @anthrotype
    anthrotype committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    c1322fe View commit details
    Browse the repository at this point in the history

  4. make lazy Font/LayerSet/Layer/DataStore pickleable

    @anthrotype
    anthrotype committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    e0f3d6a View commit details
    Browse the repository at this point in the history

  5. recompile requirements.txt with new [json,msgpack] extras

    @anthrotype
    anthrotype committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    829e35a View commit details
    Browse the repository at this point in the history

  6. add tests/ufoLib2/serde

    @anthrotype
    anthrotype committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    d3a2b6a View commit details
    Browse the repository at this point in the history

  7. skip test if extras not installed; force mypy to not typecheck orjson

    @anthrotype
    anthrotype committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    3442969 View commit details
    Browse the repository at this point in the history

  8. info: forgot to add @serde decorator on Info class!

    @anthrotype
    anthrotype committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    0dfc108 View commit details
    Browse the repository at this point in the history

  9. test de/serializing ALL ufoLib2.objects 

    and in fact I had forgotten to decorate one of them (Info) ;)
    @anthrotype
    anthrotype committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    fb32994 View commit details
    Browse the repository at this point in the history

  10. skip format-specific tests when cattrs can't be imported

    @anthrotype
    anthrotype committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    30f639f View commit details
    Browse the repository at this point in the history

  11. remove ufoLib2.serde.pickle, doesn't add anything 

    Doing font.pickle_dumps() is exactly the same as doing pickle.dumps(font), same for Font.pickle_loads(s) vs pickle.loads(s), we don't use cattrs for pickling. So it's better to simply remove the extra code, pickling still works out of the box (even with lazy objects now).
    @anthrotype
    anthrotype committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    0ac647b View commit details
    Browse the repository at this point in the history

  12. also test {json,msgpack}_load/dump with paths, in addition to files

    @anthrotype
    anthrotype committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    6378e56 View commit details
    Browse the repository at this point in the history

  13. change custom {get,set}state to use dict, like upstream attrs does 

    Follows python-attrs/attrs#1009
    @anthrotype
    anthrotype committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    5a8d9bc View commit details
    Browse the repository at this point in the history

  14. require latest attrs/cattrs; rename GenConverter => Converter 

    in latest cattrs, GenConverter _is_ the normal Converter anyway
    @anthrotype
    anthrotype committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    a8223ed View commit details
    Browse the repository at this point in the history

  15. import attrs/cattrs from the new namespaces with the 's' at the end

    @anthrotype
    anthrotype committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    b421da3 View commit details
    Browse the repository at this point in the history

  16. converters: pass on new detailed_validation option, fix test

    @anthrotype
    anthrotype committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    7c7f7f7 View commit details
    Browse the repository at this point in the history

  17. recompile requirements-dev.txt as well

    @anthrotype
    anthrotype committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    1206873 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2022

  1. make mypy happy again

    @anthrotype
    anthrotype committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    ebc3131 View commit details
    Browse the repository at this point in the history

  2. do use orjson typing stubs after all

    @anthrotype
    anthrotype committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    b88ff09 View commit details
    Browse the repository at this point in the history

  3. add comment to test_pickle_lazy_font [skip ci]

    @anthrotype
    anthrotype committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    c6e188c View commit details
    Browse the repository at this point in the history

  4. add standalone load/dump functions in each ufoLib2.serde submodule 

    So one can do ufoLib2.serde.json.load('MyFont.json', ufoLib2.Font) in alternative to ufoLib2.Font.json_load('MyFont.json')
    @anthrotype
    anthrotype committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    36d4632 View commit details
    Browse the repository at this point in the history

  5. fix typos in comments [skip ci]

    @anthrotype
    anthrotype committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    7a9d1de View commit details
    Browse the repository at this point in the history