Uploaded image for project: 'Data Management'
  1. Data Management
  2. DM-15268

Merge gen3-middleware branches to master

    Details

    • Story Points:
      1
    • Sprint:
      BG3_F18_07, BG3_F18_08
    • Team:
      Data Release Production

      Description

      Rebase and merge these branches after making sure they work.  Will require daf_butler to be added as a dependency of at least some of these packages.

       

        Attachments

          Issue Links

            Activity

            Hide
            jbosch Jim Bosch added a comment -

            Added DM-15411 to move gen2convert (and DM-15412 to move afw-based formatters).

            Show
            jbosch Jim Bosch added a comment - Added DM-15411 to move gen2convert (and DM-15412 to move afw-based formatters).
            Hide
            tjenness Tim Jenness added a comment -

            Looks okay. We have to move all the gen2 migration stuff out of daf_butler at some point since daf_butler should not be using lsst.log and daf_persistence.

            Show
            tjenness Tim Jenness added a comment - Looks okay. We have to move all the gen2 migration stuff out of daf_butler at some point since daf_butler should not be using lsst.log and daf_persistence.
            Hide
            jbosch Jim Bosch added a comment - - edited

            Tim Jenness, have time for what should hopefully be a quick review today?  I've now got ci_hsc working on these ticket branches, and I'm hoping to get it merged tonight before the weekly?

            FYI, plan is:

             - get tickets/DM-15268 branches reviewed

             - merge --no-ff tickets/DM-15268 to master for daf_butler and gen3-middleware for others

             - run Jenkins one last time on gen3-middleware, just in case

             - merge --ff gen3-middleware to master

            That should preserve individual ticket merge commits on master without adding the gen3-middleware merge commit.

            Show
            jbosch Jim Bosch added a comment - - edited Tim Jenness , have time for what should hopefully be a quick review today?  I've now got ci_hsc working on these ticket branches, and I'm hoping to get it merged tonight before the weekly? FYI, plan is:  - get tickets/ DM-15268 branches reviewed  - merge --no-ff tickets/ DM-15268 to master for daf_butler and gen3-middleware for others  - run Jenkins one last time on gen3-middleware, just in case  - merge --ff gen3-middleware to master That should preserve individual ticket merge commits on master without adding the gen3-middleware merge commit.

              People

              • Assignee:
                jbosch Jim Bosch
                Reporter:
                jbosch Jim Bosch
                Reviewers:
                Tim Jenness
                Watchers:
                Jim Bosch, Tim Jenness
              • Votes:
                0 Vote for this issue
                Watchers:
                2 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved:

                  Summary Panel