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

ciocore 8.3.1py2.py3-none-any.whl → 8.3.2py2.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 (11) hide show

ciocore/VERSION +1 -1
ciocore/docsite/sitemap.xml.gz +0 -0
ciocore/package_query.py +14 -3
{ciocore-8.3.1.dist-info → ciocore-8.3.2.dist-info}/METADATA +12 -8
{ciocore-8.3.1.dist-info → ciocore-8.3.2.dist-info}/RECORD +11 -10
{ciocore-8.3.1.dist-info → ciocore-8.3.2.dist-info}/WHEEL +1 -1
tests/package_fixtures.py +18 -5
tests/test_package_query.py +38 -0
tests/test_package_tree.py +1 -1
{ciocore-8.3.1.dist-info → ciocore-8.3.2.dist-info}/entry_points.txt +0 -0
{ciocore-8.3.1.dist-info → ciocore-8.3.2.dist-info}/top_level.txt +0 -0

ciocore/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 8.3.1
1	+ 8.3.2

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.2.dist-info}/METADATA RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ciocore
-Version: 8.3.1
+Version: 8.3.2
 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,10 @@ See [CONTRIBUTING](CONTRIBUTING.md)
 ## Changelog
+## 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.2.dist-info}/RECORD RENAMED Viewed

@@ -1,4 +1,4 @@
-ciocore/VERSION,sha256=rmeFKlQ4QGAI5SKqVg8znd1CZl1ozCVgtxHLoIKwdLs,5
+ciocore/VERSION,sha256=yMqzsb3D4LmOawN9712vzGxhLlrQgxoUp1YYCGk_0ng,5
 ciocore/__init__.py,sha256=aTP7LeeosQA8BZE67gDV4jgfTK5zxmwZRjiTRu_ZWj0,646
 ciocore/api_client.py,sha256=SBxEwAiwn2XtH7T_ipefUbWhczXjoNdNbQBur1RV-Bw,32810
 ciocore/cli.py,sha256=jZ1lOKQiUcrMhsVmD9SVmPMFwHtgDF4SaoAf2-PBS54,15449
@@ -13,7 +13,7 @@ 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,7 +26,7 @@ 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/sitemap.xml.gz,sha256=nmc2lveKFlofHpVpP6or7MslVmJqs4Y4nz-7cB32EoU,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
@@ -101,7 +101,7 @@ ciocore/uploader/upload_stats/stats_formats.py,sha256=giNirtObU66VALWghPFSRhg3q_
 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/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_base_downloader.py,sha256=SS7tWKv2ZZhpUDk4UCg1TkrNrpntjSewgzLl1mEubSE,3603
@@ -114,14 +114,15 @@ tests/test_hardware_set.py,sha256=hW7A_suyYdU7WkB7qoHSBPLxaAP2CKqI0i_ULfO5GeY,44
 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.2.dist-info/METADATA,sha256=cKdUXW010yUKTuzdmz3u8iCoDekFby8TJRxpVdG31Dk,18860
+ciocore-8.3.2.dist-info/WHEEL,sha256=qUzzGenXXuJTzyjFah76kDVqDvnk-YDzY00svnrl84w,109
+ciocore-8.3.2.dist-info/entry_points.txt,sha256=cCqcALMYbC4d8545V9w0Zysfg9MVuKWhzDQ2er4UfGE,47
+ciocore-8.3.2.dist-info/top_level.txt,sha256=SvlM5JlqULzAz00JZWfiUhfjhqDzYzSWssA87zdJl0o,14
+ciocore-8.3.2.dist-info/RECORD,,

{ciocore-8.3.1.dist-info → ciocore-8.3.2.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_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.dist-info → ciocore-8.3.2.dist-info}/entry_points.txt RENAMED Viewed

File without changes

{ciocore-8.3.1.dist-info → ciocore-8.3.2.dist-info}/top_level.txt RENAMED Viewed

File without changes

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

Potentially problematic release.

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