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.

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

Using main/elasticc as the main branch for our ELAsTiCC broker #164

Open
7 of 8 tasks
troyraen opened this issue Sep 20, 2022 · 4 comments
Open
7 of 8 tasks

Using main/elasticc as the main branch for our ELAsTiCC broker #164

troyraen opened this issue Sep 20, 2022 · 4 comments
Assignees
Labels
Documentation Documentation needs to be added or corrected ELAsTiCC Tracks development of our ELAsTiCC broker Goal Defines a goal. Tracks related PRs and Issues.

Comments

@troyraen
Copy link
Collaborator

troyraen commented Sep 20, 2022

This issue announces the designation of main/elasticc as the main branch for our ELAsTiCC broker. This issue will also track the branch's lifecycle.

  • This issue should be closed when main/elasticc is either:
    • merged back in to develop,
    • spun off into its own repo,
    • or the decision is made to leave it here, and its existence is properly documented so that it can be found more easily. We may ultimately want to keep different main branches for code bases that run different surveys. In that case we could keep this naming scheme, so what is currently develop could become main/ztf. (ok, probably not)

Background / Motivation

The changes in PR #153 represent a logical first chunk in our development for ELAsTiCC. In addition, we have copied some of the broker's modules to the new pittgoogle-user where they will be used to run an independent pipeline in a separate GCP project, that will operate downstream from our ELAsTiCC broker. See #107.

Our ELAsTiCC broker and its development track is now considerably different from our ZTF broker. In addition, right now, our work on the ELAsTiCC broker needs to move quickly and nimbly. Thus, we are now designating main/elasticc as the main branch for our ELAsTiCC broker. This will allow our development for the ELAsTiCC broker to continue as an independent (sub)project -- with its own clear chain of PRs, etc. -- without cutting it off from this repo completely. We can decide whether/how to merge the two broker code bases after the ELAsTiCC broker design solidifies a bit more.

Plan for the immediate future

  • Next I am going to change the base branch on PR Changes for elasticc #153 from develop to main/elasticc. Right now those two branches are exactly the same, so this will not change anything about any of the code changes included in the PR. It just cuts the develop branch off so elasticc won't affect it (for now).
  • Then I am going to resolve the conflicts (just a couple of simple, random loose ends).
  • Then I will approve Changes for elasticc #153.
  • Then, @hernandezc1 should merge his PR (which at that point will be u/CH/test -> main/elasticc). Congratulations on a successful pull request 🎉 .
  • We will continue on from there with our development of the broker for the ELAsTiCC challenge -- treating main/elasticc as the main branch for the project. All work for this project should then be done in feature branches that are based on main/elasticc -- and thus we should open PRs for those feature branches that request to merge into main/elasticc.
  • ... and the first thing we should do from there is Declutter main/elasticc #165 (which I opened a PR for: Issues/165 #166)
  • ... and then add the IAM permissions (which I opened a PR for: add IAM role userPublic to allow allUsers to attach subscriptions to topics #167 )

cc: @wmwv

@troyraen troyraen added Documentation Documentation needs to be added or corrected Goal Defines a goal. Tracks related PRs and Issues. ELAsTiCC Tracks development of our ELAsTiCC broker labels Sep 20, 2022
@troyraen troyraen changed the title Using elasticc/main as the main branch for our ELAsTiCC broker Using main/elasticc as the main branch for our ELAsTiCC broker Sep 20, 2022
@troyraen
Copy link
Collaborator Author

@hernandezc1 here's your next steps:

@troyraen
Copy link
Collaborator Author

@wmwv @djperrefort @hernandezc1 @ap1605 Reminding you of, or introducing you to, this branch.

Our ELAsTiCC broker code mostly consists of a stripped-down version of our ZTF one (perhaps with some improvements like IAM permissions). It was very helpful to @hernandezc1 and I to do this during development. But perhaps now is a good time to consider merging this back into the main branch?

@djperrefort
Copy link
Member

But perhaps now is a good time to consider merging this back into the main branch?

In general I think it is a good idea to keep the main branch as up to date and complete as possible.

@troyraen
Copy link
Collaborator Author

troyraen commented Jun 1, 2024

@hernandezc1 Now that we have multiple surveys going in the main (develop) branch, how about merging this branch back in there?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Documentation Documentation needs to be added or corrected ELAsTiCC Tracks development of our ELAsTiCC broker Goal Defines a goal. Tracks related PRs and Issues.
Projects
None yet
Development

No branches or pull requests

3 participants