ciocore 9.0.0b2__py2.py3-none-any.whl → 9.1.0b1__py2.py3-none-any.whl

ciocore/package_tree.py

@@ -290,6 +290,10 @@ class PackageTree(object):
     def __bool__(self):
         return True if self._tree["children"] else False
 
+    def __nonzero__(self):
+        # Python 2.7
+        return self.__bool__()
+
     def as_dict(self):
         """
         Returns:

ciocore/uploader/_uploader.py

@@ -2,6 +2,7 @@ import datetime
 import json
 import logging
 import os
+import pathlib
 import requests.exceptions
 import sys
 import time
@@ -760,6 +761,31 @@ class Uploader(object):
         file_map = {path: None for path in processed_filepaths}
         self.handle_upload_response(project=None, upload_files=file_map)
 
+        if common.SIGINT_EXIT or self.cancel:
+            print("\nUpload cancelled\n")
+
+        else:
+            print("\nUpload of {} file completed\n".format(len(file_map)))
+
+        error_messages = []
+
+        for exception in self.error_messages:
+            error_messages.append(str(exception[1]))
+            print("".join(traceback.format_tb(exception[2])))
+            logger.error("".join(traceback.format_tb(exception[2])))
+
+        if error_messages:
+
+            log_file = loggeria.LOG_PATH
+            sys.stderr.write("\nError uploading files:\n")
+
+            for err_msg in error_messages:
+                sys.stderr.write("\t{}\n".format(err_msg))
+
+            sys.stderr.write("\nSee log {} for more details\n\n".format(log_file))
+
+        self.error_messages = []        
+
     def handle_upload_response(self, project, upload_files, upload_id=None):
         """
         This is a really confusing method and should probably be split into to clear logic
@@ -818,8 +844,7 @@ class Uploader(object):
                 time.sleep(5)
 
             # Shutdown the manager once all jobs are done
-            if not self.cancel and not self.manager.error:
-                logger.debug("Waiting for Manager to join")
+            if not (self.cancel or self.manager.error or common.SIGINT_EXIT):
                 self.manager.join()
 
             upload_stats = UploadStats.create(

ciocore/uploader/thread_queue_job.py

@@ -0,0 +1,101 @@
+import logging
+from ciocore import loggeria
+
+logger = logging.getLogger("{}.uploader".format(loggeria.CONDUCTOR_LOGGER_NAME))
+
+class ThreadQueueJob():
+    pass
+
+class UploadThreadQueueJob(ThreadQueueJob):
+    
+    def __init__(self, path, file_size, presigned_url, file_md5=None, upload_id=None, part_size=None, total_parts=1, part_index=1, kms_key_name=None):
+
+        super().__init__()
+
+        self.path = path
+        self.file_size = file_size 
+        self.upload_id = upload_id
+        self.presigned_url = presigned_url
+        self.file_md5 = file_md5
+        self.part_size = part_size
+        self.part_index = part_index
+        self.total_parts = total_parts
+        self.kms_key_name = kms_key_name
+
+        logger.info("Creating %s (%s): %s", str(self.__class__), str(self), str(self.__dict__))
+
+    def is_multipart(self):
+        return self.total_parts != 1
+
+    def is_vendor_aws(self):
+        return "amazonaws" in self.presigned_url
+    
+    def is_vendor_cw(self):
+        return "coreweave" in self.presigned_url    
+
+    @classmethod
+    def create_from_response(cls, response):
+
+        new_thread_queue_jobs = []
+
+        for part_type, file_request_list in response.items():
+
+            for file_request in file_request_list:
+                if part_type == "multiPartURLs":
+                        
+                        for part in file_request["parts"]:
+                            new_tqj = cls( path=file_request['filePath'],
+                                           file_size = file_request['filePath'],
+                                           presigned_url = file_request['preSignedURL'],
+                                           file_md5  = file_request['preSignedURL'],
+                                           upload_id = file_request['preSignedURL'],
+                                           part_size = file_request['preSignedURL'],
+                                           part_index = file_request['preSignedURL'])
+                            
+
+                else:
+                    new_tqj = cls( path=file_request['filePath'],
+                                   file_size = file_request['filePath'],
+                                   presigned_url = file_request['preSignedURL'])
+                    
+        new_thread_queue_jobs.append(new_tqj)
+
+
+
+class MultiPartThreadQueueJob(ThreadQueueJob):
+    
+    def __init__(self, path, md5, total_parts=1, part_index=1):
+
+        super().__init__()
+
+        self.upload_id = None
+        self.md5 = md5
+        self.project = None
+        self.path = path
+        self.part_index = part_index
+        self.etag = None
+        self.total_parts = total_parts
+
+        logger.info("Creating %s (%s): %s", str(self.__class__), str(self), str(self.__dict__))
+
+    def is_multipart(self):
+        return self.total_parts != 1
+    
+    # def __str__(self):
+    #     return
+
+    @staticmethod
+    def aggregate_parts(parts):
+        """
+        Helper function to take all the parts of a multipart upload and put 
+        them into a format that's expected for the HTTP call.
+        """
+
+        completed_parts_payload = []
+        
+        for part in parts:
+            completed_parts_payload.append({'partNumber': part.part,
+                                                       'etag': part.etag}
+                                                      )
+            
+        return completed_parts_payload

ciocore/worker.py

@@ -621,7 +621,11 @@ class JobManager():
             q_size = self.work_queues[index].qsize()
             worker_threads = self.workers[index].threads
 
-            num_active_threads = len([thd for thd in worker_threads if thd.is_alive()])
+            # thread.isAlive() was renamed to is_alive() in Python 3.9 
+            try:
+                num_active_threads = len([thd for thd in worker_threads if thd.isAlive()])
+            except AttributeError:
+                num_active_threads = len([thd for thd in worker_threads if thd.is_alive()])
 
             msg += '%s \titems in queue: %s' % (q_size, worker_class.__name__)
             msg += '\t\t%s threads' % num_active_threads

{ciocore-9.0.0b2.dist-info → ciocore-9.1.0b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ciocore
-Version: 9.0.0b2
+Version: 9.1.0b1
 Summary: Core functionality for Conductor's client tools
 Home-page: https://github.com/ConductorTechnologies/ciocore
 Author: conductor
@@ -9,8 +9,9 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Topic :: Multimedia :: Graphics :: 3D Rendering
 Description-Content-Type: text/markdown
-Requires-Dist: requests>=2.31.0
-Requires-Dist: pyjwt==2.9.0
+Requires-Dist: requests[use_chardet_on_py3]==2.28.1
+Requires-Dist: pyjwt==1.7.1
+Requires-Dist: future>=0.18.2
 Requires-Dist: cioseq<1.0.0,>=0.4.1
 Requires-Dist: Click<9.0.0,>=8.1.3
 Requires-Dist: markdown<4.0.0,>=3.5.2
@@ -51,10 +52,10 @@ See [CONTRIBUTING](CONTRIBUTING.md)
 ## Changelog
 
 ## Unreleased: 
+* Adds required changes to parallelize multi-part uploads
+* Cleans up the output when explicit paths are uploaded
+* Fixes logic so managers doesn't erroneously try and call join a second time if cancelled
 
-* 9.0.0-beta.1
-  * Use the new required jwt parameters
-  * Removing py2.7 compatibility
 
 ## Version:8.3.2 -- 01 Oct 2024
 

{ciocore-9.0.0b2.dist-info → ciocore-9.1.0b1.dist-info}/RECORD

@@ -1,9 +1,10 @@
-ciocore/VERSION,sha256=e7b7GJz44Hd6emuQcgfrIGtfwzF3N98xAT6OKsX1sRE,12
+ciocore/VERSION,sha256=TCUlj36m9-VV6atKK8EETx-2I8BQY_6CSKTVDGTHeqo,12
 ciocore/__init__.py,sha256=aTP7LeeosQA8BZE67gDV4jgfTK5zxmwZRjiTRu_ZWj0,646
-ciocore/api_client.py,sha256=XuTON9guZ8a4DMJlU2U2O3RHkimriXG20NJMNi-LGCY,32902
+ciocore/api_client.py,sha256=SBxEwAiwn2XtH7T_ipefUbWhczXjoNdNbQBur1RV-Bw,32810
 ciocore/cli.py,sha256=jZ1lOKQiUcrMhsVmD9SVmPMFwHtgDF4SaoAf2-PBS54,15449
 ciocore/client_db.py,sha256=tTz3bl2xeDPPcYSDS3g3QgV_xYihJMx0Kj6OeN2klK0,12978
 ciocore/common.py,sha256=mBIS6KiYoQsjWe6aIFUGRRvCMl8BIN2kmLZ4J8icap8,14982
+ciocore/compat.py,sha256=5uEXPSog_jxsDMaHBswAKEtfyXT25VgU6WNGIhz9PHU,256
 ciocore/conductor_submit.py,sha256=bxvzdyNzscAOOOsqTvAYh5DQsTWyCQJNb16Mf-n_F0M,9702
 ciocore/config.py,sha256=rCL7kaFn1tYgSglN8q9Wx6SwMpoXTq0BMQGwPRVwVIg,8973
 ciocore/data.py,sha256=Ji0qUk8nJXBNakoHSqBiVx8O58SbZXyt273SHlEDn3U,7027
@@ -13,11 +14,11 @@ ciocore/hardware_set.py,sha256=FlRQiGCLRcSW7Oko_gzgVK8ZqJ_J92eT8e_AleAbS2E,17047
 ciocore/loggeria.py,sha256=dk8n899TYFiMTD2gjjj8oiumJkPtCus0a_IY2GORAvU,15251
 ciocore/package_environment.py,sha256=MEHV7jfs3NJIEYCIaW8JfJdBmelvPHZMmBzPlXETiRo,7808
 ciocore/package_query.py,sha256=hWi_JmRieZ8f2Ji5JR7tQnHnm29Ktb88scbIXNsDu-8,6181
-ciocore/package_tree.py,sha256=FDKHxYZS8ZAkz3hpjMYFy-P8hwU1V9w4wA7gNqhruqs,15569
+ciocore/package_tree.py,sha256=vkORKXxQ7dO8l0_96eFwm-5AUVL0rP9bhgWYhW_v3lo,15649
 ciocore/post_install.py,sha256=zu5Ctz2ANbKD-f5G2ODLIhKkWENBi4F3UKKu50OEWrg,1000
 ciocore/retry.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ciocore/validator.py,sha256=f_K7gxz122W_i5AxVx6dKhckOygl8TnmQiVj7tyX5zw,2344
-ciocore/worker.py,sha256=3C4KJuBTdeqvMWdBn3cRnTju5dUjNKG0OGtHp0SZ4l8,21613
+ciocore/worker.py,sha256=YnE0mGqkky9uxPMyDRmvdt1p1ER_GN39AeZPIGw6f4U,21832
 ciocore/auth/__init__.py,sha256=cdS-xZzMq41yXM5cz8sUlcYgo8CJYh8HcCCWmhbDgf0,606
 ciocore/auth/server.py,sha256=8btX9-EokUl6q55V8muDmEV2tvvbTBD0BHeWFbwkzUc,3892
 ciocore/docsite/404.html,sha256=xP-mZwn-87pnlkD-paIYzdXDLQr7DS551KflVdFfrCk,17207
@@ -25,14 +26,14 @@ ciocore/docsite/index.html,sha256=NEK4HaX2yaetTajVtQuTmS9C5cPnkAtxgeKEj7wQ9t0,20
 ciocore/docsite/logo.png,sha256=gArgFFWdw8w985-0TkuGIgU_pW9sziEMZdqytXb5WLo,2825
 ciocore/docsite/objects.inv,sha256=XwmLactPEWWC4fAWqHNPBXGsluRxLLTrwDLQqq51ONY,775
 ciocore/docsite/sitemap.xml,sha256=M_V85zl0y2adRvzJAnoCxlZH_Hl7TLnIb1A-6l_xGmI,109
-ciocore/docsite/sitemap.xml.gz,sha256=kwrVA-e-YnpIkhePqDzoqyW7P-aZd0a6d9_dx9Mdv08,127
-ciocore/docsite/apidoc/api_client/index.html,sha256=_aLYBFhVNk2VtDAoC7vTeKisdh2BVN39VnVvlk4SlAk,188875
+ciocore/docsite/sitemap.xml.gz,sha256=mThGdpcFPBqhVOOM7T3lZOZMuSVSoDrSjqxs4psAmeY,127
+ciocore/docsite/apidoc/api_client/index.html,sha256=TvoSl4iqdXhBVfesDxe_sBPA6G-Jt1-gpWA40xXspa0,188372
 ciocore/docsite/apidoc/apidoc/index.html,sha256=GOSvv6KZPOtgekgshRE4j7aDvJkkaiBQLwA_By9J94g,26171
 ciocore/docsite/apidoc/config/index.html,sha256=WDqy4MLR3EMp9T_2-Z9Op61rTFkvb0aTWmtjiR8sbjA,72559
 ciocore/docsite/apidoc/data/index.html,sha256=vjC5u7wcm2ryOW28GctA9ZG6dXgBTkMJLLomJ9Kqxo0,50850
 ciocore/docsite/apidoc/hardware_set/index.html,sha256=SpYg-lwuCvfLPbNIIM7aQL2jGt-NA5wlVMlIKixGwBo,123042
 ciocore/docsite/apidoc/package_environment/index.html,sha256=V6_ah3V1_4_aOwJbEcITCdwuHxe1vGtfn0maRrbflUs,69248
-ciocore/docsite/apidoc/package_tree/index.html,sha256=5_4vV8x_GmpsyWHnMP62gBaAcdzfM7L-mP7uQKh_DH4,109054
+ciocore/docsite/apidoc/package_tree/index.html,sha256=60Ir6X1Q9k17bQCqozXzuMAcSVuu6DuC5zGfBk4LLnw,109393
 ciocore/docsite/assets/_mkdocstrings.css,sha256=K3bqYEmxlOHQ3-M11JNbBWHCBDBLarkFRm8HuEYrAG4,341
 ciocore/docsite/assets/images/favicon.png,sha256=AjhUxD_Eslt5XuSVHIAZ494Fk__rb5GLXR8qm0elfP4,1870
 ciocore/docsite/assets/javascripts/bundle.4e31edb1.min.js,sha256=vMxCR_BtNIcbmbPV6j8Z-YDLQ9ckt4RzvGuzCTg034s,97250
@@ -80,7 +81,7 @@ ciocore/docsite/cmdline/downloader/index.html,sha256=nygj-0GQmpD79B5AxHjwzQxOFv8
 ciocore/docsite/cmdline/packages/index.html,sha256=_kXB85PBAgrqW09OerYpxnJuyERHMbcLn6qBGRdyHwk,20923
 ciocore/docsite/cmdline/uploader/index.html,sha256=vuQ06Gys9Eoxs87PXlqnM5AgB6Ag00BlDIy6oaprjis,25123
 ciocore/docsite/how-to-guides/index.html,sha256=KifCHl2S3RfPBZhP1UXwUNWuhcXPlPPqM4Gk6rVGhjQ,20100
-ciocore/docsite/search/search_index.json,sha256=_jxoQQikc4cA_9YiODWM6TBSyWdgReOMtlZpSbB1fi0,189108
+ciocore/docsite/search/search_index.json,sha256=vBLU-rkC0pxOPX0O3MNKXRKGfgsaS1-91KsV17Gf9SY,189092
 ciocore/docsite/stylesheets/extra.css,sha256=_Cxe9Dhg1BBi6Kqaz_iZD9z9VyqxA9vtONRjP4PVic0,354
 ciocore/docsite/stylesheets/tables.css,sha256=LE_zwGRxGcdPIy-9QiVPecOzlEBSqZb_WP5vDkFE0ZM,3235
 ciocore/downloader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -94,7 +95,8 @@ ciocore/downloader/perpetual_downloader.py,sha256=cD7lnBH75-c-ZVVPHZc1vSnDhgJOnG
 ciocore/downloader/registry.py,sha256=_JIOuqpWkJkgJGN33nt-DCvqN9Gw3xeFhzPq4RUxIoE,2903
 ciocore/downloader/reporter.py,sha256=p1NK9k6iQ-jt7lRvZR0xFz0cGb2yo8tQcjlvYKR9SWM,4501
 ciocore/uploader/__init__.py,sha256=hxRFJf5Lo86rtRObFXSjjot8nybQd-SebSfYCbgZwow,24
-ciocore/uploader/_uploader.py,sha256=40nzqO5DuFi4sx31VvjWxZPNkrWsWqM9jtFVxs_-o3o,37479
+ciocore/uploader/_uploader.py,sha256=Xz1sos76FK-BKsgPuErlKQ8HsCAtBKp3pLbCtRVrr9E,38250
+ciocore/uploader/thread_queue_job.py,sha256=MzOcetttfWtDfwy-M0_ARwUf8_OjaGjyy-dA_WgNTPE,3416
 ciocore/uploader/upload_stats/__init__.py,sha256=Lg1y4zq1i0cwc6Hh2K1TAQDYymLff49W-uIo1xjcvdI,5309
 ciocore/uploader/upload_stats/stats_formats.py,sha256=giNirtObU66VALWghPFSRhg3q_vw5MvESsnXhb_I3y8,2402
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -102,12 +104,12 @@ tests/extra_env_fixtures.py,sha256=8qvU4d8SXGKzRVNR5whVqKCQOwOVMiFVfbKBAjxa2gE,1
 tests/instance_type_fixtures.py,sha256=uIzQduqKQVgjllMuyXaYnRC-pwqk5lnTx3NY2M5Nujo,4320
 tests/package_fixtures.py,sha256=od7ZHofG8ubpQ3PqlUsrcHBcbmD3qVWih9eiIg1WtSQ,5361
 tests/project_fixtures.py,sha256=iBm_th_JtAw76vlNu7Jjhh9tLH4oOaNi-MgtPzCV7yQ,138
-tests/test_api_client.py,sha256=isntMDs3QTyTWdghBa_LbFAiC7ydZD1RWb655oEZo24,14452
+tests/test_api_client.py,sha256=4jhj-YrBPcLj7XZn3ngguau2DPxpCYGMSuqPJ3hW0GQ,14497
 tests/test_base_downloader.py,sha256=SS7tWKv2ZZhpUDk4UCg1TkrNrpntjSewgzLl1mEubSE,3603
 tests/test_cli.py,sha256=_WTs2SWlEgd6wtg1hmOBlFnbWVdFLvqp0KqNhy-y2e8,5532
-tests/test_common.py,sha256=5N9xeeGVuwN4kcjIg30eBliUD8PePzCNNLuLipGuTgk,410
-tests/test_config.py,sha256=iiMPwoVA9C3vvGGR6_gKKMbYkSxheNLdljeOA-iPrJU,13295
-tests/test_data.py,sha256=u9XS4xOXugKNwuHBuQl3TxjZi7zybs6X9yq40r6XbzY,5388
+tests/test_common.py,sha256=tY_-SY-JmJX09UehFs9RIDqZ785AmhfTl6eVKJeIUFY,763
+tests/test_config.py,sha256=-_G682Ss3Zr1FmcMkjla1zAZprX2tQKpKc5_wD28rII,13340
+tests/test_data.py,sha256=NIBXpCjG3Os3vpc1CkiVONrebro8D_jqQyJ0N3kbucU,5433
 tests/test_downloader.py,sha256=hceljsjnuvk5Vk5X4mHgavIEcpbv8ylPwpz7rTwJ-aE,4721
 tests/test_hardware_set.py,sha256=hW7A_suyYdU7WkB7qoHSBPLxaAP2CKqI0i_ULfO5GeY,4408
 tests/test_imports_2and3.py,sha256=ehqpRYPVY7djBcb8OT_cnh86iCJJ9wuMWnfSR9RHxmY,507
@@ -115,13 +117,13 @@ tests/test_job_downloader.py,sha256=_dZqyLZhc2Bq2n7-skERfodHx1JgFyHw8TamHp6ID9I,
 tests/test_package_environment.py,sha256=CdiC2PDVSnbcwTb4fsDTWqGYSzs1n5ca2KMoyISckGA,5893
 tests/test_package_query.py,sha256=LZqvCrGkWs0lMtIMumjDatX0ypeYYvabh_k1R0A6sS0,1451
 tests/test_package_tree.py,sha256=K2kzJwRHCr6ojc4MZHjdH7VtmvG5O97OoH6vzwAE9GQ,6780
-tests/test_submit.py,sha256=v75ciL-C0XjiO7wUFQvYBZj0UoqhYOmTLa8TiUyhKqw,5769
-tests/test_uploader.py,sha256=JGp6GEyqRXRtbQSb-IW-cCX_BzNotWdCbnJnLwZvpUM,2869
+tests/test_submit.py,sha256=ppijBcpLXeHUZh7UXyClxLalSV6cTfKb6Ygw5zXQPKo,5836
+tests/test_uploader.py,sha256=B1llTJt_fqR6e_V_Jxfw9z73QgkFlEPU87xLYGzt-TQ,2914
 tests/test_validator.py,sha256=2fY66ayNc08PGyj2vTI-V_1yeCWJDngkj2zkUM5TTCI,1526
 tests/mocks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/mocks/glob.py,sha256=J2MH7nqi6NJOHuGdVWxhfeBd700_Ckj6cLh_8jSNkfg,215
-ciocore-9.0.0b2.dist-info/METADATA,sha256=7bbe60ozciKLWntbeZqWmTh_jtrOAPpmoiLN4s-p6Io,18918
-ciocore-9.0.0b2.dist-info/WHEEL,sha256=qUzzGenXXuJTzyjFah76kDVqDvnk-YDzY00svnrl84w,109
-ciocore-9.0.0b2.dist-info/entry_points.txt,sha256=cCqcALMYbC4d8545V9w0Zysfg9MVuKWhzDQ2er4UfGE,47
-ciocore-9.0.0b2.dist-info/top_level.txt,sha256=SvlM5JlqULzAz00JZWfiUhfjhqDzYzSWssA87zdJl0o,14
-ciocore-9.0.0b2.dist-info/RECORD,,
+ciocore-9.1.0b1.dist-info/METADATA,sha256=jd_61cbX9eiHy2SgX19hXCdf-gqvcvaOJP_gOwZVG-M,19085
+ciocore-9.1.0b1.dist-info/WHEEL,sha256=qUzzGenXXuJTzyjFah76kDVqDvnk-YDzY00svnrl84w,109
+ciocore-9.1.0b1.dist-info/entry_points.txt,sha256=cCqcALMYbC4d8545V9w0Zysfg9MVuKWhzDQ2er4UfGE,47
+ciocore-9.1.0b1.dist-info/top_level.txt,sha256=SvlM5JlqULzAz00JZWfiUhfjhqDzYzSWssA87zdJl0o,14
+ciocore-9.1.0b1.dist-info/RECORD,,

tests/test_api_client.py

@@ -7,7 +7,10 @@ import json
 import sys
 import unittest
 
-from unittest import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 from ciocore import api_client
 

tests/test_common.py

@@ -9,7 +9,17 @@ FILES_PATH = os.path.join(os.path.dirname(__file__), "files")
 
 
 class TestMd5(unittest.TestCase):
-  
+ 
+    # def test_get_base64_md5_is_correct_md5(self):
+    #     from ciocore import common
+    #     fn1 = os.path.join(FILES_PATH, "one")
+    #     md5=common.get_base64_md5(fn1)
+    #     if os.name == "nt":
+    #         self.assertEqual(md5, "w8F8opHbdwHIozghPc63XA==")
+    #     else:
+    #         self.assertEqual(md5, "9iVbsBxkj+lncU1SqJ6OnA==")
+
+
     def test_get_base64_md5_is_correct_type(self):
         from ciocore import common
         from builtins import str

tests/test_config.py

@@ -6,7 +6,10 @@ import sys
 import os
 import logging
 
-from unittest import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 APIKEY = '{"auth_provider_x509_cert_url": "https://www.exampleapis.com/oauth2/v1/certs", "auth_uri": "https://accounts.example.com/o/oauth2/auth", "client_email": "account-5641301770895360@eloquent-vector-104019.iam.gserviceaccount.com", "client_id": "106815243682887997903", "client_x509_cert_url": "https://www.exampleapis.com/robot/v1/metadata/x509/account-5641301770895360%40eloquent-vector-104019.iam.gserviceaccount.com", "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDcadqRWyd7VpYN\n804fEn07qlqNXU0ihz6g2dfbj9gzZDhHGVCI5QvPFskAQcV91k8cDdFu380m+sh1\nz9wlcdaM/lksRV/DRJiV76qrqyrNi0gSekZUuYhSsyMWUGvG4aSbf5BzVf1j8W4I\nUArH+ht5pgdSjowNc4zQIqmMH2XY+Ntr+NysBBfIv1PI6GoHFgDYOTSzsvz0qFYS\nWuonYGTjzNz4CY9Yh5ki8iq0/ijKzpUWeRUkpK9uF7WBoxrj3EyFFHejtfhVX2l0\n2KxrIF0kkmy5nmxVUck76FqdQ6vyvaHudREd3z/08hgdYogemQUTKFE/0LQmKuBV\nIJipPvORAgMBAAECggEAZvPMozN8LBikC00XstzMgRePp1MqydN5NeG6+TPlrQ+F\nV/RjkSXHT8oZRdTy3dXB6t0rc4n2xdvC0YCvGBBlwkK1vT+EPO2oBfTF99yCKDME\nDZlui3mDyvkgjPYweVuBKx65Bp5mNo4ZMqnMd18EAVxDM9UgZtIPtlJSdoBd7qtk\nyCGr03l+SV0krmvPV+KS9vyDOg/7Km5gMhTMaIveNyS1pG6AmZ0ggQA5djg/P2iF\nxGwYdvfADY5cBzg0OG5ELv9hvyA4CKN6RLfYv3JJS2gbNaMknjmsjaM/p0LtE2HL\n+uFPL0ZjoMwV3BlEFQIHwhNWS63H43ISBa1/2XvGPwKBgQDw4a4kQ9+Ce3edWonz\n3Fm/3no+HrMSVjbv28qphAHMFrSUdbMejQm4QSbNeOW1pEcVvW21u8tYagrJEsaU\ns4DulFXRep36teVDWpc1FrNowWEPPVeC8CO74VfssK1h2Itqis8JPbzXOcNtSH9+\nAg1EvrB9XnyEvJuM6GOGo3juTwKBgQDqP058+H3iSZe6al4P6Ib3g/82nr2dHeN5\n4xxGu1fzTMNX5lopbNji6tQcsMoMVPdOvCQy5c0PEUbvo7mxfZ8fOZwgBjIcXbYg\nzIJkPTSv7nxSE5M5lW5juzLkdq2k5k0qt9ByWuWEA3PSn/DEANa5888phSCoJSw/\nPjpwHhZoHwKBgQDCoQbMxI6e5lYCrToT8PIPhpptAO8dnM2sxoGcsE2ncp0b63H7\n+GdnGjVZBhtMxdyt4y33DjLCUIRAbUxIsDU4EGC67oEhJsGEx3iva5Uwyjc7UgwY\nfyHQV8ZsN2EQUyBqyJd6VwjzOff+n/prfQrthcoisiqYMbDZjJeGHSXEHwKBgAo4\nBsmG4Z78jOTx/PZ+s1ya4ohUdnsjMahAkxw20ghoIeF0yBwkhnWnvucdg0L0dfF2\nXbHmuoJcw5ZyswgeLdHj5n6zJn58TBS0Nz/+N40xPzUpa3PIpA8vvHGhB8Q408b4\nS9yhQH/40pWuqocybiugijoKd7k+HecIZO49MccLAoGBAPDScJHSxKPW6wJKjxDC\nXXWWQ2flbwv4Sja487QV/trWMSRnHJHnCVHqv/F7ThPaoHM+MJSzrJ7wr/CJhk0H\noEt+0Rn6qPd/A36bSjTfXMFLXWi75ovek+IJGKxr7B46jrcS/oe1XIIOlV1+OvOY\nVoO6vgYkPhpMkth2hyZ/luea\n-----END PRIVATE KEY-----\n", "private_key_id": "3dfe3bdc40d4dc431d283bf22feb113c9b622dd3", "project_id": "eloquent-vector-104019", "token_uri": "https://oauth2.exampleapis.com/token", "type": "service_account"}'
 

tests/test_data.py

@@ -5,7 +5,10 @@
 
 import unittest
 
-from unittest import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 from ciocore import data
 

tests/test_submit.py

@@ -5,7 +5,10 @@
 
 import unittest
 
-from unittest.mock import MagicMock, patch
+try:
+    from unittest.mock import MagicMock, patch
+except ImportError:
+    from mock import MagicMock, patch
 
 
 def get_required_args():

tests/test_uploader.py

@@ -1,7 +1,10 @@
 import unittest
 import sys
 
-from unittest import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 PY3 = sys.version_info >= (3, 0)
 BUILTIN_OPEN = "builtins.open" if PY3 else "__builtin__.open"