aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-10-02Update natural_sort functionBonfaceKilz
* wqflask/wqflask/show_trait/SampleList.py (natural_sort): Add new function. (SampleList.get_attributes): Use new sort function to do natural_sort.
2020-10-02Remove unnecessary commented out blocksBonfaceKilz
* wqflask/wqflask/show_trait/SampleList.py: See above.
2020-10-02Cast "previous_chr" to an intBonfaceKilz
* wqflask/wqflask/marker_regression/gemma_mapping.py (parse_loco_output): Cast "previous_chr" to an int which prevents the error "Python typeerror: ‘>’ not supported between instances of ‘str’ and ‘int’" from being thrown. The error is **only** thrown in Python3.
2020-10-01Convert trait attributes to utf-8 strings if they were bytesBonfaceKilz
2020-10-01Make object JSON serializableBonfaceKilz
* wqflask/wqflask/search_results.py (SearchResultPage.gen_search_result): Some of the items is self.trait_list are in bytes, and *json.loads* can't serialize bytes into JSON.
2020-09-30Add missing importBonfaceKilz
* wqflask/wqflask/correlation/show_corr_results.py: Add it.
2020-09-30Apply pep 8 formattingBonfaceKilz
* wqflask/wqflask/correlation/show_corr_results.py [imports]: Apply pep8 and remove unused imports.
2020-09-30Fix StopIteration error thrown in view collections pageBonfaceKilz
* wqflask/wqflask/user_session.py (user_id): Use byte-string when fetching user_id. See: https://github.com/genenetwork/genenetwork2/pull/422#issuecomment-701082458
2020-09-30Fix import in testsBonfaceKilz
2020-09-29Remove undefined variableBonfaceKilz
2020-09-29Apply pep 8 to bufferBonfaceKilz
* wqflask/wqflask/user_manager.py: Remove some stale comments. (imports): Apply pep-8 and remove unused imports.
2020-09-29Add check for bytesBonfaceKilz
* wqflask/wqflask/collect.py (process_traits): Check whether the passed "unprocessed_traits" is a byte otherwise an error is generated when bytes(the default) are passed.
2020-09-29Add test for process_traits from collections.pyBonfaceKilz
* wqflask/tests/wqflask/test_collect.py: Add it.
2020-09-28Fix failing testBonfaceKilz
* wqflask/tests/base/test_trait.py: Add app_context to test class, otherwise an error related to working outside the app_context is generated. Adding the app_context is required when mocking "Flask.g".
2020-09-28Merge branch 'build/python3-migration' of ↵BonfaceKilz
github.com:BonfaceKilz/genenetwork2 into build/python3-migration
2020-09-28Fix casting errorBonfaceKilz
* wqflask/base/trait.py (retrieve_trait_info): If the description_string or discription_display value return a None object, evaluate to an empty string. Fixes errors related to *len(None)*.
2020-09-28Merge branch 'testing' into build/python3-migrationBonfaceKilz
2020-09-28Fix casting errorBonfaceKilz
* wqflask/base/trait.py (retrieve_trait_info): If the description_string or discription_display value return a None object, evaluate to an empty string. Fixes errors related to *len(None)*.
2020-09-28Merge pull request #446 from BonfaceKilz/Bug/Fix-casting-errorBonfaceKilz
Bug/fix casting error
2020-09-28Convert None to "" in if statementBonfaceKilz
* wqflask/base/trait.py: Fixes error parsing error: "(GeneNetwork error: float argument required, not NoneType)"
2020-09-28Update trait testsBonfaceKilz
* wqflask/tests/base/test_trait.py (test_retrieve_trait_info_with_non_empty_lrs): Check trait.LRS_score_repr is set correctly if trait.lrs is None. (test_retrieve_trait_info_with_empty_lrs_field): Check trait.LRS_score_repr and test_trait.LRS_location_repr is set correctly if trait.lrs is None. (test_retrieve_trait_info_with_empty_chr_field): Check test_trait.LRS_score_repr and test_trait.LRS_location_repr is set correctly if trait.locus is None.
2020-09-26Fix failing tests by replacing mock with unittest.mockBonfaceKilz
* wqflask/tests/base/test_data_set.py (imports): Run: `find . -type f -name "*py" -print0 | xargs -0 sed -i \ "s|import mock|from unittest import mock|g"` * wqflask/tests/base/test_trait.py(imports): Ditto. * wqflask/tests/utility/test_authentication_tools.py(imports): Ditto. * wqflask/tests/utility/test_hmac.py(imports). Ditto. * wqflask/tests/wqflask/api/test_gen_menu.py: Ditto
2020-09-26Use Python3 image to run testsBonfaceKilz
2020-09-26Fix failing testsBonfaceKilz
* wqflask/tests/base/test_trait.py: Remove decode function call which is no longer supported in python3.
2020-09-26Apply PEP 8 to bufferBonfaceKilz
* wqflask/wqflask/db_info.py: Run pep8 through buffers. Fixes inconsistent use of tabs and spaces in indentation which trips up unittests.
2020-09-26Run 2to3-8 tool through fileBonfaceKilz
* wqflask/wqflask/db_info.py: Run: 2to3-3.8 -w wqflask/wqflask/db_info.py
2020-09-26Fix inconsistent line ending in fileBonfaceKilz
* wqflask/wqflask/db_info.py: Replace ^M with proper unix line endings. See <http://ergoemacs.org/emacs/emacs_line_ending_char.html>
2020-09-26Merge branch 'testing' into build/python3-migrationBonfaceKilz
2020-09-25Update docs on CI setup with dockerBonfaceKilz
* doc/docker-container.org: Update it.
2020-09-25Update github actionBonfaceKilz
* .github/workflows/main.yml: Set up a mariadb and redis within the GH action. (services): Remove mariadb service.
2020-09-23Update github action to include mariadb serviceBonfaceKilz
* .github/workflows/main.yml: Add mariadb service. This makes the build pass because somewhere(because of cyclic imports), a connection to mariadb is required.
2020-09-23Fix failing buildsBonfaceKilz
* wqflask/wqflask/__init__.py: Move imports from views.py to "__init__.py". Fixes failing build. * wqflask/wqflask/views.py: Ditto.
2020-09-23Fix failing testsBonfaceKilz
* wqflask/tests/base/test_trait.py: In python2 it's necessary to decode the utf-8 string.
2020-09-22Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2020-09-22Fixed a pretty big mistake where user accounts would be saved even whenzsloan
there was some mistake/error during registration * wqflask/wqflask/user_login.py - Previously it would still save a user even if there was some problem like their e-mail already being associated with an account. It would display the error, but still run save_user. I fixed this so that it no longer saves the user if there are any errors
2020-09-22Added something to the mapping result page CSS to change the highlightzsloan
color to match the high color in other tables * wqflask/wqflask/static/new/css/marker_regression.css - changed background color when selecting a row (i.e. "highlight color")
2020-09-22Fixed a couple mistakes in the previous commit and changed the positionzsloan
header on the mapping results page to include the mapping scale * wqflask/wqflask/marker_regression/run_mapping.py - changed how "display_pos" is defined for marker obs * wqflask/wqflask/templates/mapping_results.html - Fixed issues with last commit and changed position header name to include mapping scale
2020-09-22Replaced Chr and Mb/cM columns with a single position column in mappingzsloan
results and also changes the -log(p) to use an endash instead * wqflask/wqflask/marker_regression/run_mapping.py - added "display_pos" to each marker object that is a combination of Chr and Mb/cM * wqflask/wqflask/templates/mapping_results.html - Included "display_pos" in results table and replaced -log(p) with using an endash
2020-09-22Merge pull request #445 from BonfaceKilz/buid/add-ciBonfaceKilz
Buid/add ci
2020-09-22Add testing badge on READMEBonfaceKilz
* README.md: Badge becomes green on successful runs.
2020-09-22Update documentation on testing and CIBonfaceKilz
* README.md: Update section on testing. * doc/docker-container.org: Add it.
2020-09-22Add unittesting github actionBonfaceKilz
* .github/workflows/main.yml: Add it.
2020-09-22Update Mechanical RobBonfaceKilz
* test/requests/main_web_functionality.py (check_search_page): Breaking change introduced by updating text in search page. See: 9f76abc95
2020-09-22Update bug_report templateBonfaceKilz
* .github/ISSUE_TEMPLATE/bug_report.md: Update environment setup section
2020-09-18Apply pep8 formattingBonfaceKilz
2020-09-17Update Mechanical RobBonfaceKilz
* test/requests/link_checker.py (verify_static_file): Cast result.content.find's args to bytes. * test/requests/main_web_functionality.py (check_search_page): Update text to search for in a successful result. This value changed in 2aac6a06.
2020-09-17Convert "target_string" to a str typeBonfaceKilz
* wqflask/base/trait.py (retrieve_trait_info): Convert "target_string" to a str, otherwise an exception will be thrown if it's None.
2020-09-17Merge branch 'testing' into build/python3-migrationBonfaceKilz
2020-09-17Mock "SECRET_HMAC_CODE"BonfaceKilz
* wqflask/tests/utility/test_hmac.py: Mock app.config's "SECRET_HMAC_CODE" value.
2020-09-17Replace string arguments to "hmac.new" with bytearrayBonfaceKilz
Same as: https://github.com/genenetwork/genenetwork2/pull/422/commits/46443ec8d2cdfd7c60358a889d90a90e4f7daaf4
generated by cgit v1.2.3 (git 2.44.0) at 2024-12-19 14:06:16 +0000