aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2022-04-01Fix the way database_connection was being called in 2 places in...metadata_edits.py For some reason there were two places where it wasn't being called as a function. Fixing this appears to have fixed the error zsloan
2022-03-31Add another check for >1 markers on a chromosome for interval mapping...There were two places this needed to be checked and I previously missed this one zsloan
2022-03-31Replace 'User Account Settings' with user's e-mail and add user_email...property to user_session Also changed the order of the dropdowns to have Sign Out after the user drop-down, to more closely match NCBI's style zsloan
2022-03-31Fix the way database_connector is called...The function returns a call to mdb.connect, which only returns the connection object. It was throwing an error due to trying to unpack multiple items. One thing I noticed while looking at this is that we should probably decide on a single way to create these connections. In some other files, we instead use database_connection from wqflask.database (instead of the gn3 database_connector from gn3.db_utils) zsloan
2022-03-30Merge pull request #690 from Alexanderlacuna/chore/ctl-wgcna-enhancements...Chore/ctl wgcna enhancementsAlexander Kabui
2022-03-30Remove double-encoding to json...Passing the data into `requests.post` as a `json=...` argument will automatically encode the data to JSON and set up the correct Content-Type header. The call `json.dumps(post_data)` was pre-encoding the data to a JSON string, that was the re-encoded to JSON yet again, which is not what we want. This commit fixes that.X Frederick Muriuki Muriithi
2022-03-25Fix Spearman Rank correlation appearing as 'r' instead of 'rho'zsloan
2022-03-25Fix issues that prevented genotype traits from being added to collections...Some of this was caused by heatmaps supporting code; that code should probably pass the traits differently than the way it does in the "trait_info_str" function zsloan
2022-03-24Merge pull request #691 from zsloan/bug/fix_qtlreaper_snp_order...Bug/fix qtlreaper snp orderzsloan
2022-03-24Check if there's only one coordinate for interval mapping...This is meant to deal with edge cases where there's only a single coordinate for a chromosome when doing interval mapping (which causes an error, since interval mapping requires that markers be linked within each chromosome) zsloan
2022-03-24Fix qtlreaper results sorting to deal with M as chromosome (should be at the ......Not sure how best to do this; I just had the sort algorithm change "M" to "z" (which will always be sorted last, behind X and Y) zsloan
2022-03-24code refactoringAlexander Kabui
2022-03-24display parametric values usedAlexander Kabui
2022-03-24rename template to gn3_wgcna_resultsAlexander Kabui
2022-03-22Merge pull request #608 from zsloan/feature/add_rqtl_pairscan...Feature/add rqtl pairscanzsloan
2022-03-22Fix logic for setting interval parameter...The parameter should never be interval if pair_scan is being run; not checking for this causes the --interval tag to pointlessly be included when running pair-scan, which also interferes with caching zsloan
2022-03-22Fix way pair_scan is checked...Previously it would always register as True, due to being in the start_vars zsloan
2022-03-22Set pair_scan to false when using regular R/qtl mappingzsloan
2022-03-22Change d3panels CSS/JS to min fileszsloan
2022-03-22Merge remote-tracking branch 'origin/testing' into feature/add_rqtl_pairscanzsloan
2022-03-21Fix command in documentation...Add missing argument to the command in the documentation Frederick Muriuki Muriithi
2022-03-18README: Update CI badge subdomain....The CI has been migrated from penguin2.genenetwork.org to ci.genenetwork.org. * README.md: Update CI badge subdomain. Arun Isaac
2022-03-18Merge pull request #689 from Alexanderlacuna/chore/gn2-enhancements...Chore/gn2 enhancementsAlexander Kabui
2022-03-18add uniform font for titleAlexander Kabui
2022-03-18remove correlation test buttonAlexander Kabui
2022-03-18fixes for ImageButtonOptionsAlexander Kabui
2022-03-18code to fetch scree data from gn3Alexander Kabui
2022-03-18integrate scree plotAlexander Kabui
2022-03-18Merge pull request #671 from Alexanderlacuna/feature/gn3-pca...Replace pca rpy2 codeAlexander Kabui
2022-03-18Apply "python-black" on file...* test/requests/test-website.py: Run "black test/requests/test test-website.py". BonfaceKilz
2022-03-18Remove outdated integration tests on different login mechanisms...* test/requests/test-website.py: Delete parser option "-i" for running integration tests. (integration_tests): Delete it. (integration_suite): Ditto. (run_integration_tests): Ditto. * test/requests/test_registration.py: Delete it. BonfaceKilz
2022-03-18Delete deprecated modules...* test/requests/test-website: These imports were deleted in an earlier PR here: <https://github.com/genenetwork/genenetwork2/pull/574> BonfaceKilz
2022-03-18Delete "app" import in MR...* test/requests/test-website.py: Delete "from wqflask import app". This has the undesired effect of starting an instance of Genenetwork2. BonfaceKilz
2022-03-18Document configurations...Document the configurations for the service, and how to use them when invoking the service. Frederick Muriuki Muriithi
2022-03-17Fix/change Authors column in phenotype search results...- Limit number of full names to 2 followed by "et al." - Fix wrong logic that was using the full length of the authors string instead of the truncated length when determining the width of the column, resulting in it always being at least 500px wide zsloan
2022-03-17Set min-width for table container, so the table never ends up so narrow it lo...zsloan
2022-03-17Fix authentication for phenotype search results...Previously authentication didn't work correctly if users had "edit" privileges, because the code specifically looked for just "view"; this changes it to check for either "view" or "edit" zsloan
2022-03-17Lint some test filesBonfaceKilz
2022-03-17Fix failing testBonfaceKilz
2022-03-17Create a db connection correctly...* wqflask/maintenance/quantile_normalize.py: Fix how the cursor is created. BonfaceKilz
2022-03-17Skip unittests...These tests touch on core data-structures in gn2; and there's a chance that refactoring said data-structures may break many things. BonfaceKilz
2022-03-17Replace "g.db" object with a proper database connection...* wqflask/tests/unit/wqflask/api/test_correlation.py: Use proper database connection instead of the db connection attached at "g.db". * wqflask/tests/unit/wqflask/snp_browser/test_snp_browser.py: Ditto. * wqflask/wqflask/api/correlation.py: Ditto. * wqflask/wqflask/snp_browser/snp_browser.py: Ditto. BonfaceKilz
2022-03-17Delete dead codeBonfaceKilz
2022-03-17Delete unused "logger" import...* wqflask/wqflask/snp_browser/snp_browser.py: Remove "getLogger". BonfaceKilz
2022-03-17Document how to run tests...Add documentation on how to run the tests - this was no clear from the existing documentation up to this point. Frederick Muriuki Muriithi
2022-03-17Provide path to default settings/configuration file as a fallback...If the GN2_SETTINGS environment variable, is for some reason, not set, and the application actually ever tries to get a connection to the database, then use the default settings/configuration file. Frederick Muriuki Muriithi
2022-03-16Remove unnecessary print statementzsloan
2022-03-16Replace top comment with docstringzsloan
2022-03-16Add code generating the new genotype files...Also made a large number of other fixes that proved necessary during testing zsloan
2022-03-16Generate JSON file for target genotypes...Also store parents/type metadata from source genofiles zsloan