aboutsummaryrefslogtreecommitdiff
path: root/wqflask/base/trait.py
AgeCommit message (Expand)Author
2021-08-20Fixed some logic in trait.py that could cause a problem if a dataset_name was...zsloan
2021-06-16Changed the function jsonable in trait.py to return a couple extra fields + t...zsloan
2021-04-30autopep8: Fix W504BonfaceKilz
2021-04-29Merge branch 'testing' into Feature/Add-upload-data-formsBonfaceKilz
2021-04-29Run `sed -i 's/(object)//g'`...See: https://is.gd/pL7IJF Ran: find . \( -type d -name .git -prune \) -o -type f -print0 | xargs -0 sed -i 's/(object)//g' BonfaceKilz
2021-04-29base: trait: Remove unused function...* wqflask/base/trait.py (jsonable_table_row): Delete it. BonfaceKilz
2021-04-28Added something to jsonable in trait.py to account for temp traits (this is n...zsloan
2021-03-03Checked if pre_publication_description is NULL, because there was an error re...zsloan
2021-02-18Fixed missing colonzsloan
2021-02-18Fixed checking permissions in trait.pyzsloan
2021-02-11Ensure trait description_display is setzsloan
2020-12-07Changed the logic in create_trait so that permissions should always be set, a...zsloan
2020-12-01Merge pull request #482 from zsloan/feature/corr_table_changes...Feature/corr table changeszsloan
2020-11-18Fixed issue where the cofactor trait descriptions didn't work correctly...for genotype/snp cofactors (the code previously only accounted for probeset/phenotype cofactors, so it was treating genotypes/snps like phenotype traits) zsloan
2020-11-18Fixed issue that was causing scatterplot cofactors to not work if the...cofactors were genotypes (because it tried to get the "description_display" which doesn't exist for genotype traits) zsloan
2020-11-11Switched checking if a trait is confidential to checking if it has a pubmed I...zsloan
2020-10-12Merge branch 'testing' into build/python3-migrationBonfaceKilz
2020-10-09Apply PEP 8 to buffer...* wqflask/wqflask/wgcna/wgcna_analysis.py: Apply pep8 * wqflask/wqflask/collect.py: Ditto * wqflask/base/trait.py: Ditto BonfaceKilz
2020-10-02Ignore utf-8 encoding errors...* wqflask/base/trait.py (retrieve_trait_info): Add extra param to ignore errors such as: "utf-8 codec can't decode byte 0xb5 in position 0: invalid start byte" thrown in Python3. BonfaceKilz
2020-10-01Convert trait attributes to utf-8 strings if they were bytesBonfaceKilz
2020-09-28Merge branch 'build/python3-migration' of github.com:BonfaceKilz/genenetwork2...BonfaceKilz
2020-09-28Fix casting error...* 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)*. BonfaceKilz
2020-09-28Merge branch 'testing' into build/python3-migrationBonfaceKilz
2020-09-28Fix casting error...* 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)*. BonfaceKilz
2020-09-28Convert None to "" in if statement...* wqflask/base/trait.py: Fixes error parsing error: "(GeneNetwork error: float argument required, not NoneType)" BonfaceKilz
2020-09-17Convert "target_string" to a str type...* wqflask/base/trait.py (retrieve_trait_info): Convert "target_string" to a str, otherwise an exception will be thrown if it's None. BonfaceKilz
2020-09-17Apply pep8...* wqflask/base/trait.py: Apply pep8. * wqflask/utility/authentication_tools.py: Ditto. BonfaceKilz
2020-08-27Remove python2 string processing to utf-8...* wqflask/base/trait.py: Remove python2 codecs.BOM_UTF8 methods. * wqflask/wqflask/search_results.py: Remove utf-8 decode method on string. BonfaceKilz
2020-08-27Replace mysqldb's "escape" with the one from utils.db_tools...Mysqldb's escape returns a binary string. Use utils.db_tools which adds an extra step of converting the binary string to a string. BonfaceKilz
2020-08-27Replace "string.split" & "string.join" with python's inbuilt methodsBonfaceKilz
2020-08-26Remove "from __future__ import new_feature" statements...See: <https://docs.python.org/2/library/2to3.html#2to3fixer-future> BonfaceKilz
2020-08-26Rename "unicode" to "str"...See: <https://docs.python.org/2/library/2to3.html#2to3fixer-unicode> BonfaceKilz
2020-08-20Add backward support for urllib...* wqflask/base/trait.py: Remove unused imports * wqflask/db/call.py (Bench): Add urllib2 fallback for python2 BonfaceKilz
2020-08-19Remove extra whitespace(or add it) from comma separated items...See: <https://docs.python.org/2/library/2to3.html#2to3fixer-urllib> BonfaceKilz
2020-08-19Handle the rename of urllib and urllib2 to the urllib package...See: <https://docs.python.org/2/library/2to3.html#2to3fixer-urllib> BonfaceKilz
2020-08-19Replace backtick repr with the repr() function...* wqflask/base/trait.py: See <https://docs.python.org/2/library/2to3.html#2to3fixer-repr> BonfaceKilz
2020-08-19Wrap `raise` statements in parenthesis...Run `2to3-3.8 -f raise -w .` See: <https://docs.python.org/2/library/2to3.html#2to3fixer-raise> BonfaceKilz
2020-08-19Fix dictionary iteration methods...Run `2to3-3.8 -f dict -w .` See: <https://docs.python.org/2/library/2to3.html#2to3fixer-dict> and <https://stackoverflow.com/questions/17695456/why-does-python-3-need-dict-items-to-be-wrapped-with-list> BonfaceKilz
2020-07-21Fixed issue that caused group codes to be wrong sometimeszsloan
2020-07-14Added binary casting to phenotype trait info query to fix unicode issuezsloan
2020-07-08Removed remaining unused references to the old qtlreaperzsloan
2020-07-06Temporarily commented out the line in trait.py doing the encoding until we fi...zsloan
2020-07-06Fixed some of the logic with how traits are authenticated to avoid situation ...zsloan
2020-06-29Change that hopefully fixes some encoding stuffzsloan
2020-06-24Temporary partial fix to issue of resources without info; need to add somethi...zsloan
2020-06-20Fixed ports for proxy (though I need to add the port to global variables) and...zsloan
2020-06-20Added some admin functionality and fixed issue with temp traitszsloan
2020-06-17Adding all the authentication stuffzsloan
2020-06-05Commiting other current group/resource management code, plus the new fileszsloan
2020-06-04Added back in trait info queries for situations where the proxy isn't runningzsloan