PyPI - ciocore - Versions diffs - 8.3.1__py2.py3-none-any.whl → 8.3.3__py2.py3-none-any.whl - Mend

ciocore 8.3.1py2.py3-none-any.whl → 8.3.3py2.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.

Files changed (19) hide show

ciocore/VERSION +1 -1
ciocore/api_client.py +7 -4
ciocore/data.py +4 -2
ciocore/docsite/apidoc/api_client/index.html +14 -4
ciocore/docsite/apidoc/data/index.html +11 -3
ciocore/docsite/search/search_index.json +1 -1
ciocore/docsite/sitemap.xml.gz +0 -0
ciocore/package_query.py +14 -3
{ciocore-8.3.1.dist-info → ciocore-8.3.3.dist-info}/METADATA +16 -8
{ciocore-8.3.1.dist-info → ciocore-8.3.3.dist-info}/RECORD +17 -18
{ciocore-8.3.1.dist-info → ciocore-8.3.3.dist-info}/WHEEL +1 -1
tests/package_fixtures.py +18 -5
tests/test_data.py +167 -157
tests/test_package_query.py +38 -0
tests/test_package_tree.py +1 -1
tests/extra_env_fixtures.py +0 -57
tests/project_fixtures.py +0 -8
{ciocore-8.3.1.dist-info → ciocore-8.3.3.dist-info}/entry_points.txt +0 -0
{ciocore-8.3.1.dist-info → ciocore-8.3.3.dist-info}/top_level.txt +0 -0

ciocore/docsite/sitemap.xml.gz CHANGED Viewed

Binary file

ciocore/package_query.py CHANGED Viewed

@@ -120,14 +120,25 @@ def write_text(hostnames, tree_data, platform, color_func, stream):
                     ),
                     stream,
                 )
+def sort_hostnames_by_version(hostnames):
+    def sort_version(pkg):
+        hostname, product, version, platform = pkg
+        return f"{version} {product} {platform}"
+    def sort_product(pkg):
+        hostname, product, version, platform = pkg
+        return f"{product} {platform}"
+    pkg_sortable = [(hostname, hostname.split()[0], hostname.split()[1], hostname.split()[2]) for hostname in hostnames]
+    _psorted = sorted(pkg_sortable, key=sort_version, reverse=True)
+    _sorted = sorted(_psorted, key=sort_product)
+    return [pkg[0] for pkg in _sorted]
 def pq(format="text"):
     packages = api_client.request_software_packages()
     tree_data = PackageTree(packages)
-    hostnames = tree_data.supported_host_names()
+    hostnames = sort_hostnames_by_version(tree_data.supported_host_names())
     linux_hostnames = [h for h in hostnames if h.endswith("linux")]
     windows_hostnames = [h for h in hostnames if h.endswith("windows")]
@@ -168,4 +179,4 @@ def pq(format="text"):
 def decorate(html):
     html = html.replace("<table>", '<table class="pure-table pure-table-bordered">')
     html = '<html><head>{}</head><body style="margin: 2em;">{}</body></html>'.format(PURE, html)
-    return html
+    return html

{ciocore-8.3.1.dist-info → ciocore-8.3.3.dist-info}/METADATA RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ciocore
-Version: 8.3.1
+Version: 8.3.3
 Summary: Core functionality for Conductor's client tools
 Home-page: https://github.com/ConductorTechnologies/ciocore
 Author: conductor
@@ -9,13 +9,13 @@ 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: 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
-Requires-Dist: colorlog <7.0.0,>=6.8.2
+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
+Requires-Dist: colorlog<7.0.0,>=6.8.2
 ## Introduction
@@ -51,6 +51,14 @@ See [CONTRIBUTING](CONTRIBUTING.md)
 ## Changelog
+## 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
 ## Version:8.3.1 -- 05 Sep 2024
 * Fixes a bug of the Conductor log going to the wrong path on Windows

{ciocore-8.3.1.dist-info → ciocore-8.3.3.dist-info}/RECORD RENAMED Viewed

@@ -1,19 +1,19 @@
-ciocore/VERSION,sha256=rmeFKlQ4QGAI5SKqVg8znd1CZl1ozCVgtxHLoIKwdLs,5
+ciocore/VERSION,sha256=CPW4ywaMrQJwqnxuD6QhQjZADphOtNGh1wwcjUpgMj4,5
 ciocore/__init__.py,sha256=aTP7LeeosQA8BZE67gDV4jgfTK5zxmwZRjiTRu_ZWj0,646
-ciocore/api_client.py,sha256=SBxEwAiwn2XtH7T_ipefUbWhczXjoNdNbQBur1RV-Bw,32810
+ciocore/api_client.py,sha256=IZXP5QHUAQvoiQEexr4lHdysHXNoDbTrxmBdgczVRwU,33009
 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=2m5EBXfu1lmqupZrFF8f8mfkX_PgijpdMxCtFI5e5s0,5574
+ciocore/package_query.py,sha256=hWi_JmRieZ8f2Ji5JR7tQnHnm29Ktb88scbIXNsDu-8,6181
 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
@@ -26,11 +26,11 @@ 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=2xVWLq_KVIQN6qI9Vw76TGTPhAz5eEkcQP1Pl6YvAN4,127
-ciocore/docsite/apidoc/api_client/index.html,sha256=TvoSl4iqdXhBVfesDxe_sBPA6G-Jt1-gpWA40xXspa0,188372
+ciocore/docsite/sitemap.xml.gz,sha256=Qw_9G64RFm0KsUtO6gBNfO91KGMJoHgSyOx4KMLMtRU,127
+ciocore/docsite/apidoc/api_client/index.html,sha256=ECM-KQ5E-KRb1ZWvY1PGG2pjVDnK1m-Gmkkk5-vlVyE,189219
 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
@@ -81,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=vBLU-rkC0pxOPX0O3MNKXRKGfgsaS1-91KsV17Gf9SY,189092
+ciocore/docsite/search/search_index.json,sha256=ju5KaOoSD824cFvn8uEpJ_kTHJBJKyYtfC9k3ubuY-A,189844
 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
@@ -99,29 +99,28 @@ ciocore/uploader/_uploader.py,sha256=40nzqO5DuFi4sx31VvjWxZPNkrWsWqM9jtFVxs_-o3o
 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=CsJnhB7oYzIxJH7b1tCOPyvnnVSCqEbSPhtCnsHL-nA,5070
-tests/project_fixtures.py,sha256=iBm_th_JtAw76vlNu7Jjhh9tLH4oOaNi-MgtPzCV7yQ,138
+tests/package_fixtures.py,sha256=od7ZHofG8ubpQ3PqlUsrcHBcbmD3qVWih9eiIg1WtSQ,5361
 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=tY_-SY-JmJX09UehFs9RIDqZ785AmhfTl6eVKJeIUFY,763
 tests/test_config.py,sha256=-_G682Ss3Zr1FmcMkjla1zAZprX2tQKpKc5_wD28rII,13340
-tests/test_data.py,sha256=NIBXpCjG3Os3vpc1CkiVONrebro8D_jqQyJ0N3kbucU,5433
+tests/test_data.py,sha256=JGl_OsechVMJGpIgq6s86UnvNexAlwwjxW8HR6L3OEM,7625
 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
 tests/test_job_downloader.py,sha256=_dZqyLZhc2Bq2n7-skERfodHx1JgFyHw8TamHp6ID9I,7025
 tests/test_package_environment.py,sha256=CdiC2PDVSnbcwTb4fsDTWqGYSzs1n5ca2KMoyISckGA,5893
-tests/test_package_tree.py,sha256=xCwNwYUmJrfmgCP2FGoHRFG-L0JPy8s4-66icxAls4o,6780
+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_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-8.3.1.dist-info/METADATA,sha256=NNnft8rjUsxme5_1tZ4q72inZQAY6vIHxB60ZgHnvYo,18772
-ciocore-8.3.1.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-ciocore-8.3.1.dist-info/entry_points.txt,sha256=cCqcALMYbC4d8545V9w0Zysfg9MVuKWhzDQ2er4UfGE,47
-ciocore-8.3.1.dist-info/top_level.txt,sha256=SvlM5JlqULzAz00JZWfiUhfjhqDzYzSWssA87zdJl0o,14
-ciocore-8.3.1.dist-info/RECORD,,
+ciocore-8.3.3.dist-info/METADATA,sha256=gzm8TpBrMp-5IiLCxn_NCu8Qgn-1n1HMKHks7Cuh0l4,18934
+ciocore-8.3.3.dist-info/WHEEL,sha256=qUzzGenXXuJTzyjFah76kDVqDvnk-YDzY00svnrl84w,109
+ciocore-8.3.3.dist-info/entry_points.txt,sha256=cCqcALMYbC4d8545V9w0Zysfg9MVuKWhzDQ2er4UfGE,47
+ciocore-8.3.3.dist-info/top_level.txt,sha256=SvlM5JlqULzAz00JZWfiUhfjhqDzYzSWssA87zdJl0o,14
+ciocore-8.3.3.dist-info/RECORD,,

{ciocore-8.3.1.dist-info → ciocore-8.3.3.dist-info}/WHEEL RENAMED Viewed

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (74.1.2)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any

tests/package_fixtures.py CHANGED Viewed

@@ -139,12 +139,25 @@ C4D_DATA = [
         "minor_version": "0",
         "package_id": "id_9",
     },
+    {
+        "product": "c4d",
+        "major_version": "1",
+        "minor_version": "1",
+        "package_id": "id_10",
+    },
     {
         "product": "c4d",
         "platform": "windows",
         "major_version": "1",
         "minor_version": "0",
-        "package_id": "id_10",
+        "package_id": "id_11",
+    },
+    {
+        "product": "c4d",
+        "platform": "windows",
+        "major_version": "1",
+        "minor_version": "1",
+        "package_id": "id_12",
     },
 ]
@@ -152,20 +165,20 @@ BLENDER_DATA = [
     {
         "product": "blender",
         "major_version": "1",
-        "package_id": "id_11",
+        "package_id": "id_13",
     },
     {
         "product": "blender",
         "major_version": "1",
         "minor_version": "0",
-        "package_id": "id_12",
+        "package_id": "id_14",
     },
     {
         "product": "blender",
         "major_version": "1",
         "minor_version": "0",
         "release_version": "2",
-        "package_id": "id_13",
+        "package_id": "id_15",
     },
     {
         "product": "blender",
@@ -173,7 +186,7 @@ BLENDER_DATA = [
         "minor_version": "0",
         "release_version": "2",
         "build_version": "3",
-        "package_id": "id_14",
+        "package_id": "id_16",
     },
 ]

tests/test_data.py CHANGED Viewed

@@ -1,163 +1,173 @@
-""" test data
-   isort:skip_file
-"""
 import unittest
+from unittest.mock import patch, MagicMock
+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_package_query.py ADDED Viewed

@@ -0,0 +1,38 @@
+""" test package_query
+"""
+import unittest
+import os
+import sys
+import copy
+from ciocore import package_tree
+from ciocore import package_query
+from package_fixtures import *
+class HostnameSortByVersionTest(unittest.TestCase):
+    def setUp(self):
+        self.packages = copy.deepcopy(SOFTWARE_DATA)
+        self.pt = package_tree.PackageTree(self.packages)
+        self.hostname_list = self.pt.supported_host_names()
+    def test_sort_hostnames_by_version(self):
+        sorted_hostnames = package_query.sort_hostnames_by_version(self.hostname_list)
+        sorted_data = {}
+        for item in sorted_hostnames:
+            product, version, platform = item.split()
+            data = {
+                'version': version,
+                'platform': platform
+            }
+            if product in sorted_data.keys():
+                sorted_data[product].append(data)
+            else:
+                sorted_data[product] = [data]
+        self.assertTrue(sorted(list(sorted_data.keys())) == list(sorted_data.keys()))
+        for product in sorted_data.keys():
+            platform_list = [pkg['platform'] for pkg in sorted_data[product]]
+            self.assertTrue(sorted(platform_list) == platform_list)
+            version_list = [pkg['version'] for pkg in sorted_data[product] if pkg['platform'] == 'linux']
+            self.assertTrue(sorted(version_list, reverse=True) == version_list)
+if __name__ == "__main__":
+    unittest.main()

tests/test_package_tree.py CHANGED Viewed

@@ -163,7 +163,7 @@ class SupportedHostNamesTest(unittest.TestCase):
     def test_supported_host_names_windows(self):
         self.pt = package_tree.PackageTree(self.packages, product="c4d", platforms=["windows"])
         host_names = self.pt.supported_host_names()
-        self.assertEqual(len(host_names), 1)
+        self.assertEqual(len(host_names), 2)
         self.assertIn('c4d 1.0 windows', host_names)

ciocore 8.3.1__py2.py3-none-any.whl → 8.3.3__py2.py3-none-any.whl

Potentially problematic release.

ciocore 8.3.1py2.py3-none-any.whl → 8.3.3py2.py3-none-any.whl