aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-11-04remove whitespaceAlexanderlacuna
2020-11-04remove whitespace and assertIsAlexanderlacuna
2020-11-03Merge branch 'testing' of https://github.com/genenetwork/genenetwork2 into ↵Alexanderlacuna
test-showtrait
2020-11-03remove unnecessary commentsAlexanderlacuna
2020-11-03add pep8 formattingAlexanderlacuna
2020-11-03add tests for the get_categorical_variables functionAlexanderlacuna
2020-11-03switch from assertFalse to assertIsAlexanderlacuna
2020-11-03switch from assertTrue/False to assertIs to make the tests tighterAlexanderlacuna
2020-11-03use assertTrue and assertFalse in while testing booleanAlexanderlacuna
2020-11-02Merge pull request #476 from zsloan/correlation_errors_fixzsloan
Correlation errors fix
2020-11-02Created function for encoding the column value as bytes when fetching from ↵zsloan
the JSON-formatted string pulled from Redis (since this was needed after the Python 3 switchover) * wqflask/utility/redis_tools.py - Created function load_json_from_redis that encodes the key (column_value) when fetching a value from the JSON pulled from Redis
2020-11-02Changed correlation page logic to skip over traits that share fewer than 6 ↵zsloan
samples + traits that user doesn't have permission to access * wqflask/wqflask/correlation/show_corr_results.py - Moved the num_overlap check so that it never attempts to calculate the correlation if it's too low + checked if trait_object is None in the main loop (since it would be returned as None if the user doesn't have permissions
2020-11-02add better formattingAlexanderlacuna
2020-11-02add function docstringAlexanderlacuna
2020-11-02add tests for show trait moduleAlexanderlacuna
2020-11-01Merge pull request #472 from Alexanderlacuna/test-branchBonfaceKilz
Adding more Test for show_trait module
2020-10-31Merge branch 'testing' of https://github.com/genenetwork/genenetwork2 into ↵Alexanderlacuna
test-branch
2020-10-31Removed a line adding the ceiling of the Max LRS to the Y axis, since it has ↵zsloan
the potential to cause an axis tick to appear above the figure * wqflask/wqflask/marker_regression/display_mapping_results.py - Removed a line adding the ceiling of the max LRS/LOD value to the Y axis
2020-10-31remove redundant classesAlexanderlacuna
2020-10-31use descriptive variable namesAlexanderlacuna
2020-10-31Use more descriptive variable and class namesAlexanderlacuna
2020-10-30Merge pull request #474 from zsloan/mapping_y_axis_fixzsloan
Mapping Y Axis Fix
2020-10-30Removed a line adding the ceiling of the Max LRS to the Y axis, since it has ↵zsloan
the potential to cause an axis tick to appear above the figure * wqflask/wqflask/marker_regression/display_mapping_results.py - Removed a line adding the ceiling of the max LRS/LOD value to the Y axis
2020-10-30add test for get_export_metadataAlexanderlacuna
2020-10-30Merge branch 'testing' of https://github.com/genenetwork/genenetwork2 into ↵Alexanderlacuna
test-branch
2020-10-29Merge pull request #473 from zsloan/reaper_bootstrap_fixzsloan
Reaper bootstrap fix
2020-10-29Fixed issue with single-chromosome mapping after the bootstrap fix and fixed ↵zsloan
error that occurred if either bootstrap or permutations were set to 0 * wqflask/wqflask/marker_regression/display_mapping_results.py - Cast self.qtlresults 'chr' as a string since the comparison between it and the chromosome names was faililng due to numeric chromosomes being int type + used a list comprehension that converts None to an empty string when creating a comma-joined string from the list of mapping output files
2020-10-29Merge branch 'testing' of github.com:genenetwork/genenetwork2 into ↵zsloan
reaper_bootstrap_fix
2020-10-29add test for show_traitAlexanderlacuna
2020-10-29Merge branch 'testing' of https://github.com/genenetwork/genenetwork2 into ↵Alexanderlacuna
test-branch
2020-10-29Merge pull request #469 from BonfaceKilz/bug/fix-cookies-verificationBonfaceKilz
Bug/Fix cookie verification bug
2020-10-29resolve merge conflictAlexanderlacuna
2020-10-29format fileAlexanderlacuna
2020-10-29remove print statement in for loopAlexanderlacuna
2020-10-29add test for show_trait/export_trait_dataAlexanderlacuna
2020-10-29Merge pull request #471 from BonfaceKilz/bug/replace-map-on-strip-methodBonfaceKilz
Bug/Replace map on strip with a list comprehension that calls strip()
2020-10-28Merge pull request #470 from zsloan/mapping_chr_view_fixzsloan
Fixed error when zooming into a chromosome when mapping
2020-10-28A non-string being used as a paramter in HT.Link caused an error after the ↵zsloan
Python3 switchover, so I converted it to a string * wqflask/wqflask/marker_regression/display_mapping_results.py - cast theGO["snpCount"] as a string
2020-10-29Replace map on strip with a list comprehension that calls strip()BonfaceKilz
* scripts/maintenance/readProbeSetSE_v7.py: In Python3 you can't map string.strip on a list of strings. Instead use a list comprehension and apply strip() on each element of the list. * wqflask/wqflask/marker_regression/plink_mapping.py: Ditto. * wqflask/wqflask/snp_browser/snp_browser.py: Ditto.
2020-10-28Use latin-1 encoding when converting hmac secret to bytesBonfaceKilz
* wqflask/utility/hmac.py (hmac_creation): Use latin-1 when serializing the hmac secret. This ensures that the behaviour of *verify_cookie* remains the same as in the python2 tip.
2020-10-28Add new test for hmac_creation with latin-1 secretBonfaceKilz
* wqflask/tests/utility/test_hmac.py (test_hmac_creation_with_cookie): New test. For this test, use a secret that behaves differently when encoded to either utf-8 or latin-1.
2020-10-28Add tests for cookie verificationBonfaceKilz
2020-10-28Merge pull request #468 from zsloan/export_fixzsloan
Fixed trait page export issue caused by Scroller
2020-10-28Fixed trait page export to work with Scroller + added metadata for ↵zsloan
non-Phenotype traits and column headers * wqflask/wqflask/show_trait/export_trait_data.py - Added metadata for non-Phenotype traits and column headers (which didn't previously exist) * wqflask/wqflask/static/new/javascript/show_trait.js - Changed export_sample_table_data to use DataTables API instead of just selecting from the DOM with JQuery
2020-10-27Merge pull request #467 from zsloan/gsearch_encoding_fixzsloan
Remaining gsearch encoding fix for ProbeSet description
2020-10-27Cast ProbeSet description as binary to fix encoding issue on global search pagezsloan
* wqflask/wqflask/gsearch.py - Cast ProbeSet description as binary
2020-10-27Merge pull request #466 from zsloan/show_trait_attributes_fixzsloan
Fix issue where attribute values were displayed in the wrong columns
2020-10-27Get the "first_attr_start_pos" from a samplelist instead of from each ↵zsloan
individual sample, because it was previously causing problems when only some samples had an N * wqflask/base/webqtlCaseData.py - Removed code getting first_attr_start_pos * wqflask/wqflask/show_trait/SampleList.py - Added code getting first_attr_start_pos and assigning it to all samples + removing one unnecessary sort * wqflask/wqflask/static/new/javascript/initialize_show_trait_tables.js - Fixed issue that was causing the N column to not be displayed
2020-10-27Cast post and pre-publication descriptions into binaryBonfaceKilz
* wqflask/wqflask/gsearch.py (GSearch): There's an exception thrown when the decode method is called on that description string. If the casting is absent, and the decode statements are removed, the some characters get broken.
2020-10-27Merge pull request #465 from Alexanderlacuna/test-branchBonfaceKilz
add test for trait_data
generated by cgit v1.2.3 (git 2.44.0) at 2024-10-20 19:37:12 +0000