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

Clean up Dev branch #61

Open
slucey opened this issue Sep 14, 2023 · 12 comments · May be fixed by #67
Open

Clean up Dev branch #61

slucey opened this issue Sep 14, 2023 · 12 comments · May be fixed by #67
Assignees
Labels
Priority Things that need to recieve attention first
Milestone

Comments

@slucey
Copy link
Member

slucey commented Sep 14, 2023

Lots of stale branches that need to be dealt with below is a list of branches and the date of their latest commit:

  • sense_alpha
  • lab_savepoint
  • lab_563_spring2020 (includes the previous two branches) 9/2/20
  • master_R4 6/3/20
  • adjust_vectors 6/17/21
  • bioen 8/3/21
  • gh-pages 10/13/21
  • updateVignettes 12/6/21
  • lab_563_Spring2022 4/25/22

Last merge of dev to master 4/25/22

  • indiseas 6/8/22
  • stanza_rollback 7/11/22

Last dev commit 1/13/23

@slucey slucey self-assigned this Sep 14, 2023
@slucey slucey added the Priority Things that need to recieve attention first label Sep 14, 2023
@slucey
Copy link
Member Author

slucey commented Sep 14, 2023

Branches ahead of dev

  • split_files 1/13/23
  • documentation 1/13/23
  • fit_alpha 1/18/23
  • sense_beta 1/30/23
  • fit_alpha_ebs 7/6/23
  • eco_data 7/6/23

@slucey
Copy link
Member Author

slucey commented Sep 14, 2023

Looks like bioen was manually added back using the bioen_merge branch on 11/19/21

@slucey
Copy link
Member Author

slucey commented Sep 14, 2023

@kaydin I assume you want to leave the lab branches as a quick way to reference back to the version used in the class. Is there anything in them that should be merged into dev?

@kaydin
Copy link
Collaborator

kaydin commented Sep 14, 2023

@slucey yes I was going to suggest keeping the lab ones for reference, in case my class exercises stop working in future. I think I manually moved/cleaned up a few functions from the labs to dev that were globally useful, so nothing needed from the labs that isn't already in dev.

@kaydin
Copy link
Collaborator

kaydin commented Sep 14, 2023

eco_data is only ahead of dev because a new library version forced an update of RcppExports.cpp. Everything needed is merged into dev so safe to remove that one.

Edit: confirmed eco_data branch safe to delete, and deleted it.

@slucey
Copy link
Member Author

slucey commented Sep 15, 2023

@kaydin Great! Is there anything in master_R4 that need to be merged into dev?

@slucey slucey linked a pull request Sep 27, 2023 that will close this issue
@slucey
Copy link
Member Author

slucey commented Sep 27, 2023

Merging update_vignettes via pull request #67

@slucey
Copy link
Member Author

slucey commented Sep 27, 2023

stanza_rollback is being address via issue #45

There is an open pull request #51 to merge this into dev. Will do this before merging in @rklasky fix.

@slucey
Copy link
Member Author

slucey commented Sep 27, 2023

@kaydin Great! Is there anything in master_R4 that need to be merged into dev?

@kaydin looks like the only thing here is an update to the version of Roxygen. Is this more of a marker for you like the labs?

@slucey
Copy link
Member Author

slucey commented Sep 27, 2023

adjust_vectors was a minor tweak to adjust.scenarios that allows a user to specify a vector of groups to be changed. Also included some NOAA branding for the pkgdown site.

Merging via #68

@slucey
Copy link
Member Author

slucey commented Sep 27, 2023

After pulls #67 and #68 dev will be ready to merge into master and will change version number to 0.1.5. Then we will be ready to pull sense_beta into dev and finish documentation issues. Should quickly move dev with ecosense to master and move Rpath to version 0.2

@slucey slucey added this to the Version 0.1.5 milestone Sep 27, 2023
@kaydin
Copy link
Collaborator

kaydin commented Sep 27, 2023

Sorry thought I'd replied earlier - master_R4 was a temporary bridge between R versions 3 and 4 due to some library issues during that transition. Nothing here needed now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Priority Things that need to recieve attention first
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants