ciocore 8.0.0rc1__py2.py3-none-any.whl → 8.0.1__py2.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.
Potentially problematic release.
This version of ciocore might be problematic. Click here for more details.
- ciocore/VERSION +1 -1
- ciocore/cli.py +8 -10
- ciocore/docsite/404.html +1 -1
- ciocore/docsite/apidoc/api_client/index.html +1 -1
- ciocore/docsite/apidoc/apidoc/index.html +1 -1
- ciocore/docsite/apidoc/config/index.html +1 -1
- ciocore/docsite/apidoc/data/index.html +1 -1
- ciocore/docsite/apidoc/hardware_set/index.html +1 -1
- ciocore/docsite/apidoc/package_environment/index.html +1 -1
- ciocore/docsite/apidoc/package_tree/index.html +1 -1
- ciocore/docsite/cmdline/docs/index.html +1 -1
- ciocore/docsite/cmdline/downloader/index.html +1 -1
- ciocore/docsite/cmdline/packages/index.html +1 -1
- ciocore/docsite/cmdline/uploader/index.html +1 -1
- ciocore/docsite/how-to-guides/index.html +1 -1
- ciocore/docsite/index.html +1 -1
- ciocore/docsite/sitemap.xml.gz +0 -0
- ciocore/uploader/_uploader.py +8 -7
- ciocore/worker.py +10 -5
- {ciocore-8.0.0rc1.dist-info → ciocore-8.0.1.dist-info}/METADATA +7 -3
- {ciocore-8.0.0rc1.dist-info → ciocore-8.0.1.dist-info}/RECORD +25 -25
- tests/test_cli.py +0 -14
- {ciocore-8.0.0rc1.dist-info → ciocore-8.0.1.dist-info}/WHEEL +0 -0
- {ciocore-8.0.0rc1.dist-info → ciocore-8.0.1.dist-info}/entry_points.txt +0 -0
- {ciocore-8.0.0rc1.dist-info → ciocore-8.0.1.dist-info}/top_level.txt +0 -0
ciocore/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
8.0.
|
|
1
|
+
8.0.1
|
ciocore/cli.py
CHANGED
|
@@ -118,9 +118,11 @@ def _set_logging(log_level, log_to_console=True, log_dir=None, log_filename=None
|
|
|
118
118
|
log_filename=log_filename,
|
|
119
119
|
console_formatter=loggeria.FORMATTER_VERBOSE,
|
|
120
120
|
disable_console_logging= not log_to_console,
|
|
121
|
-
use_system_log=
|
|
121
|
+
use_system_log=True,
|
|
122
122
|
)
|
|
123
123
|
|
|
124
|
+
print("Logging to %s" % loggeria.LOG_PATH)
|
|
125
|
+
|
|
124
126
|
def _register(client):
|
|
125
127
|
api_client.ApiClient.register_client(
|
|
126
128
|
client_name=client.CLIENT_NAME, client_version=VERSION
|
|
@@ -166,7 +168,7 @@ def main(ctx, version):
|
|
|
166
168
|
default=DEFAULT_CONFIG_LOG_LEVEL,
|
|
167
169
|
)
|
|
168
170
|
@click.option("-ld", "--log_dir", help=LOG_DIR_HELP)
|
|
169
|
-
@click.option("-lcl", "--log_to_console", is_flag=True, help=LOG_TO_CONSOLE_HELP, default=
|
|
171
|
+
@click.option("-lcl", "--log_to_console", is_flag=True, help=LOG_TO_CONSOLE_HELP, default=False)
|
|
170
172
|
@click.option(
|
|
171
173
|
"-tc",
|
|
172
174
|
"--thread_count",
|
|
@@ -189,15 +191,13 @@ def upload(
|
|
|
189
191
|
Example:
|
|
190
192
|
conductor upload file1 file2 file3
|
|
191
193
|
"""
|
|
192
|
-
|
|
193
|
-
_set_logging(log_level, log_to_console=log_to_console, log_dir=log_dir)
|
|
194
|
+
|
|
195
|
+
_set_logging(log_level, log_to_console=log_to_console, log_dir=log_dir, log_filename="conductor_uploader.log")
|
|
194
196
|
|
|
195
197
|
args_dict = {
|
|
196
198
|
"database_filepath": database_filepath,
|
|
197
199
|
"location": location,
|
|
198
200
|
"md5_caching": md5_caching,
|
|
199
|
-
"log_level": log_level,
|
|
200
|
-
"log_dir": log_dir,
|
|
201
201
|
"thread_count": thread_count,
|
|
202
202
|
}
|
|
203
203
|
|
|
@@ -284,7 +284,7 @@ DEPRECATED_PATHS_HELP = "Specify a list of paths to upload."
|
|
|
284
284
|
help=THREADS_HELP,
|
|
285
285
|
default=DEFAULT_CONFIG_THREAD_COUNT,
|
|
286
286
|
)
|
|
287
|
-
@click.option("-lcl", "--log_to_console", is_flag=True, help=LOG_TO_CONSOLE_HELP, default=
|
|
287
|
+
@click.option("-lcl", "--log_to_console", is_flag=True, help=LOG_TO_CONSOLE_HELP, default=False)
|
|
288
288
|
@click.option("-lc", "--location", help=LOCATION_HELP)
|
|
289
289
|
@click.option(
|
|
290
290
|
"-p",
|
|
@@ -306,14 +306,12 @@ def uploader(
|
|
|
306
306
|
Example:
|
|
307
307
|
conductor upload file1 file2 file3
|
|
308
308
|
"""
|
|
309
|
-
_set_logging(log_level, log_to_console=log_to_console, log_dir=log_dir)
|
|
309
|
+
_set_logging(log_level, log_to_console=log_to_console, log_dir=log_dir, log_filename="conductor_uploader.log")
|
|
310
310
|
|
|
311
311
|
args_dict = {
|
|
312
312
|
"database_filepath": database_filepath,
|
|
313
313
|
"location": location,
|
|
314
314
|
"md5_caching": md5_caching,
|
|
315
|
-
"log_level": log_level,
|
|
316
|
-
"log_dir": log_dir,
|
|
317
315
|
"thread_count": thread_count,
|
|
318
316
|
}
|
|
319
317
|
|
ciocore/docsite/404.html
CHANGED
ciocore/docsite/index.html
CHANGED
ciocore/docsite/sitemap.xml.gz
CHANGED
|
Binary file
|
ciocore/uploader/_uploader.py
CHANGED
|
@@ -640,8 +640,7 @@ class Uploader(object):
|
|
|
640
640
|
(UploadWorker, [], {"thread_count": self.args["thread_count"]}),
|
|
641
641
|
]
|
|
642
642
|
|
|
643
|
-
manager = worker.JobManager(job_description)
|
|
644
|
-
manager.start()
|
|
643
|
+
manager = worker.JobManager(job_description)
|
|
645
644
|
return manager
|
|
646
645
|
|
|
647
646
|
@common.dec_catch_exception(raise_=True)
|
|
@@ -744,7 +743,7 @@ class Uploader(object):
|
|
|
744
743
|
return True
|
|
745
744
|
|
|
746
745
|
def mark_upload_failed(self, error_message, upload_id):
|
|
747
|
-
logger.error("Upload failed:
|
|
746
|
+
logger.error("Upload failed: %s", error_message)
|
|
748
747
|
|
|
749
748
|
# report error_message to the app
|
|
750
749
|
self.api_client.make_request(
|
|
@@ -793,6 +792,7 @@ class Uploader(object):
|
|
|
793
792
|
|
|
794
793
|
# create worker pools
|
|
795
794
|
self.manager = self.create_manager(project)
|
|
795
|
+
self.manager.start()
|
|
796
796
|
|
|
797
797
|
# create reporters
|
|
798
798
|
logger.debug("creating report status thread...")
|
|
@@ -931,16 +931,17 @@ class Uploader(object):
|
|
|
931
931
|
|
|
932
932
|
if error_messages:
|
|
933
933
|
self.mark_upload_failed(
|
|
934
|
-
error_message="\n".join(error_messages),
|
|
934
|
+
error_message="Uploader ERROR: {}".format("\n".join(error_messages)),
|
|
935
|
+
upload_id=upload_id
|
|
935
936
|
)
|
|
936
937
|
|
|
937
938
|
log_file = loggeria.LOG_PATH
|
|
938
|
-
sys.stderr.write("
|
|
939
|
+
sys.stderr.write("\nError uploading files:\n")
|
|
939
940
|
|
|
940
941
|
for err_msg in error_messages:
|
|
941
|
-
sys.stderr.write("\t
|
|
942
|
+
sys.stderr.write("\t{}\n".format(err_msg))
|
|
942
943
|
|
|
943
|
-
sys.stderr.write("\nSee log
|
|
944
|
+
sys.stderr.write("\nSee log {} for more details\n\n".format(log_file))
|
|
944
945
|
|
|
945
946
|
self.error_messages = []
|
|
946
947
|
|
ciocore/worker.py
CHANGED
|
@@ -252,7 +252,7 @@ class ThreadWorker(object):
|
|
|
252
252
|
return
|
|
253
253
|
|
|
254
254
|
# don't to anything if we were not provided an out_queue
|
|
255
|
-
logger.debug("Attempting to put job to out_queue (%s -> %s)", job,
|
|
255
|
+
logger.debug("Attempting to put job to out_queue (%s -> %s)", job, self.out_queue)
|
|
256
256
|
|
|
257
257
|
if not self.out_queue:
|
|
258
258
|
return
|
|
@@ -261,7 +261,7 @@ class ThreadWorker(object):
|
|
|
261
261
|
if not WORKING:
|
|
262
262
|
return
|
|
263
263
|
|
|
264
|
-
logger.debug("Adding job to out_queue (%s -> %s)", job,
|
|
264
|
+
logger.debug("Adding job to out_queue (%s -> %s)", job, self.out_queue)
|
|
265
265
|
|
|
266
266
|
# add item to job
|
|
267
267
|
self.out_queue.put(job)
|
|
@@ -491,10 +491,15 @@ class JobManager():
|
|
|
491
491
|
while not self.error_handler_stop:
|
|
492
492
|
|
|
493
493
|
try:
|
|
494
|
-
error = self.error_queue.get(True,
|
|
494
|
+
error = self.error_queue.get(True, 0.5)
|
|
495
495
|
|
|
496
496
|
except queue.Empty:
|
|
497
|
-
|
|
497
|
+
|
|
498
|
+
if self.error:
|
|
499
|
+
break
|
|
500
|
+
|
|
501
|
+
else:
|
|
502
|
+
continue
|
|
498
503
|
|
|
499
504
|
logger.error('Got something from the error queue: %s', error)
|
|
500
505
|
self.error.append(error)
|
|
@@ -503,7 +508,7 @@ class JobManager():
|
|
|
503
508
|
except ValueError:
|
|
504
509
|
pass
|
|
505
510
|
|
|
506
|
-
|
|
511
|
+
self.stop_work(force=True)
|
|
507
512
|
|
|
508
513
|
def start_error_handler(self):
|
|
509
514
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: ciocore
|
|
3
|
-
Version: 8.0.
|
|
3
|
+
Version: 8.0.1
|
|
4
4
|
Summary: Core functionality for Conductor's client tools
|
|
5
5
|
Home-page: https://github.com/ConductorTechnologies/ciocore
|
|
6
6
|
Author: conductor
|
|
@@ -51,11 +51,15 @@ See [CONTRIBUTING](CONTRIBUTING.md)
|
|
|
51
51
|
|
|
52
52
|
## Changelog
|
|
53
53
|
|
|
54
|
-
## Version:8.0.
|
|
54
|
+
## Version:8.0.1 -- 22 Apr 2024
|
|
55
55
|
|
|
56
|
-
|
|
56
|
+
* The uploader now sends all error messages to the dashboard - not just the first error.
|
|
57
|
+
* Fixed a bug where --log-to-console was not not working as expected in the command line upload subcommand.
|
|
58
|
+
* Fixed some errors in DEBUG-level logging messages.
|
|
57
59
|
|
|
58
60
|
|
|
61
|
+
## Version:8.0.0 -- 07 Apr 2024
|
|
62
|
+
|
|
59
63
|
* The `conductor` commandline interface (CLI) has undergone a complete overhaul to improve its functionality and performance. It is now installed as a Python console script, which simplifies the installation process on all platforms and ensures that the tool is always accessible. In addition, this standardized installation allows for better integration into our Companion application and potentially customers' own proprietary tools.
|
|
60
64
|
* The commandline downloader has been rewritten to improve its performance and reliability. In previous versions, the downloader would fetch all download URLs from the server before starting any downloads. This approach was inefficient and would lead to performance issues when handling jobs with large numbers of tasks. The new downloader fetches tasks in small batches, which allows the download to start almost immediately, regardless of the number of tasks. It provides several new commandline flags, such as filtering based on filenames, and better logging, giving users more control and visibility over the download process. In addition, the new downloader has been written as an event based system that can be seamlessly integrated into other pipeline tools and GUIs. Pipeline TDs need only to register handlers to any of the events that the downloader emits.
|
|
61
65
|
* The `conductor` commandline now supports a new subcommand, `docs`, which opens API and commandline documentation in a local web browser. The documentation is generated using `mkdocs` and is included in the package. This command is useful as it ensures the **API** documentation is relevant to the version of the tool being used.
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
ciocore/VERSION,sha256=
|
|
1
|
+
ciocore/VERSION,sha256=NUqt24vsbMosc7cU07CLlLBV2gAdKgs8roFBqy0xjlA,5
|
|
2
2
|
ciocore/__init__.py,sha256=aTP7LeeosQA8BZE67gDV4jgfTK5zxmwZRjiTRu_ZWj0,646
|
|
3
3
|
ciocore/api_client.py,sha256=TyHXGmK4uTmKV93O_IpAvttZhbexIIZTGP-IVn_WyWM,24599
|
|
4
|
-
ciocore/cli.py,sha256=
|
|
4
|
+
ciocore/cli.py,sha256=jZ1lOKQiUcrMhsVmD9SVmPMFwHtgDF4SaoAf2-PBS54,15449
|
|
5
5
|
ciocore/client_db.py,sha256=tTz3bl2xeDPPcYSDS3g3QgV_xYihJMx0Kj6OeN2klK0,12978
|
|
6
6
|
ciocore/common.py,sha256=mBIS6KiYoQsjWe6aIFUGRRvCMl8BIN2kmLZ4J8icap8,14982
|
|
7
7
|
ciocore/compat.py,sha256=5uEXPSog_jxsDMaHBswAKEtfyXT25VgU6WNGIhz9PHU,256
|
|
@@ -18,22 +18,22 @@ ciocore/package_tree.py,sha256=vkORKXxQ7dO8l0_96eFwm-5AUVL0rP9bhgWYhW_v3lo,15649
|
|
|
18
18
|
ciocore/post_install.py,sha256=zu5Ctz2ANbKD-f5G2ODLIhKkWENBi4F3UKKu50OEWrg,1000
|
|
19
19
|
ciocore/retry.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
20
20
|
ciocore/validator.py,sha256=f_K7gxz122W_i5AxVx6dKhckOygl8TnmQiVj7tyX5zw,2344
|
|
21
|
-
ciocore/worker.py,sha256=
|
|
21
|
+
ciocore/worker.py,sha256=YnE0mGqkky9uxPMyDRmvdt1p1ER_GN39AeZPIGw6f4U,21832
|
|
22
22
|
ciocore/auth/__init__.py,sha256=cdS-xZzMq41yXM5cz8sUlcYgo8CJYh8HcCCWmhbDgf0,606
|
|
23
23
|
ciocore/auth/server.py,sha256=8btX9-EokUl6q55V8muDmEV2tvvbTBD0BHeWFbwkzUc,3892
|
|
24
|
-
ciocore/docsite/404.html,sha256=
|
|
25
|
-
ciocore/docsite/index.html,sha256=
|
|
24
|
+
ciocore/docsite/404.html,sha256=zUCnDe9r5yFZh8MXcTmzDaFyYBuRHz1gvuyJS2rYiTI,17207
|
|
25
|
+
ciocore/docsite/index.html,sha256=xz215H_KHWBYI1HT7IRpAZ4d1ptUiO8Y4DlOmbEPgPk,20945
|
|
26
26
|
ciocore/docsite/logo.png,sha256=gArgFFWdw8w985-0TkuGIgU_pW9sziEMZdqytXb5WLo,2825
|
|
27
27
|
ciocore/docsite/objects.inv,sha256=s2FKStLlVIQbfG7U2-nw-7rz4unvd1W0u00YtLBxAKo,758
|
|
28
28
|
ciocore/docsite/sitemap.xml,sha256=M_V85zl0y2adRvzJAnoCxlZH_Hl7TLnIb1A-6l_xGmI,109
|
|
29
|
-
ciocore/docsite/sitemap.xml.gz,sha256=
|
|
30
|
-
ciocore/docsite/apidoc/api_client/index.html,sha256=
|
|
31
|
-
ciocore/docsite/apidoc/apidoc/index.html,sha256=
|
|
32
|
-
ciocore/docsite/apidoc/config/index.html,sha256=
|
|
33
|
-
ciocore/docsite/apidoc/data/index.html,sha256=
|
|
34
|
-
ciocore/docsite/apidoc/hardware_set/index.html,sha256=
|
|
35
|
-
ciocore/docsite/apidoc/package_environment/index.html,sha256=
|
|
36
|
-
ciocore/docsite/apidoc/package_tree/index.html,sha256=
|
|
29
|
+
ciocore/docsite/sitemap.xml.gz,sha256=mBXMN84utPFOOhXBKJnq47kV3Zp6NvUz5Xxy7lDOxq8,127
|
|
30
|
+
ciocore/docsite/apidoc/api_client/index.html,sha256=0AdyUY-LmL5ZqUeqxIjjzmoZDbupNcImCWf7RFeO5-o,170218
|
|
31
|
+
ciocore/docsite/apidoc/apidoc/index.html,sha256=KGsHBY6GBF380w338GfOIMWnwAyyLvw2i1RQFORdwlE,26171
|
|
32
|
+
ciocore/docsite/apidoc/config/index.html,sha256=n3koKPRUza5-uHUt8hK8H8XyH6HG_U2CsGobdaN4KfY,72559
|
|
33
|
+
ciocore/docsite/apidoc/data/index.html,sha256=QhqiXUd_3qk_jGRYB5JiqlJTem8Jg7aKa5mPPDT1978,50850
|
|
34
|
+
ciocore/docsite/apidoc/hardware_set/index.html,sha256=4GEBYy5uLVlJqvdG71RdyrN7sKKuxszxipgmRi_NCbM,123042
|
|
35
|
+
ciocore/docsite/apidoc/package_environment/index.html,sha256=1d4hVlBXPy4bldkBH1GsRjVd-bxdYANmB-Mg7xIAC_4,69248
|
|
36
|
+
ciocore/docsite/apidoc/package_tree/index.html,sha256=7GaOHXeM_oKH8Db25f2-h5kUI1R6pcp0bXxW1COCJxs,109393
|
|
37
37
|
ciocore/docsite/assets/_mkdocstrings.css,sha256=K3bqYEmxlOHQ3-M11JNbBWHCBDBLarkFRm8HuEYrAG4,341
|
|
38
38
|
ciocore/docsite/assets/images/favicon.png,sha256=AjhUxD_Eslt5XuSVHIAZ494Fk__rb5GLXR8qm0elfP4,1870
|
|
39
39
|
ciocore/docsite/assets/javascripts/bundle.4e31edb1.min.js,sha256=vMxCR_BtNIcbmbPV6j8Z-YDLQ9ckt4RzvGuzCTg034s,97250
|
|
@@ -76,11 +76,11 @@ ciocore/docsite/assets/stylesheets/main.83068744.min.css,sha256=gwaHRErdgDoSsYab
|
|
|
76
76
|
ciocore/docsite/assets/stylesheets/main.83068744.min.css.map,sha256=q8dWQkgGSfCcYT2Le1J0Tmxpcqxol5kZKaokp9d8Af0,42278
|
|
77
77
|
ciocore/docsite/assets/stylesheets/palette.ecc896b0.min.css,sha256=7MiWsGpIt19TLduugHr1OQv1TJ9rEsndnkc2V8D9VjM,12245
|
|
78
78
|
ciocore/docsite/assets/stylesheets/palette.ecc896b0.min.css.map,sha256=T8ZT8Mw8ws4vxyx_b1QAwyC9_pnv7r0KVaUdu2ST7ug,3639
|
|
79
|
-
ciocore/docsite/cmdline/docs/index.html,sha256=
|
|
80
|
-
ciocore/docsite/cmdline/downloader/index.html,sha256=
|
|
81
|
-
ciocore/docsite/cmdline/packages/index.html,sha256=
|
|
82
|
-
ciocore/docsite/cmdline/uploader/index.html,sha256=
|
|
83
|
-
ciocore/docsite/how-to-guides/index.html,sha256=
|
|
79
|
+
ciocore/docsite/cmdline/docs/index.html,sha256=Vte3vd2TtRY34Ft6cKvUREeQrWEI9jgdTkQ0XzjZuss,20051
|
|
80
|
+
ciocore/docsite/cmdline/downloader/index.html,sha256=917XE3waukGnIXI9qxl0zYEf3vHVIQPdY3ZybmABAqc,23171
|
|
81
|
+
ciocore/docsite/cmdline/packages/index.html,sha256=Ssb2R7eSubBNR824oc3jjhJfrG3JKOPojA-uiAczgeQ,20923
|
|
82
|
+
ciocore/docsite/cmdline/uploader/index.html,sha256=TtLbHNlu4ofZ4bQBqam87RelWdHnVDSL7_rw_YqBbC8,25123
|
|
83
|
+
ciocore/docsite/how-to-guides/index.html,sha256=rF-DMyk4k_jGUJRF3dKtMMiOgXS8OvBqAn-zxWy3AGs,20100
|
|
84
84
|
ciocore/docsite/search/search_index.json,sha256=ZMAbHLAlwOTujgA32XJTA7SHogRYh9i-ioPFOxjjJ0s,182633
|
|
85
85
|
ciocore/docsite/stylesheets/extra.css,sha256=_Cxe9Dhg1BBi6Kqaz_iZD9z9VyqxA9vtONRjP4PVic0,354
|
|
86
86
|
ciocore/docsite/stylesheets/tables.css,sha256=LE_zwGRxGcdPIy-9QiVPecOzlEBSqZb_WP5vDkFE0ZM,3235
|
|
@@ -95,7 +95,7 @@ ciocore/downloader/perpetual_downloader.py,sha256=cD7lnBH75-c-ZVVPHZc1vSnDhgJOnG
|
|
|
95
95
|
ciocore/downloader/registry.py,sha256=_JIOuqpWkJkgJGN33nt-DCvqN9Gw3xeFhzPq4RUxIoE,2903
|
|
96
96
|
ciocore/downloader/reporter.py,sha256=p1NK9k6iQ-jt7lRvZR0xFz0cGb2yo8tQcjlvYKR9SWM,4501
|
|
97
97
|
ciocore/uploader/__init__.py,sha256=hxRFJf5Lo86rtRObFXSjjot8nybQd-SebSfYCbgZwow,24
|
|
98
|
-
ciocore/uploader/_uploader.py,sha256=
|
|
98
|
+
ciocore/uploader/_uploader.py,sha256=40nzqO5DuFi4sx31VvjWxZPNkrWsWqM9jtFVxs_-o3o,37479
|
|
99
99
|
ciocore/uploader/upload_stats/__init__.py,sha256=Lg1y4zq1i0cwc6Hh2K1TAQDYymLff49W-uIo1xjcvdI,5309
|
|
100
100
|
ciocore/uploader/upload_stats/stats_formats.py,sha256=giNirtObU66VALWghPFSRhg3q_vw5MvESsnXhb_I3y8,2402
|
|
101
101
|
tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
@@ -105,7 +105,7 @@ tests/package_fixtures.py,sha256=CsJnhB7oYzIxJH7b1tCOPyvnnVSCqEbSPhtCnsHL-nA,507
|
|
|
105
105
|
tests/project_fixtures.py,sha256=iBm_th_JtAw76vlNu7Jjhh9tLH4oOaNi-MgtPzCV7yQ,138
|
|
106
106
|
tests/test_api_client.py,sha256=tnYkIYvDILGJRatZM0nrtr83x8yBJstMP0Rt151U2gI,6757
|
|
107
107
|
tests/test_base_downloader.py,sha256=SS7tWKv2ZZhpUDk4UCg1TkrNrpntjSewgzLl1mEubSE,3603
|
|
108
|
-
tests/test_cli.py,sha256=
|
|
108
|
+
tests/test_cli.py,sha256=_WTs2SWlEgd6wtg1hmOBlFnbWVdFLvqp0KqNhy-y2e8,5532
|
|
109
109
|
tests/test_common.py,sha256=tY_-SY-JmJX09UehFs9RIDqZ785AmhfTl6eVKJeIUFY,763
|
|
110
110
|
tests/test_config.py,sha256=-_G682Ss3Zr1FmcMkjla1zAZprX2tQKpKc5_wD28rII,13340
|
|
111
111
|
tests/test_data.py,sha256=NIBXpCjG3Os3vpc1CkiVONrebro8D_jqQyJ0N3kbucU,5433
|
|
@@ -120,8 +120,8 @@ tests/test_uploader.py,sha256=B1llTJt_fqR6e_V_Jxfw9z73QgkFlEPU87xLYGzt-TQ,2914
|
|
|
120
120
|
tests/test_validator.py,sha256=2fY66ayNc08PGyj2vTI-V_1yeCWJDngkj2zkUM5TTCI,1526
|
|
121
121
|
tests/mocks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
122
122
|
tests/mocks/glob.py,sha256=J2MH7nqi6NJOHuGdVWxhfeBd700_Ckj6cLh_8jSNkfg,215
|
|
123
|
-
ciocore-8.0.
|
|
124
|
-
ciocore-8.0.
|
|
125
|
-
ciocore-8.0.
|
|
126
|
-
ciocore-8.0.
|
|
127
|
-
ciocore-8.0.
|
|
123
|
+
ciocore-8.0.1.dist-info/METADATA,sha256=798KBccoox0YMHAcd09zV7pIzVkXN_GNoBWhckmK4D4,18440
|
|
124
|
+
ciocore-8.0.1.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
|
|
125
|
+
ciocore-8.0.1.dist-info/entry_points.txt,sha256=cCqcALMYbC4d8545V9w0Zysfg9MVuKWhzDQ2er4UfGE,47
|
|
126
|
+
ciocore-8.0.1.dist-info/top_level.txt,sha256=SvlM5JlqULzAz00JZWfiUhfjhqDzYzSWssA87zdJl0o,14
|
|
127
|
+
ciocore-8.0.1.dist-info/RECORD,,
|
tests/test_cli.py
CHANGED
|
@@ -13,8 +13,6 @@ class CliTestUploaderOptions(unittest.TestCase):
|
|
|
13
13
|
"database_filepath": None,
|
|
14
14
|
"location": None,
|
|
15
15
|
"md5_caching": True,
|
|
16
|
-
"log_level": "INFO",
|
|
17
|
-
"log_dir": None,
|
|
18
16
|
"thread_count": mock.ANY,
|
|
19
17
|
}
|
|
20
18
|
init_patcher = mock.patch("ciocore.cli.Uploader.__init__", autospec=True)
|
|
@@ -43,18 +41,6 @@ class CliTestUploaderOptions(unittest.TestCase):
|
|
|
43
41
|
expected.update({"md5_caching": False})
|
|
44
42
|
self.mock_init.assert_called_once_with(mock.ANY, expected)
|
|
45
43
|
|
|
46
|
-
def test_log_level_arg(self):
|
|
47
|
-
self.runner.invoke(cli_upload, ["--log_level", "DEBUG"])
|
|
48
|
-
expected = self.default_args
|
|
49
|
-
expected.update({"log_level": "DEBUG"})
|
|
50
|
-
self.mock_init.assert_called_once_with(mock.ANY, expected)
|
|
51
|
-
|
|
52
|
-
def test_log_dir_arg(self):
|
|
53
|
-
self.runner.invoke(cli_upload, ["--log_dir", "foo"])
|
|
54
|
-
expected = self.default_args
|
|
55
|
-
expected.update({"log_dir": "foo"})
|
|
56
|
-
self.mock_init.assert_called_once_with(mock.ANY, expected)
|
|
57
|
-
|
|
58
44
|
def test_thread_count_arg(self):
|
|
59
45
|
self.runner.invoke(cli_upload, ["--thread_count", 4])
|
|
60
46
|
expected = self.default_args
|
|
File without changes
|
|
File without changes
|
|
File without changes
|