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

Migrate GenericMap to inherit from NDCube #7547

Draft
wants to merge 71 commits into
base: main
Choose a base branch
from
Draft

Migrate GenericMap to inherit from NDCube #7547

wants to merge 71 commits into from

Commits on Apr 22, 2024

  1. Move all map metadata properties onto a Mixin class

    @Cadair
    Cadair committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    c772dff View commit details
    Browse the repository at this point in the history

  2. Actually use ndcube

    @Cadair
    Cadair committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    b94ec09 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2024

  1. Add back MapMetaMixin

    @Cadair
    Cadair committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    8d38b9f View commit details
    Browse the repository at this point in the history

  2. NDCube.__init__ accesses .wcs and chaos unfolds

    @Cadair
    Cadair committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    52e083d View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. fix unit tests part 1

    @nabobalis @Cadair
    nabobalis authored and Cadair committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    d5442b9 View commit details
    Browse the repository at this point in the history

  2. fix unit tests part 2

    @nabobalis @Cadair
    nabobalis authored and Cadair committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    ce881d4 View commit details
    Browse the repository at this point in the history

  3. disable cache

    @nabobalis @Cadair
    nabobalis authored and Cadair committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    9cdbcab View commit details
    Browse the repository at this point in the history

  4. mod test

    @nabobalis @Cadair
    nabobalis authored and Cadair committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    3e142dd View commit details
    Browse the repository at this point in the history

  5. improve tests

    @nabobalis @Cadair
    nabobalis authored and Cadair committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    a337caf View commit details
    Browse the repository at this point in the history

  6. make ruff happy

    @nabobalis @Cadair
    nabobalis authored and Cadair committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    cb73092 View commit details
    Browse the repository at this point in the history

  7. remove old p2w and w2p functions

    @nabobalis @Cadair
    nabobalis authored and Cadair committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    8d38c0b View commit details
    Browse the repository at this point in the history

  8. modify all places we used to call old functions

    @nabobalis @Cadair
    nabobalis authored and Cadair committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    ec1e596 View commit details
    Browse the repository at this point in the history

  9. Fix more tests

    @nabobalis @Cadair
    nabobalis authored and Cadair committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    f1e1d30 View commit details
    Browse the repository at this point in the history

  10. install ndcube from github (#7589)

    @wtbarnes
    wtbarnes committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    d18b56b View commit details
    Browse the repository at this point in the history

  11. add unit test

    @nabobalis
    nabobalis committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    c338e54 View commit details
    Browse the repository at this point in the history

  12. Add wcs setter and test with SlicedLowLevelWCS

    @Cadair @DanRyanIrish
    Cadair authored and DanRyanIrish committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    d76d3ee View commit details
    Browse the repository at this point in the history

  13. Add back MapMetaMixin

    @Cadair @nabobalis
    Cadair authored and nabobalis committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    b030118 View commit details
    Browse the repository at this point in the history

  14. Removes vim mistake

    @CyclingNinja @nabobalis
    CyclingNinja authored and nabobalis committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    4e0edea View commit details
    Browse the repository at this point in the history

  15. Make the drop dimension error message smart

    @Cadair @nabobalis
    Cadair authored and nabobalis committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    3b0f474 View commit details
    Browse the repository at this point in the history

  16. Aligns mapbase init with ndcube init

    @CyclingNinja @nabobalis
    CyclingNinja authored and nabobalis committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    f5da1e1 View commit details
    Browse the repository at this point in the history

  17. Propagates the header -> meta case

    @CyclingNinja @nabobalis
    CyclingNinja authored and nabobalis committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    d2f5ed1 View commit details
    Browse the repository at this point in the history

  18. Corrects dunders in source classes

    @CyclingNinja @nabobalis
    CyclingNinja authored and nabobalis committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    703d124 View commit details
    Browse the repository at this point in the history

  19. Fixes kcor oberver coord test

    @CyclingNinja @nabobalis
    CyclingNinja authored and nabobalis committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    92a6100 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. hash file

    @nabobalis
    nabobalis committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    1f07488 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/main' into yolo

    @nabobalis
    nabobalis committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    f2c280a View commit details
    Browse the repository at this point in the history

  3. Fix other issues

    @nabobalis
    nabobalis committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    d92d36b View commit details
    Browse the repository at this point in the history

  4. Fix more bugs with wcs setter / gettitem

    @Cadair
    Cadair committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    391a0a2 View commit details
    Browse the repository at this point in the history

  5. doc build

    @nabobalis
    nabobalis committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    d670622 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'map_ndcube_migration' into yolo

    @Cadair
    Cadair committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    96400b8 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #7595 from nabobalis/yolo 

    [map branch] Merge in upstream/main
    @Cadair
    Cadair committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    98e0b0a View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. remove arithmetic methods

    @wtbarnes @DanRyanIrish
    wtbarnes authored and DanRyanIrish committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    1c96e17 View commit details
    Browse the repository at this point in the history

  2. catch divide by zero warning

    @wtbarnes @DanRyanIrish
    wtbarnes authored and DanRyanIrish committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    826a4a8 View commit details
    Browse the repository at this point in the history

  3. changelog

    @wtbarnes @DanRyanIrish
    wtbarnes authored and DanRyanIrish committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    7a8530f View commit details
    Browse the repository at this point in the history

  4. fix unit handling

    @wtbarnes @DanRyanIrish
    wtbarnes authored and DanRyanIrish committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    1773e86 View commit details
    Browse the repository at this point in the history

  5. set plot_settings

    @wtbarnes @DanRyanIrish
    wtbarnes authored and DanRyanIrish committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    04f294f View commit details
    Browse the repository at this point in the history

  6. refactor how new instances are handled

    @wtbarnes @DanRyanIrish
    wtbarnes authored and DanRyanIrish committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    c2f878e View commit details
    Browse the repository at this point in the history

  7. do not need arithmetic decorator

    @wtbarnes @DanRyanIrish
    wtbarnes authored and DanRyanIrish committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    c92b7a0 View commit details
    Browse the repository at this point in the history

  8. set wcs=None in _new_instance

    @wtbarnes @DanRyanIrish
    wtbarnes authored and DanRyanIrish committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    5238271 View commit details
    Browse the repository at this point in the history

  9. move viz things from mapbase to plotter

    @wtbarnes @DanRyanIrish
    wtbarnes authored and DanRyanIrish committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    06b47c6 View commit details
    Browse the repository at this point in the history

  10. move _get_cmap_name back to mapbase

    @wtbarnes @DanRyanIrish
    wtbarnes authored and DanRyanIrish committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    6e2709a View commit details
    Browse the repository at this point in the history

  11. move vmin/vmax setting to plotter

    @wtbarnes @DanRyanIrish
    wtbarnes authored and DanRyanIrish committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    3508050 View commit details
    Browse the repository at this point in the history

  12. fixing plotter and renaming

    @hayesla @DanRyanIrish
    hayesla authored and DanRyanIrish committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    bbb2a10 View commit details
    Browse the repository at this point in the history

  13. Fix tests hopefully

    @nabobalis @DanRyanIrish
    nabobalis authored and DanRyanIrish committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    6db2e50 View commit details
    Browse the repository at this point in the history

  14. Fixed more stuff

    @nabobalis @DanRyanIrish
    nabobalis authored and DanRyanIrish committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    7868712 View commit details
    Browse the repository at this point in the history

  15. hack

    @nabobalis @DanRyanIrish
    nabobalis authored and DanRyanIrish committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    4ef80b6 View commit details
    Browse the repository at this point in the history

  16. changelog fix

    @nabobalis @DanRyanIrish
    nabobalis authored and DanRyanIrish committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    ae20750 View commit details
    Browse the repository at this point in the history

  17. test fix

    @nabobalis @DanRyanIrish
    nabobalis authored and DanRyanIrish committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    ab67f4f View commit details
    Browse the repository at this point in the history

  18. deprecate the plot_settings

    @wtbarnes @DanRyanIrish
    wtbarnes authored and DanRyanIrish committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    6fa2139 View commit details
    Browse the repository at this point in the history

  19. no deprecation; remove abc

    @wtbarnes @DanRyanIrish
    wtbarnes authored and DanRyanIrish committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    de35978 View commit details
    Browse the repository at this point in the history

  20. fixes from code review

    @wtbarnes @DanRyanIrish
    wtbarnes authored and DanRyanIrish committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    b6c55d5 View commit details
    Browse the repository at this point in the history

  21. Take the easy way out

    @Cadair @DanRyanIrish
    Cadair authored and DanRyanIrish committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    ac4a7da View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2024

  1. moving data methods into mixin

    @hayesla @DanRyanIrish
    hayesla authored and DanRyanIrish committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    4c238f7 View commit details
    Browse the repository at this point in the history

  2. getting it from the right places

    @hayesla @DanRyanIrish
    hayesla authored and DanRyanIrish committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    961064d View commit details
    Browse the repository at this point in the history

  3. adding deprecation warnings

    @hayesla @DanRyanIrish
    hayesla authored and DanRyanIrish committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    faceb30 View commit details
    Browse the repository at this point in the history

  4. adding deprecate messages

    @hayesla @DanRyanIrish
    hayesla authored and DanRyanIrish committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    0d6bfd9 View commit details
    Browse the repository at this point in the history

  5. fixing spelling

    @hayesla @DanRyanIrish
    hayesla authored and DanRyanIrish committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    7d5d73e View commit details
    Browse the repository at this point in the history

  6. adding changelog

    @hayesla @DanRyanIrish
    hayesla authored and DanRyanIrish committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    b518c11 View commit details
    Browse the repository at this point in the history

  7. changing dimensions to shape and fixing tests

    @hayesla @DanRyanIrish
    hayesla authored and DanRyanIrish committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    1b8ce4c View commit details
    Browse the repository at this point in the history

  8. updating tests

    @hayesla @DanRyanIrish
    hayesla authored and DanRyanIrish committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    cd85b01 View commit details
    Browse the repository at this point in the history

  9. fixing test

    @hayesla @DanRyanIrish
    hayesla authored and DanRyanIrish committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    1fc1342 View commit details
    Browse the repository at this point in the history

  10. fixing test

    @hayesla @DanRyanIrish
    hayesla authored and DanRyanIrish committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    24926f3 View commit details
    Browse the repository at this point in the history

  11. still test_rotate failing

    @hayesla @DanRyanIrish
    hayesla authored and DanRyanIrish committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    a08a340 View commit details
    Browse the repository at this point in the history

  12. no dtype for you!

    @Cadair @DanRyanIrish
    Cadair authored and DanRyanIrish committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    2a6f36f View commit details
    Browse the repository at this point in the history

  13. wibble

    @Cadair @DanRyanIrish
    Cadair authored and DanRyanIrish committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    ed9232c View commit details
    Browse the repository at this point in the history

  14. Removes further references to Map.mean() 

    bug fix with nans in `test_rotate()`
    @CyclingNinja @DanRyanIrish
    CyclingNinja authored and DanRyanIrish committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    8a53803 View commit details
    Browse the repository at this point in the history

  15. fix the rotate test

    @Cadair @DanRyanIrish
    Cadair authored and DanRyanIrish committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    3140e37 View commit details
    Browse the repository at this point in the history

  16. fixing dtype to .data.dtype on plotter

    @hayesla @DanRyanIrish
    hayesla authored and DanRyanIrish committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    45b7f7e View commit details
    Browse the repository at this point in the history

  17. fix bad rebase that i did

    @nabobalis @DanRyanIrish
    nabobalis authored and DanRyanIrish committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    fa61199 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. [map branch] Fix setter again (#7616)

    @Cadair
    Cadair committed May 8, 2024
    Configuration menu
    Copy the full SHA
    6c37fbd View commit details
    Browse the repository at this point in the history

Commits on May 26, 2024

  1. [map_branch] Merge in main and fix file conflict. (#7645) 

    * Clean up util imports

* Fix a small bug in solar_frame_to_wcs_mapping
Fix a small bug in solar_frame_to_wcs_mapping when dealing with custom subclasses.

* Add failing test
* Update code to pass test
* Add change log

Co-authored-by: Albert Y. Shih <ayshih@gmail.com>

* move simulation LOS intersection example to showcase (#7610)

* fix devdep test

* fix si units

* Doc test fixes?

* Revert

* moose

* Update .github/workflows/ci.yml

* new spelling

* spelling

* Fixed bug where convertion of results from the HEKClient to Astropy Time failed when some values where empty or missing

* Added CHANGELOG

* add quick unit test

* Updated deprecated to use astropy underneath as we can pass in the warning type

* Fix failing link (#7633)

* Tidy up of the io docs and Api page

* Fix tests and broken call

* changelog

* Update docs/reference/io.rst

Co-authored-by: Will Barnes <will.t.barnes@gmail.com>

* fix imports and tidy up

* Add api docs to dev

* silent ana

* Fix doc build

* Fix dep warning raising on incorrect imports

* Fix actual import

* actually fix it (#7622)

* Remove unused and unsecure changelog items

* Update sphinx gallery config to be valid now under new sphinx versions

* precommit update [skip ci] (#7641)

---------

Co-authored-by: Stuart Mumford <stuart@cadair.com>
Co-authored-by: Shane Maloney <shane.maloney@dias.ie>
Co-authored-by: Albert Y. Shih <ayshih@gmail.com>
Co-authored-by: Will Barnes <will.t.barnes@gmail.com>
Co-authored-by: Benjamin Mampaey <benjamin.mampaey@oma.be>
    @nabobalis @Cadair
    @samaloney @ayshih @wtbarnes @bmampaey
    6 people committed May 26, 2024
    Configuration menu
    Copy the full SHA
    d98e169 View commit details
    Browse the repository at this point in the history

  2. [map_branch] ??? (#7647) 

    * Clean up util imports

* Fix a small bug in solar_frame_to_wcs_mapping
Fix a small bug in solar_frame_to_wcs_mapping when dealing with custom subclasses.

* Add failing test
* Update code to pass test
* Add change log

Co-authored-by: Albert Y. Shih <ayshih@gmail.com>

* move simulation LOS intersection example to showcase (#7610)

* fix devdep test

* fix si units

* Doc test fixes?

* Revert

* moose

* Update .github/workflows/ci.yml

* new spelling

* spelling

* Fixed bug where convertion of results from the HEKClient to Astropy Time failed when some values where empty or missing

* Added CHANGELOG

* add quick unit test

* Updated deprecated to use astropy underneath as we can pass in the warning type

* Fix failing link (#7633)

* Tidy up of the io docs and Api page

* Fix tests and broken call

* changelog

* Update docs/reference/io.rst

Co-authored-by: Will Barnes <will.t.barnes@gmail.com>

* fix imports and tidy up

* Add api docs to dev

* silent ana

* Fix doc build

* Fix dep warning raising on incorrect imports

* Fix actual import

* actually fix it (#7622)

* Remove unused and unsecure changelog items

* Update sphinx gallery config to be valid now under new sphinx versions

* precommit update [skip ci] (#7641)

---------

Co-authored-by: Stuart Mumford <stuart@cadair.com>
Co-authored-by: Shane Maloney <shane.maloney@dias.ie>
Co-authored-by: Albert Y. Shih <ayshih@gmail.com>
Co-authored-by: Will Barnes <will.t.barnes@gmail.com>
Co-authored-by: Benjamin Mampaey <benjamin.mampaey@oma.be>
    @nabobalis @Cadair
    @samaloney @ayshih @wtbarnes @bmampaey
    6 people committed May 26, 2024
    Configuration menu
    Copy the full SHA
    472147f View commit details
    Browse the repository at this point in the history