ciocore 9.1.0b2__py2.py3-none-any.whl → 9.1.0rc1__py2.py3-none-any.whl

ciocore/package_tree.py

@@ -290,10 +290,6 @@ 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/worker.py

@@ -621,11 +621,7 @@ class JobManager():
             q_size = self.work_queues[index].qsize()
             worker_threads = self.workers[index].threads
 
-            # 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()])
+            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.1.0b2.dist-info → ciocore-9.1.0rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ciocore
-Version: 9.1.0b2
+Version: 9.1.0rc1
 Summary: Core functionality for Conductor's client tools
 Home-page: https://github.com/ConductorTechnologies/ciocore
 Author: conductor
@@ -9,9 +9,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Topic :: Multimedia :: Graphics :: 3D Rendering
 Description-Content-Type: text/markdown
-Requires-Dist: requests[use_chardet_on_py3]==2.28.1
-Requires-Dist: pyjwt==1.7.1
-Requires-Dist: future>=0.18.2
+Requires-Dist: requests>=2.31.0
+Requires-Dist: pyjwt==2.9.0
 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,12 +50,18 @@ See [CONTRIBUTING](CONTRIBUTING.md)
 
 ## Changelog
 
-## Unreleased: 
+## Version:9.1.0-rc.1 -- 11 Dec 2024
+
 * 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
+* Use the new required jwt parameters
+* Removing py2.7 compatibility
 
+## Version:8.3.3 -- 04 Dec 2024
 
+* Adds filter option for API data query
+ 
 ## Version:8.3.2 -- 01 Oct 2024
 
 * Tweak to package order behavior for markdown package query

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

@@ -1,24 +1,23 @@
-ciocore/VERSION,sha256=V-Kb1TSOiqU51Ac0b71EzlP2Ib7nl3rdmaEL7bhM4iY,12
+ciocore/VERSION,sha256=ax2aQwModu65ZstFnKm4dTChIjzu_0ljZcaKGDaGkSA,10
 ciocore/__init__.py,sha256=aTP7LeeosQA8BZE67gDV4jgfTK5zxmwZRjiTRu_ZWj0,646
-ciocore/api_client.py,sha256=SBxEwAiwn2XtH7T_ipefUbWhczXjoNdNbQBur1RV-Bw,32810
+ciocore/api_client.py,sha256=KKL7TsYygNcfkFZDPPq1CSJsrVN_QLK4PqP44vXsCQg,33101
 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
+ciocore/data.py,sha256=zT3zpkSbHPHHGlLeLDTbwkB8_-Ct6zd8qQ-7U1pDCHM,7215
 ciocore/exceptions.py,sha256=4Oq-WX-qiN6kPUdBCHvvd6mtSQ0nCkDbJxWt2CNtpv8,1504
 ciocore/file_utils.py,sha256=swA7th9WhDEloW69YViRTKB-oeC9UmNdEGegfH1r-Gw,17176
 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=vkORKXxQ7dO8l0_96eFwm-5AUVL0rP9bhgWYhW_v3lo,15649
+ciocore/package_tree.py,sha256=FDKHxYZS8ZAkz3hpjMYFy-P8hwU1V9w4wA7gNqhruqs,15569
 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=YnE0mGqkky9uxPMyDRmvdt1p1ER_GN39AeZPIGw6f4U,21832
+ciocore/worker.py,sha256=3C4KJuBTdeqvMWdBn3cRnTju5dUjNKG0OGtHp0SZ4l8,21613
 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
@@ -26,14 +25,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=mThGdpcFPBqhVOOM7T3lZOZMuSVSoDrSjqxs4psAmeY,127
-ciocore/docsite/apidoc/api_client/index.html,sha256=TvoSl4iqdXhBVfesDxe_sBPA6G-Jt1-gpWA40xXspa0,188372
+ciocore/docsite/sitemap.xml.gz,sha256=5N9BP1xbOEPkbpLHoqTsfzUJD3N4IJB55-_WR8JLfrc,127
+ciocore/docsite/apidoc/api_client/index.html,sha256=kkhKzA7OThkpASLveONRPNS7gGppf8Ot2rxek1lZxHc,189722
 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/data/index.html,sha256=8ldmfisgelzdWtTqGY8uebvVRcskhbv-reO3hMcIgGI,51627
 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=60Ir6X1Q9k17bQCqozXzuMAcSVuu6DuC5zGfBk4LLnw,109393
+ciocore/docsite/apidoc/package_tree/index.html,sha256=5_4vV8x_GmpsyWHnMP62gBaAcdzfM7L-mP7uQKh_DH4,109054
 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
@@ -81,7 +80,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=vBLU-rkC0pxOPX0O3MNKXRKGfgsaS1-91KsV17Gf9SY,189092
+ciocore/docsite/search/search_index.json,sha256=LP1ck_wuTP9A_dWTyaVF8Fugg22q1O0XS6hGqg2zk0M,189860
 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
@@ -100,16 +99,14 @@ ciocore/uploader/thread_queue_job.py,sha256=MzOcetttfWtDfwy-M0_ARwUf8_OjaGjyy-dA
 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
-tests/extra_env_fixtures.py,sha256=8qvU4d8SXGKzRVNR5whVqKCQOwOVMiFVfbKBAjxa2gE,1119
 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=4jhj-YrBPcLj7XZn3ngguau2DPxpCYGMSuqPJ3hW0GQ,14497
+tests/test_api_client.py,sha256=isntMDs3QTyTWdghBa_LbFAiC7ydZD1RWb655oEZo24,14452
 tests/test_base_downloader.py,sha256=SS7tWKv2ZZhpUDk4UCg1TkrNrpntjSewgzLl1mEubSE,3603
 tests/test_cli.py,sha256=_WTs2SWlEgd6wtg1hmOBlFnbWVdFLvqp0KqNhy-y2e8,5532
-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_common.py,sha256=5N9xeeGVuwN4kcjIg30eBliUD8PePzCNNLuLipGuTgk,410
+tests/test_config.py,sha256=iiMPwoVA9C3vvGGR6_gKKMbYkSxheNLdljeOA-iPrJU,13295
+tests/test_data.py,sha256=o320GdvOJ2TouWtuA8jcs8Cr_gQWlQ6KxWVSWtmARlY,7614
 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
@@ -117,13 +114,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=ppijBcpLXeHUZh7UXyClxLalSV6cTfKb6Ygw5zXQPKo,5836
-tests/test_uploader.py,sha256=B1llTJt_fqR6e_V_Jxfw9z73QgkFlEPU87xLYGzt-TQ,2914
+tests/test_submit.py,sha256=v75ciL-C0XjiO7wUFQvYBZj0UoqhYOmTLa8TiUyhKqw,5769
+tests/test_uploader.py,sha256=JGp6GEyqRXRtbQSb-IW-cCX_BzNotWdCbnJnLwZvpUM,2869
 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.1.0b2.dist-info/METADATA,sha256=g67y_5StIUtJ3HXVWUsECxrGN5X6LrT8NU96amgI_fg,19085
-ciocore-9.1.0b2.dist-info/WHEEL,sha256=qUzzGenXXuJTzyjFah76kDVqDvnk-YDzY00svnrl84w,109
-ciocore-9.1.0b2.dist-info/entry_points.txt,sha256=cCqcALMYbC4d8545V9w0Zysfg9MVuKWhzDQ2er4UfGE,47
-ciocore-9.1.0b2.dist-info/top_level.txt,sha256=SvlM5JlqULzAz00JZWfiUhfjhqDzYzSWssA87zdJl0o,14
-ciocore-9.1.0b2.dist-info/RECORD,,
+ciocore-9.1.0rc1.dist-info/METADATA,sha256=R_i2XrMj2RbhWLQrczzrbq71Ufz_3Q37WY3d0qIe2m8,19201
+ciocore-9.1.0rc1.dist-info/WHEEL,sha256=qUzzGenXXuJTzyjFah76kDVqDvnk-YDzY00svnrl84w,109
+ciocore-9.1.0rc1.dist-info/entry_points.txt,sha256=cCqcALMYbC4d8545V9w0Zysfg9MVuKWhzDQ2er4UfGE,47
+ciocore-9.1.0rc1.dist-info/top_level.txt,sha256=SvlM5JlqULzAz00JZWfiUhfjhqDzYzSWssA87zdJl0o,14
+ciocore-9.1.0rc1.dist-info/RECORD,,

tests/test_api_client.py

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

tests/test_common.py

@@ -9,17 +9,7 @@ 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,10 +6,7 @@ import sys
 import os
 import logging
 
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest 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

@@ -1,163 +1,173 @@
-""" test data
-
-   isort:skip_file
-"""
-
 import unittest
+from unittest.mock import patch
+from ciocore import data as coredata
 
-try:
-    from unittest import mock
-except ImportError:
-    import mock
-
-from ciocore import data
-
-
-from project_fixtures import PROJECTS
-from package_fixtures import SOFTWARE_DATA
-from instance_type_fixtures import LIN_INSTANCE_TYPES, ALL_INSTANCE_TYPES
-
-class TestDataAllInstanceTypes(unittest.TestCase):
+class TestCoreData(unittest.TestCase):
     def setUp(self):
-        self.default_cache = {
-            "projects": PROJECTS,
-            "instance_types": ALL_INSTANCE_TYPES,
-            "packages": SOFTWARE_DATA,
+        """Set up test fixtures before each test method."""
+        self.mock_api_responses = {
+            'projects': ['ProjectA', 'ProjectB'],
+            'instance_types': [
+                {'operating_system': 'windows', 'name': 'win_machine', 'cores': 1, 'memory': '1024'},
+                {'operating_system': 'linux', 'name': 'linux_machine', 'cores': 1, 'memory': '1024'}
+            ],
+            'software': [  # Added package_id to each package
+                {
+                    'name': 'maya-io',
+                    'version': '2022',
+                    'platform': 'windows',
+                    'product': 'maya-io',
+                    'package_id': '123456789'
+                },
+                {
+                    'name': 'maya-io',
+                    'version': '2022',
+                    'platform': 'linux',
+                    'product': 'maya-io',
+                    'package_id': '123456780'
+                },
+                {
+                    'name': 'nuke',
+                    'version': '13.0',
+                    'platform': 'linux',
+                    'product': 'nuke',
+                    'package_id': '123456781'
+                }
+            ],
+            'extra_env': ['PATH=/custom/path', 'LICENSE_SERVER=1234']
         }
-
-        # self.get_data_patcher = mock.patch.object(DataCache, "get_data", return_value=self.default_cache)
-
-        # self.account_id_patcher = mock.patch(
-        #     "ciocore.data.get_account_id", return_value="1234"
-        # )
-
-        # self.mock_get_data = self.get_data_patcher.start()
-        # self.mock_account_id = self.account_id_patcher.start()
-
-        data.__data__ = {}
-        data.__products__ = None
+        # Clear data before each test
+        coredata.clear()
 
     def tearDown(self):
-        # self.get_data_patcher.stop()
-        # self.account_id_patcher.stop()
-        pass
-
-    # def override_default_cache(self, **kwargs):
-    #     return_val = {}
-    #     return_val.update(self.default_cache)
-    #     return_val.update(kwargs)
-        # self.mock_get_data.return_value = return_val
-
-    # def test_smoke(self):
-    #     self.assertEqual(1, 1)
-
-    # def test_init_empty_projects_global(self):
-    #     data.init()
-    #     self.assertEqual(data.products(), [])
-
-    # def test_init_stores_all_args(self):
-    #     data.init("a", "b", "c")
-    #     self.assertEqual(data.products(), ["a", "b", "c"])
-
-    # def test_data_raises_if_not_initialized(self):
-    #     with self.assertRaises(ValueError):
-    #         data.data()
-
-    # def test_valid(self):
-    #     self.assertEqual(data.valid(), False)
-    #     data.init()
-    #     data.data()
-    #     self.assertEqual(data.valid(), True)
-
-    # def test_clear(self):
-    #     data.init()
-    #     data.data()
-    #     self.assertEqual(data.valid(), True)
-    #     data.clear()
-    #     self.assertEqual(data.valid(), False)
-
-    # def test_does_not_refresh_if_not_force(self):
-    #     data.init()
-    #     p1 = data.data()["projects"]
-    #     self.assertEqual(len(p1), 4)
-    #     # merge the default cache with a new projects list containing only two projects
-    #     # self.override_default_cache(projects=["a", "b"])
-    #     p2 = data.data()["projects"]
-    #     self.assertEqual(p2, p1)
-
-    # def test_does_refresh_if_force_all(self):
-    #     data.init()
-    #     p1 = data.data()["projects"]
-    #     self.assertEqual(len(p1), 4)
-    #     # self.override_default_cache(projects=["a", "b"])
-    #     p2 = data.data(force=True)["projects"]
-    #     self.assertNotEqual(p2, p1)
-    #     self.assertEqual(len(p2), 2)
-
-    # def test_get_data_for_one_product(self):
-    #     data.init("c4d")
-    #     # inst = data.data()["instance_types"]
-    #     sw = data.data()["software"]
-    #     self.assertEqual(len(sw.supported_host_names()), 2)
-
-    # def test_several_products(self):
-    #     data.init("c4d", "maya")
-    #     sw = data.data()["software"]
-    #     self.assertEqual(len(sw.supported_host_names()), 5)
-
-    # def test_one_product_can_be_a_plugin(self):
-    #     data.init("redshift")
-    #     sw = data.data()["software"]
-    #     self.assertEqual(len(sw.supported_host_names()), 4)
-
-    # def test_several_products_ignore_plugins(self):
-    #     data.init("redshift", "c4d")
-    #     sw = data.data()["software"]
-    #     self.assertEqual(len(sw.supported_host_names()), 2)
-
-    # def test_linux_only_instance_types(self):
-    #     # self.override_default_cache(instance_types=LIN_INSTANCE_TYPES)
-    #     data.init()
-    #     h = data.data()["instance_types"]
-    #     self.assertEqual(len(h.instance_types.keys()), 4)
-
-    # def test_linux_only_packages_when_linux_only_instance_types(self):
-    #     # self.override_default_cache(instance_types=LIN_INSTANCE_TYPES)
-    #     data.init("c4d")
-    #     sw = data.data()["software"]
-    #     self.assertEqual(len(sw.supported_host_names()), 1)
-
-    # def test_platforms_method_only_linux(self):
-    #     self.override_default_cache(instance_types=LIN_INSTANCE_TYPES)/
-    #     data.init("c4d")
-    #     data.data()
-    #     self.assertEqual({"linux"}, data.platforms())
-
-    # def test_many_products(self):
-    #     self.override_default_cache(instance_types=LIN_INSTANCE_TYPES)
-    #     data.init("c4d", "maya")
-    #     sw = data.data()["software"]
-    #     self.assertEqual(len(sw.supported_host_names()), 4)
-
-    # def test_product_keyword_translates_to_single_arg(self):
-    #     data.init(product="c4d")
-    #     sw = data.data()["software"]
-    #     self.assertEqual(len(sw.supported_host_names()), 2)
-
-    # def test_product_keyword_all_translates_to_all_products(self):
-    #     data.init(product="all")
-    #     sw = data.data()["software"]
-    #     self.assertEqual(len(sw.supported_host_names()), 11)
-
-    # def test_data_raises_if_both_products_and_kwarg_given(self):
-    #     with self.assertRaises(ValueError):
-    #         data.init("maya", product="c4d")
-
-    # def test_data_raises_if_products_and_kwarg_given(self):
-    #     with self.assertRaises(ValueError):
-    #         data.init("maya", product="c4d")
-
-class TestDataSmoke(unittest.TestCase):
-    
-    def test_smoke(self):
-        self.assertTrue(True)
+        """Clean up after each test method."""
+        coredata.clear()
+
+    def test_init_with_single_product(self):
+        """Test initializing with a single product"""
+        coredata.init("maya-io")
+        self.assertEqual(coredata.products(), ["maya-io"])
+        self.assertEqual(coredata.platforms(), set(["windows", "linux"]))
+
+    def test_init_with_multiple_products(self):
+        """Test initializing with multiple products"""
+        coredata.init("maya-io", "nuke")
+        self.assertEqual(coredata.products(), ["maya-io", "nuke"])
+
+    def test_init_with_deprecated_product(self):
+        """Test initializing with deprecated product kwarg"""
+        coredata.init(product="maya-io")
+        self.assertEqual(coredata.products(), ["maya-io"])
+
+    def test_init_with_all_products(self):
+        """Test initializing with 'all' products"""
+        coredata.init(product="all")
+        self.assertEqual(coredata.products(), [])
+
+    def test_init_conflict_raises_error(self):
+        """Test that using both products arg and product kwarg raises error"""
+        with self.assertRaises(ValueError):
+            coredata.init("maya-io", product="nuke")
+
+    def test_data_requires_init(self):
+        """Test that data() raises error if not initialized"""
+        with self.assertRaises(ValueError):
+            coredata.data()
+
+    @patch('ciocore.data.api_client')
+    def test_data_fetching(self, mock_client):
+        """Test fetching data through the data() function"""
+        # Setup mock responses
+        mock_client.request_projects.return_value = self.mock_api_responses['projects']
+        mock_client.request_instance_types.return_value = self.mock_api_responses['instance_types']
+        mock_client.request_software_packages.return_value = self.mock_api_responses['software']
+        mock_client.request_extra_environment.return_value = self.mock_api_responses['extra_env']
+
+        coredata.init("maya-io")
+        result = coredata.data()
+        
+        self.assertIn("projects", result)
+        self.assertIn("instance_types", result)
+        self.assertIn("software", result)
+        self.assertIn("extra_environment", result)
+        
+        self.assertEqual(result["projects"], self.mock_api_responses["projects"])
+        self.assertIsInstance(result["instance_types"], coredata.HardwareSet)
+        self.assertIsInstance(result["software"], coredata.PackageTree)
+
+    @patch('ciocore.data.api_client')
+    def test_force_refresh(self, mock_client):
+        """Test forcing data refresh"""
+        # Setup mock responses
+        mock_client.request_projects.return_value = self.mock_api_responses['projects']
+        mock_client.request_instance_types.return_value = self.mock_api_responses['instance_types']
+        mock_client.request_software_packages.return_value = self.mock_api_responses['software']
+        mock_client.request_extra_environment.return_value = self.mock_api_responses['extra_env']
+
+        coredata.init("maya-io")
+        first_data = coredata.data()
+        
+        # Second call without force should not make new API calls
+        mock_client.request_projects.reset_mock()
+        second_data = coredata.data()
+        mock_client.request_projects.assert_not_called()
+        
+        # Call with force=True should make new API calls
+        third_data = coredata.data(force=True)
+        mock_client.request_projects.assert_called_once()
+
+    def test_valid_state(self):
+        """Test valid() function behavior"""
+        self.assertFalse(coredata.valid())  # Should be invalid before initialization
+        
+        coredata.init("maya-io")
+        self.assertFalse(coredata.valid())  # Should be invalid before data is fetched
+        
+        with patch('ciocore.data.api_client') as mock_client:
+            # Setup mock responses
+            mock_client.request_projects.return_value = self.mock_api_responses['projects']
+            mock_client.request_instance_types.return_value = self.mock_api_responses['instance_types']
+            mock_client.request_software_packages.return_value = self.mock_api_responses['software']
+            mock_client.request_extra_environment.return_value = self.mock_api_responses['extra_env']
+            
+            coredata.data()  # Fetch data
+            self.assertTrue(coredata.valid())  # Should be valid after data is fetched
+        
+        coredata.clear()
+        self.assertFalse(coredata.valid())  # Should be invalid after clear
+
+    @patch('ciocore.data.api_client')
+    def test_platforms_filtering(self, mock_client):
+        """Test platform filtering based on instance types and software"""
+        # Setup mock responses
+        mock_client.request_projects.return_value = self.mock_api_responses['projects']
+        mock_client.request_instance_types.return_value = self.mock_api_responses['instance_types']
+        mock_client.request_software_packages.return_value = self.mock_api_responses['software']
+        mock_client.request_extra_environment.return_value = self.mock_api_responses['extra_env']
+
+        coredata.init("nuke")  # nuke only supports linux
+        coredata.data()
+        
+        # Should only have linux instance types since nuke only supports linux
+        self.assertEqual(coredata.platforms(), {"linux"})
+
+    @patch('ciocore.data.api_client')
+    def test_instances_filter(self, mock_client):
+        """Testing that instance_types is passed correctly to api_client"""
+        # Set up mock response
+        mock_client.request_instance_types.return_value = self.mock_api_responses['instance_types']
+        coredata.init("maya-io")
+
+        # Test with no filter
+        coredata.data()
+        mock_client.request_instance_types.assert_called_with(filter_param="")
+        
+        # Test with filter and force=True
+        mock_client.request_instance_types.reset_mock()
+
+        instances_filter = "gpu.gpu_count=gte:1:int"
+        coredata.data(force=True, instances_filter=instances_filter)
+        mock_client.request_instance_types.assert_called_with(filter_param=instances_filter)
+
+if __name__ == '__main__':
+    unittest.main()

tests/test_submit.py

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

tests/test_uploader.py

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

ciocore/compat.py

@@ -1,15 +0,0 @@
-import sys
-if sys.version_info < (3,):
-    import codecs
-    def u(x):
-        return codecs.unicode_escape_decode(x)[0]
-
-    text_type = unicode
-    binary_type = str
-else:
-    def u(x):
-        return str(x)
-
-    text_type = str
-    binary_type = bytes
-