8000 Closes #5 and #6 update yamls as requested by zdz2101 · Pull Request #19 · Gilead-BioStats/gsm.mapping · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Closes #5 and #6 update yamls as requested #19

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

Merged
merged 10 commits into from
Jan 29, 2025
Merged

Closes #5 and #6 update yamls as requested #19

merged 10 commits into from
Jan 29, 2025

Conversation

zdz2101
Copy link
Contributor
@zdz2101 zdz2101 commented Jan 13, 2025
  • Modfies yamls for enhancement
  • Makes some of the port over changes more obvious
  • Adds DESCRIPTION / readme

Merge branch 'dev' into fix-5_6
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
@zdz2101 zdz2101 marked this pull request as ready for review January 15, 2025 18:42
@@ -30,7 +31,7 @@ Imports:
yaml
Remotes:
clindata=Gilead-BioStats/clindata,
gsm=Gilead-BioStats/gsm@fix-2010
gsm=Gilead-BioStats/gsm@zz_test
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make the appropriate swap to a branch that contains the stop_if() export, I had a branch called zz_test that contained it but it looks like the v2.2.2 candidate will too, if that Gilead-BioStats/gsm#2021, gets merged point this gsm=Gilead-BioStats/gsm@{INSERT BRANCH} (probably dev or main?) into here

Copy link
Contributor
@lauramaxwell lauramaxwell Jan 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would we want to wait until the PR that resolves 2010 to be merged into dev to make this change? otherwise we are using the version of gsm that has all of the duplicate functions as gsm.mapping

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that containing the duplicates for now should be fine, you can solve for NAMESPACE gaps in gsm after the fact (make sure all gsm.mapping functions in tests/vignettes call gsm.mapping:: ), the trick scenario is when a branch of gsm has this branch as a suggests and this branch points directly back at the aforementioned gsm branch, I had it set up like this but the ci/cd would be on the fritz quite frequently, sometimes working sometimes not

Copy link
Contributor Author
@zdz2101 zdz2101 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lauramaxwell added a readme blurb as well as instructions across the cookie trail of PRs I have up related to the splitting. In terms of steps:

  1. Merge Closes #2010 migration of additional mapping aspects gsm#2018 and v2.2.2 RC gsm#2021
  2. Change the DESCRIPTION file of this branch/PR to have a dependency on gsm that contains the stop_if() export
  3. Merge this PR
  4. Modify the .github workflows of Closes #1972 intial gsm.mapping spin out gsm#2002 to install_github("Gilead-BioStats/gsm.mapping", ref = "dev")
  5. Whenver we're ready to merge that, the two packages should "successfully" fingers crossed separated

Copy link
Contributor
@lauramaxwell lauramaxwell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good! a few small edits to the readme and we should be good to go!

zdz2101 and others added 3 commits January 17, 2025 07:16
Co-authored-by: Laura Maxwell <laura.maxwell1@gilead.com>
Co-authored-by: Laura Maxwell <laura.maxwell1@gilead.com>
Co-authored-by: Laura Maxwell <laura.maxwell1@gilead.com>
@lauramaxwell lauramaxwell merged commit 8be103e into dev Jan 29, 2025
4 checks passed
@lauramaxwell lauramaxwell deleted the fix-5_6 branch March 25, 2025 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants
0