Skip to content

Merge conflict fix #268

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.

Sign up for GitHub

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
EddieLF merged 14 commits into from
May 15, 2025
Merged

Merge conflict fix #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
89258ec
Merge pull request #202 from populationgenomics/staging
illusional Feb 21, 2024
f19bee2
Merge pull request #213 from populationgenomics/staging
cassimons Apr 17, 2024
4f931b7
Merge pull request #218 from populationgenomics/staging
EddieLF May 16, 2024
35ad878
Merge pull request #223 from populationgenomics/staging
illusional May 30, 2024
12024b4
Merge pull request #225 from populationgenomics/staging
illusional May 30, 2024
ed04a5e
Adds user agent to request to igv content (#239)
EddieLF Aug 22, 2024
8ea146f
Merge pull request #241 from populationgenomics/hotfix-main-user-agent
illusional Aug 22, 2024
069205d
Update IGV reference URLs to new s3 path (#243)
EddieLF Sep 4, 2024
813efdb
Merge pull request #244 from populationgenomics/hotfix-main-igv-s3-urls
cassimons Sep 4, 2024
110bfd7
Update the 'feature updates' URL to point to popgen github (#257)
EddieLF Feb 13, 2025
9f0ec01
Update gh actions in unit-tests and add setup-java distribution (#265)
EddieLF Mar 18, 2025
b8965b6
Update panelapp URL to new panelapp-aus URL (#264)
EddieLF Mar 18, 2025
68aa902
Merge branch 'main' into staging
EddieLF May 15, 2025
4aa9f24
maxDiff=None for failing test
EddieLF May 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/unit-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,4 @@ jobs:
- run: npm ci
working-directory: ./ui
- run: npm test
working-directory: ./ui
working-directory: ./ui
1 change: 1 addition & 0 deletions seqr/utils/search/hail_search_utils_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ def _test_expected_search_call(self, search_fields=None, gene_ids=None, interval
@mock.patch('seqr.utils.search.hail_search_utils.MAX_FAMILY_COUNTS', {'WES': 2, 'WGS': 1})
@responses.activate
def test_query_variants(self):
self.maxDiff = None
variants, total = query_variants(self.results_model, user=self.user)
self.assertListEqual(variants, HAIL_BACKEND_VARIANTS)
self.assertEqual(total, 5)
Expand Down
Loading