dcicutils 8.8.2.1b8__py3-none-any.whl → 8.8.2.1b9__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- dcicutils/deployment_utils.py +38 -25
- {dcicutils-8.8.2.1b8.dist-info → dcicutils-8.8.2.1b9.dist-info}/METADATA +1 -1
- {dcicutils-8.8.2.1b8.dist-info → dcicutils-8.8.2.1b9.dist-info}/RECORD +6 -6
- {dcicutils-8.8.2.1b8.dist-info → dcicutils-8.8.2.1b9.dist-info}/LICENSE.txt +0 -0
- {dcicutils-8.8.2.1b8.dist-info → dcicutils-8.8.2.1b9.dist-info}/WHEEL +0 -0
- {dcicutils-8.8.2.1b8.dist-info → dcicutils-8.8.2.1b9.dist-info}/entry_points.txt +0 -0
dcicutils/deployment_utils.py
CHANGED
|
@@ -431,6 +431,7 @@ class IniFileManager:
|
|
|
431
431
|
re_captcha_key=None, re_captcha_secret=None,
|
|
432
432
|
redis_server=None,
|
|
433
433
|
google_api_key=None,
|
|
434
|
+
submitr_metadata_template_sheet_id=None,
|
|
434
435
|
file_upload_bucket=None, file_wfout_bucket=None,
|
|
435
436
|
blob_bucket=None, system_bucket=None, metadata_bundles_bucket=None):
|
|
436
437
|
|
|
@@ -471,6 +472,8 @@ class IniFileManager:
|
|
|
471
472
|
re_captcha_key (str): key used for reCaptcha for throttling/detecting humans on login
|
|
472
473
|
re_captcha_secret (str): secret used for reCaptcha
|
|
473
474
|
redis_server (str): A server URL to a Redis cluster, for use with sessions
|
|
475
|
+
google_api_key (str): A Google (Sheets) API key for smaht-submitr to get latest metadata template version.
|
|
476
|
+
submitr_metadata_template_sheet_id (str): A Google Sheets doc ID key for smaht-submitr metadata template.
|
|
474
477
|
file_upload_bucket (str): Specific name of the bucket to use on S3 for file upload data.
|
|
475
478
|
file_wfout_bucket (str): Specific name of the bucket to use on S3 for wfout data.
|
|
476
479
|
blob_bucket (str): Specific name of the bucket to use on S3 for blob data.
|
|
@@ -508,6 +511,7 @@ class IniFileManager:
|
|
|
508
511
|
re_captcha_secret=re_captcha_secret,
|
|
509
512
|
redis_server=redis_server,
|
|
510
513
|
google_api_key=google_api_key,
|
|
514
|
+
submitr_metadata_template_sheet_id=submitr_metadata_template_sheet_id,
|
|
511
515
|
file_upload_bucket=file_upload_bucket,
|
|
512
516
|
file_wfout_bucket=file_wfout_bucket,
|
|
513
517
|
blob_bucket=blob_bucket,
|
|
@@ -579,6 +583,7 @@ class IniFileManager:
|
|
|
579
583
|
re_captcha_key=None, re_captcha_secret=None,
|
|
580
584
|
redis_server=None,
|
|
581
585
|
google_api_key=None,
|
|
586
|
+
submitr_metadata_template_sheet_id=None,
|
|
582
587
|
file_upload_bucket=None,
|
|
583
588
|
file_wfout_bucket=None, blob_bucket=None, system_bucket=None,
|
|
584
589
|
metadata_bundles_bucket=None):
|
|
@@ -636,6 +641,8 @@ class IniFileManager:
|
|
|
636
641
|
es_server = es_server or os.environ.get('ENCODED_ES_SERVER', "MISSING_ENCODED_ES_SERVER")
|
|
637
642
|
redis_server = redis_server or os.environ.get('ENCODED_REDIS_SERVER', '') # optional
|
|
638
643
|
google_api_key = google_api_key or os.environ.get('GOOGLE_API_KEY', '') # optional
|
|
644
|
+
submitr_metadata_template_sheet_id = (
|
|
645
|
+
submitr_metadata_template_sheet_id or os.environ.get('SUBMITR_METADATA_TEMPLATE_SHEET_ID', '')) # optional
|
|
639
646
|
env_bucket = (env_bucket
|
|
640
647
|
or EnvBase.global_env_bucket_name()
|
|
641
648
|
or ("MISSING_GLOBAL_ENV_BUCKET"
|
|
@@ -778,6 +785,7 @@ class IniFileManager:
|
|
|
778
785
|
'ES_SERVER': es_server,
|
|
779
786
|
'REDIS_SERVER': redis_server,
|
|
780
787
|
'GOOGLE_API_KEY': google_api_key,
|
|
788
|
+
'SUBMITR_METADATA_TEMPLATE_SHEET_ID': submitr_metadata_template_sheet_id,
|
|
781
789
|
'ENV_BUCKET': env_bucket,
|
|
782
790
|
'ENV_ECOSYSTEM': env_ecosystem,
|
|
783
791
|
'ENV_NAME': env_name,
|
|
@@ -953,6 +961,9 @@ class IniFileManager:
|
|
|
953
961
|
parser.add_argument("--google_api_key",
|
|
954
962
|
help="Google API key to get smaht-submitr metadata template version",
|
|
955
963
|
default=None)
|
|
964
|
+
parser.add_argument("--submitr_metadata_template_sheet_id",
|
|
965
|
+
help="Google Sheets API document ID of smaht-submitr metadata template",
|
|
966
|
+
default=None)
|
|
956
967
|
parser.add_argument("--tibanna_cwls_bucket",
|
|
957
968
|
help="the name of a Tibanna CWLs bucket to use",
|
|
958
969
|
default=None)
|
|
@@ -1012,31 +1023,33 @@ class IniFileManager:
|
|
|
1012
1023
|
ini_file_name = args.target
|
|
1013
1024
|
# print("template_file_name=", template_file_name)
|
|
1014
1025
|
# print("ini_file_name=", ini_file_name)
|
|
1015
|
-
cls.build_ini_file_from_template(
|
|
1016
|
-
|
|
1017
|
-
|
|
1018
|
-
|
|
1019
|
-
|
|
1020
|
-
|
|
1021
|
-
|
|
1022
|
-
|
|
1023
|
-
|
|
1024
|
-
|
|
1025
|
-
|
|
1026
|
-
|
|
1027
|
-
|
|
1028
|
-
|
|
1029
|
-
|
|
1030
|
-
|
|
1031
|
-
|
|
1032
|
-
|
|
1033
|
-
|
|
1034
|
-
|
|
1035
|
-
|
|
1036
|
-
|
|
1037
|
-
|
|
1038
|
-
|
|
1039
|
-
|
|
1026
|
+
cls.build_ini_file_from_template(
|
|
1027
|
+
template_file_name, ini_file_name,
|
|
1028
|
+
bs_env=args.bs_env, bs_mirror_env=args.bs_mirror_env,
|
|
1029
|
+
env_bucket=args.env_bucket, env_ecosystem=args.env_ecosystem,
|
|
1030
|
+
env_name=args.env_name,
|
|
1031
|
+
s3_bucket_org=args.s3_bucket_org, s3_bucket_env=args.s3_bucket_env,
|
|
1032
|
+
data_set=args.data_set, s3_encrypt_key_id=args.s3_encrypt_key_id,
|
|
1033
|
+
es_server=args.es_server, es_namespace=args.es_namespace,
|
|
1034
|
+
indexer=args.indexer, index_server=args.index_server,
|
|
1035
|
+
identity=args.identity, higlass_server=args.higlass_server,
|
|
1036
|
+
sentry_dsn=args.sentry_dsn,
|
|
1037
|
+
tibanna_cwls_bucket=args.tibanna_cwls_bucket,
|
|
1038
|
+
tibanna_output_bucket=args.tibanna_output_bucket,
|
|
1039
|
+
application_bucket_prefix=args.application_bucket_prefix,
|
|
1040
|
+
foursight_bucket_prefix=args.foursight_bucket_prefix,
|
|
1041
|
+
auth0_domain=args.auth0_domain,
|
|
1042
|
+
auth0_client=args.auth0_client,
|
|
1043
|
+
auth0_secret=args.auth0_secret,
|
|
1044
|
+
auth0_allowed_connections=args.auth0_allowed_connections,
|
|
1045
|
+
re_captcha_key=args.recaptcha_key, re_captcha_secret=args.recaptcha_secret,
|
|
1046
|
+
redis_server=args.redis_server,
|
|
1047
|
+
google_api_key=args.google_api_key,
|
|
1048
|
+
submitr_metadata_template_sheet_id=args.submitr_metadata_template_sheet_id,
|
|
1049
|
+
file_upload_bucket=args.file_upload_bucket,
|
|
1050
|
+
file_wfout_bucket=args.file_wfout_bucket,
|
|
1051
|
+
blob_bucket=args.blob_bucket, system_bucket=args.system_bucket,
|
|
1052
|
+
metadata_bundles_bucket=args.metadata_bundles_bucket)
|
|
1040
1053
|
except Exception as e:
|
|
1041
1054
|
PRINT("Error (%s): %s" % (e.__class__.__name__, e))
|
|
1042
1055
|
sys.exit(1)
|
|
@@ -13,7 +13,7 @@ dcicutils/creds_utils.py,sha256=xrLekD49Ex0GOpL9n7LlJA4gvNcY7txTVFOSYD7LvEU,1111
|
|
|
13
13
|
dcicutils/data_readers.py,sha256=WWH_VDz2KnNv_FoTjfFwrg6zh9asl8Q-uEV2V3XuyUg,7414
|
|
14
14
|
dcicutils/data_utils.py,sha256=k2OxOlsx7AJ6jF-YNlMyGus_JqSUBe4_n1s65Mv1gQQ,3098
|
|
15
15
|
dcicutils/datetime_utils.py,sha256=EODDGAngp1yh2ZlDIuI7tB74JBJucw2DljqfPknzK0Y,4666
|
|
16
|
-
dcicutils/deployment_utils.py,sha256
|
|
16
|
+
dcicutils/deployment_utils.py,sha256=sKv8Jb-_Zw2aH3OAywRlsre-Cqm3a7fEGG3_1PT-r-s,69908
|
|
17
17
|
dcicutils/diff_utils.py,sha256=sQx-yz56DHAcQWOChYbAG3clXu7TbiZKlw-GggeveO0,8118
|
|
18
18
|
dcicutils/docker_utils.py,sha256=30gUiqz7X9rJwSPXTPn4ewjQibUgoSJqhP9o9vn5X-A,1747
|
|
19
19
|
dcicutils/ecr_scripts.py,sha256=cxDl4BQt5W9NN1zjOHYZ7kk3yqoMnaCfNIyLaYmCqdE,19474
|
|
@@ -72,8 +72,8 @@ dcicutils/trace_utils.py,sha256=g8kwV4ebEy5kXW6oOrEAUsurBcCROvwtZqz9fczsGRE,1769
|
|
|
72
72
|
dcicutils/validation_utils.py,sha256=cMZIU2cY98FYtzK52z5WUYck7urH6JcqOuz9jkXpqzg,14797
|
|
73
73
|
dcicutils/variant_utils.py,sha256=2H9azNx3xAj-MySg-uZ2SFqbWs4kZvf61JnK6b-h4Qw,4343
|
|
74
74
|
dcicutils/zip_utils.py,sha256=rnjNv_k6L9jT2SjDSgVXp4BEJYLtz9XN6Cl2Fy-tqnM,2027
|
|
75
|
-
dcicutils-8.8.2.
|
|
76
|
-
dcicutils-8.8.2.
|
|
77
|
-
dcicutils-8.8.2.
|
|
78
|
-
dcicutils-8.8.2.
|
|
79
|
-
dcicutils-8.8.2.
|
|
75
|
+
dcicutils-8.8.2.1b9.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
|
|
76
|
+
dcicutils-8.8.2.1b9.dist-info/METADATA,sha256=7K_1LUsQW1A-yScc9CV34B-r-iUyRfJyA-W8aEqbd5M,3356
|
|
77
|
+
dcicutils-8.8.2.1b9.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
|
|
78
|
+
dcicutils-8.8.2.1b9.dist-info/entry_points.txt,sha256=51Q4F_2V10L0282W7HFjP4jdzW4K8lnWDARJQVFy_hw,270
|
|
79
|
+
dcicutils-8.8.2.1b9.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|