Skip to content

Commit 5280ad1

Browse files
committed
enable dashboard generation for test mode
1 parent fa70443 commit 5280ad1

File tree

2 files changed

+21
-19
lines changed

2 files changed

+21
-19
lines changed

bin/consortium_to_public.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919

2020
# TODO: Move to genie.database_to_staging.py
21-
def generate_dashboard_html(genie_version, staging=False):
21+
def generate_dashboard_html(genie_version, staging=False, testing=False):
2222
"""Generates dashboard html writeout that gets uploaded to the
2323
release folder
2424
@@ -36,6 +36,8 @@ def generate_dashboard_html(genie_version, staging=False):
3636
]
3737
if staging:
3838
markdown_render_cmd.append("--staging")
39+
if testing:
40+
markdown_render_cmd.append("--testing")
3941
subprocess.check_call(markdown_render_cmd)
4042

4143

@@ -195,14 +197,13 @@ def main(args):
195197
start=False,
196198
)
197199

198-
if not args.test:
199-
logger.info("DASHBOARD UPDATE")
200-
dashboard_table_updater.run_dashboard(
201-
syn, databaseSynIdMappingDf, args.genieVersion, staging=args.staging
202-
)
203-
generate_dashboard_html(args.genieVersion, staging=args.staging)
204-
logger.info("DASHBOARD UPDATE COMPLETE")
205-
logger.info("AUTO GENERATE DATA GUIDE")
200+
logger.info("DASHBOARD UPDATE")
201+
dashboard_table_updater.run_dashboard(
202+
syn, databaseSynIdMappingDf, args.genieVersion, staging=args.staging, testing=args.test
203+
)
204+
generate_dashboard_html(args.genieVersion, staging=args.staging, testing=args.test)
205+
logger.info("DASHBOARD UPDATE COMPLETE")
206+
logger.info("AUTO GENERATE DATA GUIDE")
206207

207208
# TODO: remove data guide code
208209
# onco_link = databaseSynIdMappingDf["Id"][
@@ -254,7 +255,7 @@ def main(args):
254255
"--staging", action="store_true", help="Store into staging folder"
255256
)
256257

257-
parser.add_argument("--test", action="store_true", help="Store into staging folder")
258+
parser.add_argument("--test", action="store_true", help="Store into testing folder")
258259
parser.add_argument("--debug", action="store_true", help="Synapse debug feature")
259260
args = parser.parse_args()
260261
main(args)

bin/database_to_staging.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
PWD = os.path.dirname(os.path.abspath(__file__))
8787

8888

89-
def generate_dashboard_html(genie_version, staging=False):
89+
def generate_dashboard_html(genie_version, staging=False, testing=False):
9090
"""Generates dashboard html writeout that gets uploaded to the
9191
release folder
9292
@@ -105,6 +105,8 @@ def generate_dashboard_html(genie_version, staging=False):
105105

106106
if staging:
107107
markdown_render_cmd.append("--staging")
108+
if testing:
109+
markdown_render_cmd.append("--testing")
108110
subprocess.check_call(markdown_render_cmd)
109111

110112

@@ -352,14 +354,13 @@ def main(
352354
start=False,
353355
)
354356

355-
if not test:
356-
logger.info("DASHBOARD UPDATE")
357-
dashboard_table_updater.run_dashboard(
358-
syn, databaseSynIdMappingDf, genie_version, staging=staging
359-
)
360-
generate_dashboard_html(genie_version, staging=staging)
361-
logger.info("DASHBOARD UPDATE COMPLETE")
362-
logger.info("AUTO GENERATE DATA GUIDE")
357+
logger.info("DASHBOARD UPDATE")
358+
dashboard_table_updater.run_dashboard(
359+
syn, databaseSynIdMappingDf, genie_version, staging=staging, testing=test
360+
)
361+
generate_dashboard_html(genie_version, staging=staging, testing=test)
362+
logger.info("DASHBOARD UPDATE COMPLETE")
363+
logger.info("AUTO GENERATE DATA GUIDE")
363364

364365
# TODO: remove data guide code
365366
# oncotree_version = oncotree_link.split("=")[1]

0 commit comments

Comments
 (0)