[IGBF-3867] Create a release branch without Ensembl code in it - JIRA UNCC

Details

Type: Task
Status: Closed (View Workflow)
Priority: Major
Resolution: Done
Affects Version/s: None
Fix Version/s: None
Labels:
None

Story Points:
0.5
Epic Link:
Release IGB 10.1.0
Sprint:
Summer 7, Fall 1, Fall 2, Fall 3

Description

Investigate the available options to create a release branch without the Ensembl code in it, either revert the commits or drop them, find out which would be the best suitable option and then create the release branch.

Attachments

Issue Links

blocks

IGBF-3881 Add samtools filter by and color by options for CR and CB tags

Closed

Activity

Ascending order - Click to sort in descending order

Jaya Sravani Sirigineedi (Inactive) created issue - 16/Aug/24 9:56 AM

Jaya Sravani Sirigineedi (Inactive) made changes - 16/Aug/24 9:56 AM

Field	Original Value	New Value
Status	To-Do [ 10305 ]	In Progress [ 3 ]

Nowlan Freese made changes - 16/Aug/24 11:05 AM

Epic Link

~~IGBF-3871~~ [ 23171 ]

Hide

Permalink

Jaya Sravani Sirigineedi (Inactive) added a comment - 19/Aug/24 9:49 AM - edited

After the discussion with Ann Loraine and Nowlan Freese, we have decided on the below approach to create a release branch:

First to remove the Ensembl code, we have decided to use the revert option as it keeps the git commit history clean and it allows us to revert the revert to get the original code.
To do this, we will be creating a release branch first from the updated main branch and then we will remove the Ensembl code, this way main will have the Ensembl code and the release branch won't and any further bugfixes to the release branch should be merged to main as well (i.e., two PRs for each bugfix).

This will be done once all the tickets related to UCSC and the Google Analytics are finished and merged into the main. (~~IGBF-3853~~, ~~IGBF-3813~~ and IGBF-3865)

Show

Jaya Sravani Sirigineedi (Inactive) added a comment - 19/Aug/24 9:49 AM - edited After the discussion with Ann Loraine and Nowlan Freese , we have decided on the below approach to create a release branch: First to remove the Ensembl code, we have decided to use the revert option as it keeps the git commit history clean and it allows us to revert the revert to get the original code. To do this, we will be creating a release branch first from the updated main branch and then we will remove the Ensembl code, this way main will have the Ensembl code and the release branch won't and any further bugfixes to the release branch should be merged to main as well (i.e., two PRs for each bugfix). This will be done once all the tickets related to UCSC and the Google Analytics are finished and merged into the main. ( IGBF-3853 , IGBF-3813 and IGBF-3865)

Jaya Sravani Sirigineedi (Inactive) made changes - 19/Aug/24 9:49 AM

Status

In Progress [ 3 ]

To-Do [ 10305 ]

Ann Loraine made changes - 26/Aug/24 10:32 AM

Sprint

Summer 7 [ 201 ]

Summer 7, Fall 1 [ 201, 202 ]

Ann Loraine made changes - 26/Aug/24 10:32 AM

Rank

Ranked higher

Ann Loraine made changes - 16/Sep/24 8:34 AM

Sprint

Summer 7, Fall 1 [ 201, 202 ]

Summer 7, Fall 1, Fall 2 [ 201, 202, 203 ]

Ann Loraine made changes - 16/Sep/24 8:34 AM

Rank

Ranked higher

Hide

Permalink

Nowlan Freese added a comment - 24/Sep/24 11:20 AM

I think the two Ensembl commits we need to remove for the candidate release branch are ~~IGBF-3780~~ and ~~IGBF-3776~~.

Show

Nowlan Freese added a comment - 24/Sep/24 11:20 AM I think the two Ensembl commits we need to remove for the candidate release branch are IGBF-3780 and IGBF-3776 .

Nowlan Freese made changes - 30/Sep/24 10:24 AM

Assignee

Jaya Sravani Sirigineedi [ jsirigin ]

Nowlan Freese [ nfreese ]

Nowlan Freese made changes - 30/Sep/24 10:24 AM

Status

To-Do [ 10305 ]

In Progress [ 3 ]

Nowlan Freese made changes - 30/Sep/24 3:01 PM

Status

In Progress [ 3 ]

To-Do [ 10305 ]

Nowlan Freese made changes - 30/Sep/24 3:01 PM

Assignee

Nowlan Freese [ nfreese ]

Nowlan Freese made changes - 02/Oct/24 3:45 PM

Assignee

Jaya Sravani Sirigineedi [ jsirigin ]

Karthik Raveendran made changes - 04/Oct/24 10:12 AM

Link

This issue blocks ~~IGBF-3881~~ [ ~~IGBF-3881~~ ]

Jaya Sravani Sirigineedi (Inactive) made changes - 04/Oct/24 11:36 AM

Status

To-Do [ 10305 ]

In Progress [ 3 ]

Hide

Permalink

Jaya Sravani Sirigineedi (Inactive) added a comment - 04/Oct/24 3:32 PM

Reverted both the commits and resolved the conflicts here is the updated code: https://bitbucket.org/jaya-sravani/integrated-genome-browser/branch/release-10.1.0. Please review and let me know if there are any issues.

Show

Jaya Sravani Sirigineedi (Inactive) added a comment - 04/Oct/24 3:32 PM Reverted both the commits and resolved the conflicts here is the updated code: https://bitbucket.org/jaya-sravani/integrated-genome-browser/branch/release-10.1.0 . Please review and let me know if there are any issues.

Jaya Sravani Sirigineedi (Inactive) made changes - 04/Oct/24 3:32 PM

Status

In Progress [ 3 ]

Needs 1st Level Review [ 10005 ]

Jaya Sravani Sirigineedi (Inactive) made changes - 04/Oct/24 3:32 PM

Assignee

Jaya Sravani Sirigineedi [ jsirigin ]

Ann Loraine made changes - 06/Oct/24 7:16 PM

Status

Needs 1st Level Review [ 10005 ]

First Level Review in Progress [ 10301 ]

Ann Loraine made changes - 06/Oct/24 7:16 PM

Assignee

Ann Loraine [ aloraine ]

Ann Loraine made changes - 06/Oct/24 7:18 PM

Assignee

Ann Loraine [ aloraine ]

Nowlan Freese [ nfreese ]

Hide

Permalink

Ann Loraine added a comment - 06/Oct/24 7:19 PM

The two reversion commits look good. Assigning to Nowlan Freese to review as well.

Show

Ann Loraine added a comment - 06/Oct/24 7:19 PM The two reversion commits look good. Assigning to Nowlan Freese to review as well.

Ann Loraine made changes - 06/Oct/24 7:19 PM

Status

First Level Review in Progress [ 10301 ]

Needs 1st Level Review [ 10005 ]

Ann Loraine made changes - 06/Oct/24 7:19 PM

Sprint

Summer 7, Fall 1, Fall 2 [ 201, 202, 203 ]

Summer 7, Fall 1, Fall 2, Fall 3 [ 201, 202, 203, 204 ]

Ann Loraine made changes - 06/Oct/24 7:19 PM

Rank

Ranked higher

Nowlan Freese made changes - 08/Oct/24 3:05 PM

Status

Needs 1st Level Review [ 10005 ]

First Level Review in Progress [ 10301 ]

Hide

Permalink

Nowlan Freese added a comment - 08/Oct/24 4:18 PM

Two reverts look good to me.
I pulled Sravani's branch and built with tests and ran IGB without any issues.

Ready for PR.

Show

Nowlan Freese added a comment - 08/Oct/24 4:18 PM Two reverts look good to me. I pulled Sravani's branch and built with tests and ran IGB without any issues. Ready for PR.

Nowlan Freese made changes - 08/Oct/24 4:18 PM

Assignee

Nowlan Freese [ nfreese ]

Jaya Sravani Sirigineedi [ jsirigin ]

Nowlan Freese made changes - 08/Oct/24 4:18 PM

Status

First Level Review in Progress [ 10301 ]

Ready for Pull Request [ 10304 ]

Hide

Permalink

Jaya Sravani Sirigineedi (Inactive) added a comment - 09/Oct/24 10:03 AM

Raised a pull request: https://bitbucket.org/lorainelab/integrated-genome-browser/pull-requests/1044

Show

Jaya Sravani Sirigineedi (Inactive) added a comment - 09/Oct/24 10:03 AM Raised a pull request: https://bitbucket.org/lorainelab/integrated-genome-browser/pull-requests/1044

Jaya Sravani Sirigineedi (Inactive) made changes - 09/Oct/24 10:03 AM

Status

Ready for Pull Request [ 10304 ]

Pull Request Submitted [ 10101 ]

Jaya Sravani Sirigineedi (Inactive) made changes - 09/Oct/24 10:03 AM

Assignee

Jaya Sravani Sirigineedi [ jsirigin ]

Ann Loraine made changes - 09/Oct/24 11:22 AM

Assignee

Ann Loraine [ aloraine ]

Ann Loraine made changes - 09/Oct/24 11:22 AM

Status

Pull Request Submitted [ 10101 ]

Reviewing Pull Request [ 10303 ]

Hide

Permalink

Jaya Sravani Sirigineedi (Inactive) added a comment - 09/Oct/24 11:29 AM - edited

Ann Loraine Here is the new pull request to a new branch in loraine lab workspace: https://bitbucket.org/lorainelab/integrated-genome-browser/pull-requests/1045. I have declined the previous pull request.

Show

Jaya Sravani Sirigineedi (Inactive) added a comment - 09/Oct/24 11:29 AM - edited Ann Loraine Here is the new pull request to a new branch in loraine lab workspace: https://bitbucket.org/lorainelab/integrated-genome-browser/pull-requests/1045 . I have declined the previous pull request.

Jaya Sravani Sirigineedi (Inactive) made changes - 09/Oct/24 11:47 AM

Assignee

Ann Loraine [ aloraine ]

Jaya Sravani Sirigineedi [ jsirigin ]

Hide

Permalink

Jaya Sravani Sirigineedi (Inactive) added a comment - 09/Oct/24 11:55 AM - edited

Raised PR to revert the revert commits merged to main unintentionally: https://bitbucket.org/lorainelab/integrated-genome-browser/pull-requests/1046

Show

Jaya Sravani Sirigineedi (Inactive) added a comment - 09/Oct/24 11:55 AM - edited Raised PR to revert the revert commits merged to main unintentionally: https://bitbucket.org/lorainelab/integrated-genome-browser/pull-requests/1046

Jaya Sravani Sirigineedi (Inactive) made changes - 09/Oct/24 12:03 PM

Assignee

Jaya Sravani Sirigineedi [ jsirigin ]

Ann Loraine [ aloraine ]

Hide

Permalink

Ann Loraine added a comment - 09/Oct/24 12:14 PM

PR 1046 (reverting reverts) is merged into main.

attn: Jaya Sravani Sirigineedi

Show

Ann Loraine added a comment - 09/Oct/24 12:14 PM PR 1046 (reverting reverts) is merged into main. attn: Jaya Sravani Sirigineedi

Jaya Sravani Sirigineedi (Inactive) made changes - 09/Oct/24 1:29 PM

Comment

[ [~ann.loraine] Bitbucket isn't allowing me to create a new PR from my previous release-10.1.0 branch as the commits are already merged to a different branch I think it assumes there are no commits to be merged. Could you fetch my branch and push it to Lorainlab's workspace? ]

Ann Loraine made changes - 09/Oct/24 2:04 PM

Status

Reviewing Pull Request [ 10303 ]

Merged Needs Testing [ 10002 ]

Ann Loraine made changes - 09/Oct/24 2:04 PM

Assignee

Ann Loraine [ aloraine ]

Hide

Permalink

Ann Loraine added a comment - 09/Oct/24 2:06 PM

Sorry for all the problems Jaya Sravani Sirigineedi and Nowlan Freese!

New branch is made and available on the team repository now.

Show

Ann Loraine added a comment - 09/Oct/24 2:06 PM Sorry for all the problems Jaya Sravani Sirigineedi and Nowlan Freese ! New branch is made and available on the team repository now.

Hide

Permalink

Nowlan Freese added a comment - 16/Oct/24 2:46 PM

Downloaded IGB-macos-universal-10.1.0.dmg from Loraine Lab Bitbucket (date: 2024-10-15) and installed on Mac.

Ensembl does not appear as a data provider in the Data Sources window.

Closing ticket.

Show

Nowlan Freese added a comment - 16/Oct/24 2:46 PM Downloaded IGB-macos-universal-10.1.0.dmg from Loraine Lab Bitbucket (date: 2024-10-15) and installed on Mac. Ensembl does not appear as a data provider in the Data Sources window. Closing ticket.

Nowlan Freese made changes - 16/Oct/24 2:46 PM

Assignee

Jaya Sravani Sirigineedi [ jsirigin ]

Nowlan Freese made changes - 16/Oct/24 2:46 PM

Status

Merged Needs Testing [ 10002 ]

Post-merge Testing In Progress [ 10003 ]

Nowlan Freese made changes - 16/Oct/24 2:46 PM

Resolution		Done [ 10000 ]
Status	Post-merge Testing In Progress [ 10003 ]	Closed [ 6 ]

People

Assignee:

Jaya Sravani Sirigineedi (Inactive)

Reporter:

Jaya Sravani Sirigineedi (Inactive)

Votes:

0 Vote for this issue

Watchers:

3 Start watching this issue

Dates

Created:

16/Aug/24 9:56 AM

Updated:

16/Oct/24 2:46 PM

Resolved:

16/Oct/24 2:46 PM