Age | Commit message (Collapse) | Author |
|
* wqflask/utility/logger.py: Delete.
|
|
* wqflask/base/data_set.py (DatasetGroup.get_mapping_methods): Fix
failing query by adding a missing ",".
|
|
* wqflask/wqflask/search_results.py: Remove unused imports.
|
|
* wqflask/base/data_set.py (DatasetGroup.__init__): Remove "query"
variable.
(DataSet.chunk_dataset): Fix indentation.
* wqflask/wqflask/search_results.py (get_GO_symbols): Remove
"this_term" variable.
* wqflask/wqflask/views.py (search_page): Remove "the_search"
variable.
|
|
Having "--import-mode=importlib" enables pytest to find the imports in
our tests; otherwise we get import errors.
* pyproject.toml: New pytest conf file.
|
|
* wqflask/tests/unit/base/test_trait.py: Delete "wqflask.app" import.
(TestRetrieveTraitInfo.setUp): Delete it.
(TestRetrieveTraitInfo.tearDown): Ditto.
(TestRetrieveTraitInfo.test_retrieve_trait_info_with_empty_dataset):
Replace "g" mock with "database_connection" mock.
(test_retrieve_trait_info_with_empty_trait_info): Ditto.
(test_retrieve_trait_info_with_non_empty_trait_info): Ditto.
(test_retrieve_trait_info_utf8_parsing): Ditto.
* wqflask/tests/wqflask/show_trait/test_show_trait.py (TestTraits):
(test_get_nearest_marker): Ditto.
(test_get_nearest_marker_empty_db): Ditto.
|
|
* wqflask/tests/wqflask/show_trait/test_show_trait.py
(TestTraits.test_get_table_widths): Use new values for the table width
to make the tests pass.
|
|
* wqflask/tests/wqflask/show_trait/test_show_trait.py:
(TestTraits.test_get_ncbi_summary_request_success): Condense this ...
(TestTraits.test_get_ncbi_summary_request): ... and this ...
(test_get_ncbi_summary_request): ... here.
|
|
* wqflask/tests/wqflask/show_trait/test_show_trait.py: Import pytest.
(TestTraits.test_check_if_attr_exists_truthy): Delete it.
(TestTraits.test_check_if_attr_exists_empty_attr): Ditto.
(TestTraits.test_check_if_attr_exists_falsey): Ditto.
(TestTraits.test_check_if_attr_exists_falsey): Ditto.
test_check_if_attr_exists: Add new parametrized test case to test
"check_if_attr_exists".
|
|
* wqflask/tests/wqflask/show_trait/test_show_trait.py (TraitObject):
Add self.id and self.distinct_values.
|
|
* wqflask/tests/wqflask/show_trait/test_show_trait.py: Delete
"wqflask.app" import.
(TestTraits.setUp): Delete it.
(TestTraits.tearDown): Ditto.
|
|
* README.md (Testing): Using pytests instead of unittests.
|
|
This is done to avoid relative imports.
wqflask/tests/unit/base/data.py: Delete it.
* wqflask/tests/unit/base/test_data_set.py: Add new variable
GEN_MENU_JSON.
(TestDataSetTypes.test_data_set_type_with_empty_redis): Upper-case
"gen_menu_json" variable.
|
|
|
|
"g.db" is now replaced with "database_connections".
* wqflask/wqflask/views.py: Remove "sqlalchemy" and "SQL_URI" imports.
(connect_db): Delete it.
(shutdown_session): Ditto.
|
|
* wqflask/scripts/profile_corrs.py: Remove sqlalchemy, connect_db and
shutdown_session.
(__main__): Remove "g.db".
|
|
* wqflask/base/data_set.py: Remove un-used imports.
* wqflask/base/trait.py: Ditto.
wqflask/tests/wqflask/show_trait/test_show_trait.py: Ditto.
* wqflask/wqflask/show_trait/show_trait.py: Ditto.
* wqflask/wqflask/views: Ditto.
|
|
* wqflask/base/data_set.py (DatasetType.set_dataset_key): Replace g.db
with "database_connection()".
(DatasetGroup.get_mapping_methods): Ditto.
(DataSet.get_accession_id): Ditto.
(DataSet.retrieve_other_names): Rework "if ... else" logic to get rid
of "query" and "_vars" variables. Also, nest "try ... except" block
within "database_connection".
(DataSet.chunk_dataset): Replace g.db with "database_connection()".
(DataSet.get_probeset_data): Ditto.
(DataSet.get_trait_data): Ditto.
(PhenotypeDataSet.get_trait_info): Ditto.
(PhenotypeDataSet.retrieve_sample_data): Ditto.
(GenotypeDataSet.retrieve_sample_data): Ditto.
(MrnaAssayDataSet.get_trait_info): Ditto.
(MrnaAssayDataSet.retrieve_sample_data): Ditto.
(MrnaAssayDataSet.retrieve_genes): Ditto.
(TempDataSet): Ditto.
(geno_mrna_confidentiality): Ditto.
(query_table_timestamp): Ditto.
* wqflask/wqflask/api/router.py: Replace "flask.g" with
database_connection import.
(get_species_list): Replace g.db
with "database_connection()".
(get_species_info): Ditto.
(get_groups_list): Ditto.
(get_group_info): Ditto.
(get_datasets_for_group): Ditto.
(get_dataset_info): Ditto.
(fetch_traits): Ditto.
(all_sample_data): Ditto.
(trait_sample_data): Ditto.
(get_trait_info): Ditto.
(get_dataset_trait_ids): Ditto.
(get_samplelist): Ditto.
(get_group_id_from_dataset): Ditto.
(get_group_id): Ditto.
|
|
* wqflask/base/trait.py: Remove utility.logger
|
|
* wqflask/base/trait.py (retrieve_trait_info): Wrap error message in
ValueError.
|
|
* wqflask/base/mrna_assay_tissue_data.py: Replace "flask.g" with database_connection.
(MrnaAssayTissueData.__init__): Use database_connection.
(MrnaAssayTissueData.get_symbol_values_pairs): Ditto.
* wqflask/base/species.py: Replace "Flask.g" imports with
"database_connection".
(Chromosomes.chromosomes): Use database_connection.
* wqflask/base/trait.py: Import database_connection.
(retrieve_trait_info): Use database_connection.
* wqflask/utility/authentication_tools.py: Replace "flask.g" with
database_connection.
(get_group_code): Use database_connection.
* wqflask/utility/helper_functions.py: Replace "flask.g" with
"database_connection".
(get_species_groups): Use database_connection.
* wqflask/wqflask/db_info.py: Replace "Flask" and "g" with
"database_connection".
(InfoPage.get_info): Use database_connection.
* wqflask/wqflask/do_search.py (DoSearch.execute): Use
database_connection().
* wqflask/wqflask/external_tools/send_to_geneweaver.py: Replace
"Flask" and "g" import with database_connection.
(test_chip): Use database_connection.
* wqflask/wqflask/external_tools/send_to_webgestalt.py: Replace
"Flask, g" imports with database_connection.
(test_chip): Use database_connection.
* wqflask/wqflask/gsearch.py: Replace "Flask" and "g" import with
database_connection.
(GSearch.__init__): Use database_connection.
* wqflask/wqflask/interval_analyst/GeneUtil.py (loadGenes):
Use database_connection().
* wqflask/wqflask/show_trait/SampleList.py: Replace "flask.g import"
with database_connection.
(SampleList.get_attributes): Use database_connection.
(SampleList.get_extra_attribute_values): Ditto.
* wqflask/wqflask/show_trait/show_trait.py: Replace "Flask" and "g"
import with database_connection.
(ShowTrait.__init__): Use database_connection.
(ShowTrait.get_external_links): Ditto.
(get_nearest_marker): Ditto.
|
|
* wqflask/wqflask/db_info.py (InfoPage.get_info): Delete insert query
|
|
* wqflask/wqflask/db_info.py (InfoPage.get_info): Remove if block that
constructs a "final" query that does nothing.
|
|
* wqflask/wqflask/db_info.py (InfoPage.get_info): First check for a
ValueError Exception.
|
|
* wqflask/wqflask/db_info.py (InfoPage.get_info): Wrap error message
in ValueError Exception.
|
|
* wqflask/wqflask/db_info.py (InfoPage.get_info): Use f-strings.
|
|
* wqflask/wqflask/db_info.py (InfoPage.get_info): Delete "+".
|
|
* wqflask/wqflask/snp_browser/snp_browser.py
(SnpBrowser.get_browser_results): Replace "g.db" with
database_connection. Rework "if ... else" logic.
|
|
|
|
* wqflask/wqflask/docs.py (update_text): Check for the e-mail in a
list.
|
|
* wqflask/wqflask/docs.py (Docs.__init__): Check the truthy case first
after fetching the results.
|
|
* wqflask/wqflask/update_search_results.py: Replace "Flask" and "g"
import with "database_connection".
(GSearch.__init__): Reformat SQL. Rename "re" to "results" since "re"
is part of the stdlib.
* wqflask/wqflask/marker_regression/rqtl_mapping.py: Replace flask.g
with database_connection.
(write_covarstruct_file): Replace g.db with database_connection().
* wqflask/wqflask/search_results.py: Replace "Flask" and "g" imports
with "database_connection" import.
(trait_info_str): Replace g.db with database_connection.
* wqflask/wqflask/docs.py (Docs): Use dababase_connection() context
manager.
(update_text): Ditto.
* wqflask/wqflask/marker_regression/display_mapping_results.py:
Replace "Flask" and "g" import with "database_connection".
(DisplayMappingResults.__init__): Use database_connection.
(DisplayMappingResults.drawSNPTrackNew): Ditto.
|
|
* wqflask/wqflask/news.py: Delete it.
|
|
use text files for Probeset
|
|
|
|
* .gitignore: Add containers/mariadb-state.
|
|
|
|
|
|
|
|
(because it was weird for it to be /delete)
|
|
|
|
table for partial corr
|
|
|
|
I'm only using g.db.execute here because using cursor is throwing an
error and I don't want to change the way this query is currently written
since I didn't write it (I believe it was initially written using
g.db.execute and whoever wrote it just forgot to put the g.db.execute,
since previously it just called "fetchall")
|
|
|
|
Feature/generalize tables
|
|
|
|
* README.md (Development): Update link to continuous deployment.
|
|
|
|
Use joins to relate tables when fetching data.
|