aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-03-31Replace 'User Account Settings' with user's e-mail and add user_emailzsloan
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
2022-03-31Fix the way database_connector is calledzsloan
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)
2022-03-30Merge pull request #690 from Alexanderlacuna/chore/ctl-wgcna-enhancementsAlexander Kabui
Chore/ctl wgcna enhancements
2022-03-30Remove double-encoding to jsonFrederick Muriuki Muriithi
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
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 collectionszsloan
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
2022-03-24Merge pull request #691 from zsloan/bug/fix_qtlreaper_snp_orderzsloan
Bug/fix qtlreaper snp order
2022-03-24Check if there's only one coordinate for interval mappingzsloan
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)
2022-03-24Fix qtlreaper results sorting to deal with M as chromosome (should be at the ↵zsloan
end) 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)
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_pairscanzsloan
Feature/add rqtl pairscan
2022-03-22Fix logic for setting interval parameterzsloan
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
2022-03-22Fix way pair_scan is checkedzsloan
Previously it would always register as True, due to being in the start_vars
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 documentationFrederick Muriuki Muriithi
Add missing argument to the command in the documentation
2022-03-18README: Update CI badge subdomain.Arun Isaac
The CI has been migrated from penguin2.genenetwork.org to ci.genenetwork.org. * README.md: Update CI badge subdomain.
2022-03-18Merge pull request #689 from Alexanderlacuna/chore/gn2-enhancementsAlexander Kabui
Chore/gn2 enhancements
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-pcaAlexander Kabui
Replace pca rpy2 code
2022-03-18Apply "python-black" on fileBonfaceKilz
* test/requests/test-website.py: Run "black test/requests/test test-website.py".
2022-03-18Remove outdated integration tests on different login mechanismsBonfaceKilz
* 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.
2022-03-18Delete deprecated modulesBonfaceKilz
* test/requests/test-website: These imports were deleted in an earlier PR here: <https://github.com/genenetwork/genenetwork2/pull/574>
2022-03-18Delete "app" import in MRBonfaceKilz
* test/requests/test-website.py: Delete "from wqflask import app". This has the undesired effect of starting an instance of Genenetwork2.
2022-03-18Document configurationsFrederick Muriuki Muriithi
Document the configurations for the service, and how to use them when invoking the service.
2022-03-17Fix/change Authors column in phenotype search resultszsloan
- 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
2022-03-17Set min-width for table container, so the table never ends up so narrow it ↵zsloan
looks strange
2022-03-17Fix authentication for phenotype search resultszsloan
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"
2022-03-17Lint some test filesBonfaceKilz
2022-03-17Fix failing testBonfaceKilz
2022-03-17Create a db connection correctlyBonfaceKilz
* wqflask/maintenance/quantile_normalize.py: Fix how the cursor is created.
2022-03-17Skip unittestsBonfaceKilz
These tests touch on core data-structures in gn2; and there's a chance that refactoring said data-structures may break many things.
2022-03-17Replace "g.db" object with a proper database connectionBonfaceKilz
* 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.
2022-03-17Delete dead codeBonfaceKilz
2022-03-17Delete unused "logger" importBonfaceKilz
* wqflask/wqflask/snp_browser/snp_browser.py: Remove "getLogger".
2022-03-17Document how to run testsFrederick Muriuki Muriithi
Add documentation on how to run the tests - this was no clear from the existing documentation up to this point.
2022-03-17Provide path to default settings/configuration file as a fallbackFrederick Muriuki Muriithi
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.
2022-03-16Remove unnecessary print statementzsloan
2022-03-16Replace top comment with docstringzsloan
2022-03-16Add code generating the new genotype fileszsloan
Also made a large number of other fixes that proved necessary during testing
2022-03-16Generate JSON file for target genotypeszsloan
Also store parents/type metadata from source genofiles
2022-03-16Fix the way target/source genofiles were being processed + some other changeszsloan
- I was mixing up source/target genofiles previously; the JSON file is for the source genofiles - references to the app context are removed in favor of just taking input as arguments or environment variables - Updated example commands
2022-03-16Add function for mapping strain to sample pos + begin creating ↵zsloan
generate_new_genofiles function