Skip to content

Commit 1aa5aeb

Browse files
committed
Move SUPeR Viewer UMAP + pseudobulk endpoints to feature/steven-changes
Removes Steven's umap_expression and super_viewer_gene_expression endpoints, their tests, namespace registration, the 7 pseudobulk databases' schema-catalog/config/combined_master.json entries, and the 14 UMAP+pseudobulk MySQL binds/init.sh imports from this branch -- all preserved on feature/steven-changes instead. Database count in test_efp_schemas.py drops from 198 back to 191.
1 parent 2bf6d2c commit 1aa5aeb

10 files changed

Lines changed: 128 additions & 2819 deletions

File tree

‎api/__init__.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ def create_app():
9393
from api.resources.llama3 import llama3
9494
from api.resources.gene_expression import gene_expression
9595
from api.resources.gene_density import gene_density
96-
from api.resources.umap_expression import umap_expression
97-
from api.resources.super_viewer_gene_expression import super_viewer_gene_expression
9896

9997
bar_api.add_namespace(gene_information)
10098
bar_api.add_namespace(gaia)
@@ -112,8 +110,6 @@ def create_app():
112110
bar_api.add_namespace(llama3)
113111
bar_api.add_namespace(gene_expression)
114112
bar_api.add_namespace(gene_density)
115-
bar_api.add_namespace(umap_expression)
116-
bar_api.add_namespace(super_viewer_gene_expression)
117113
bar_api.init_app(bar_app)
118114
return bar_app
119115

‎api/models/efp_schemas.py‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,6 @@ def _schema(species: str, charset: str = "latin1") -> DatabaseSpec:
5757
"affydb",
5858
"apple",
5959
"arabidopsis_ecotypes",
60-
"arabidopsis_NIE_pseudobulk",
61-
"arabidopsis_flower_lee_pseudobulk",
62-
"arabidopsis_root_rs_pseudobulk",
63-
"arabidopsis_seed_martin_pseudobulk",
64-
"arabidopsis_silique_lee_pseudobulk",
65-
"arabidopsis_stem_lee_pseudobulk",
6660
"arachis",
6761
"atgenexp",
6862
"atgenexp_hormone",
@@ -184,7 +178,6 @@ def _schema(species: str, charset: str = "latin1") -> DatabaseSpec:
184178
"rice_maize_comparison",
185179
"rice_mas",
186180
"rice_metabolite",
187-
"rice_OW_pseudobulk",
188181
"rice_rma",
189182
"rice_root",
190183
"rohan",

‎api/resources/super_viewer_gene_expression.py‎

Lines changed: 0 additions & 110 deletions
This file was deleted.

‎api/resources/umap_expression.py‎

Lines changed: 0 additions & 141 deletions
This file was deleted.

‎config/BAR_API.cfg‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,4 @@ SQLALCHEMY_BINDS = {
4444
'tomato_sequence' : 'mysql://root:root@localhost/tomato_sequence',
4545
'triphysaria' : 'mysql://root:root@localhost/triphysaria',
4646
'gaia' : 'mysql://root:root@localhost/gaia',
47-
'arabidopsis_NIE_pseudobulk': 'mysql://root:root@localhost/arabidopsis_NIE_pseudobulk',
48-
'arabidopsis_flower_lee_pseudobulk': 'mysql://root:root@localhost/arabidopsis_flower_lee_pseudobulk',
49-
'arabidopsis_root_rs_pseudobulk': 'mysql://root:root@localhost/arabidopsis_root_rs_pseudobulk',
50-
'arabidopsis_seed_martin_pseudobulk': 'mysql://root:root@localhost/arabidopsis_seed_martin_pseudobulk',
51-
'arabidopsis_silique_lee_pseudobulk': 'mysql://root:root@localhost/arabidopsis_silique_lee_pseudobulk',
52-
'arabidopsis_stem_lee_pseudobulk': 'mysql://root:root@localhost/arabidopsis_stem_lee_pseudobulk',
53-
'rice_OW_pseudobulk': 'mysql://root:root@localhost/rice_OW_pseudobulk',
54-
'arabidopsis_NIE_umap': 'mysql://root:root@localhost/arabidopsis_NIE_umap',
55-
'arabidopsis_flower_lee_umap': 'mysql://root:root@localhost/arabidopsis_flower_lee_umap',
56-
'arabidopsis_root_shahan_umap': 'mysql://root:root@localhost/arabidopsis_root_shahan_umap',
57-
'arabidopsis_seed_martin_umap': 'mysql://root:root@localhost/arabidopsis_seed_martin_umap',
58-
'arabidopsis_silique_lee_umap': 'mysql://root:root@localhost/arabidopsis_silique_lee_umap',
59-
'arabidopsis_stem_lee_umap': 'mysql://root:root@localhost/arabidopsis_stem_lee_umap',
60-
'rice_OW_umap': 'mysql://root:root@localhost/rice_OW_umap'
6147
}

‎config/init.sh‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -54,24 +54,6 @@ mysql -h $DB_HOST -u $DB_USER -p$DB_PASS < ./config/databases/tomato_nssnp.sql
5454
mysql -h $DB_HOST -u $DB_USER -p$DB_PASS < ./config/databases/tomato_sequence.sql
5555
mysql -h $DB_HOST -u $DB_USER -p$DB_PASS < ./config/databases/triphysaria.sql
5656

57-
# SUPeR Viewer pseudobulk + UMAP databases (real per-gene dumps with an extra
58-
# data_signal_std column on the pseudobulk side, and a separate umap_coords /
59-
# umap_expression pair on the UMAP side).
60-
mysql -h $DB_HOST -u $DB_USER -p$DB_PASS < ./config/databases/arabidopsis_NIE_pseudobulk_dump.sql
61-
mysql -h $DB_HOST -u $DB_USER -p$DB_PASS < ./config/databases/arabidopsis_flower_lee_pseudobulk_dump.sql
62-
mysql -h $DB_HOST -u $DB_USER -p$DB_PASS < ./config/databases/arabidopsis_root_rs_pseudobulk_dump.sql
63-
mysql -h $DB_HOST -u $DB_USER -p$DB_PASS < ./config/databases/arabidopsis_seed_martin_pseudobulk_dump.sql
64-
mysql -h $DB_HOST -u $DB_USER -p$DB_PASS < ./config/databases/arabidopsis_silique_lee_pseudobulk_dump.sql
65-
mysql -h $DB_HOST -u $DB_USER -p$DB_PASS < ./config/databases/arabidopsis_stem_lee_pseudobulk_dump.sql
66-
mysql -h $DB_HOST -u $DB_USER -p$DB_PASS < ./config/databases/rice_OW_pseudobulk_dump.sql
67-
mysql -h $DB_HOST -u $DB_USER -p$DB_PASS < ./config/databases/arabidopsis_NIE_umap.sql
68-
mysql -h $DB_HOST -u $DB_USER -p$DB_PASS < ./config/databases/arabidopsis_flower_lee_umap.sql
69-
mysql -h $DB_HOST -u $DB_USER -p$DB_PASS < ./config/databases/arabidopsis_root_shahan_umap.sql
70-
mysql -h $DB_HOST -u $DB_USER -p$DB_PASS < ./config/databases/arabidopsis_seed_martin_umap.sql
71-
mysql -h $DB_HOST -u $DB_USER -p$DB_PASS < ./config/databases/arabidopsis_silique_lee_umap.sql
72-
mysql -h $DB_HOST -u $DB_USER -p$DB_PASS < ./config/databases/arabidopsis_stem_lee_umap.sql
73-
mysql -h $DB_HOST -u $DB_USER -p$DB_PASS < ./config/databases/rice_OW_umap.sql
74-
7557
echo "Data are now loaded. Preparing API config"
7658
echo "Please manually edit config file!"
7759

0 commit comments

Comments
 (0)