ciocore 8.0.0b11__py2.py3-none-any.whl → 8.0.0b14__py2.py3-none-any.whl

ciocore/downloader/base_downloader.py

@@ -81,7 +81,9 @@ def temp_file(filepath):
         dirpath, filename = os.path.split(filepath)
         # ensure the directory exists
         os.makedirs(dirpath, exist_ok=True)
-        temp_file_path = tempfile.mkstemp(prefix=filename, dir=dirpath)[1]
+        temp_file_desc = tempfile.mkstemp(prefix=filename, dir=dirpath)
+        temp_file_path = temp_file_desc[1]
+        os.close(temp_file_desc[0])
         yield temp_file_path
 
         shutil.move(temp_file_path, filepath)

ciocore/downloader/job_downloader.py

@@ -26,7 +26,7 @@ class JobDownloader(BaseDownloader):
     CLIENT_NAME = "JobDownloader"
 
     def __init__(self, jobs, *args, **kwargs):
-        
+
         super().__init__(*args, **kwargs)
         """Initialize the downloader."""
         logger.debug("Initializing paged job downloader")
@@ -35,20 +35,20 @@ class JobDownloader(BaseDownloader):
 
     def get_some_tasks(self, locator):
         """Fetch the next page of tasks from the server.
-        
+
         locator: a dictionary containing the index of the current job, and the cursor for the next page of tasks for the job.
         """
 
         # What is a locator? It's the information needed to request the next page of tasks. It consists of the index of the current job, and the cursor for the next page of tasks. It is provided to this method as a parameter, and when we're done, a new locator is returned to the run loop. The run loop passes it back to us the next time it is called.
-        
+
         # On the first call, the provided locator is None. In that case, we start with the first job, and no cursor.
-        
+
         # We return the locator to the run loop in the base class, along with any tasks to be downloaded. If we return a falsy locator, the run loop is exited, since it means we downloaded everything OR there was an error fetching tasks.
-        
+
         # If we got to the end of the current job, we increment the job index and reset the cursor to None. The next time this method is called, we'll start with the next job.
-        
+
         # If we got a next_cursor from the request, we return it in the locator along withh the current job index. This is what we'll be given on the next call.
-        
+
         if not locator:
             locator = {}
 

ciocore/downloader/logging_download_runner.py

@@ -14,7 +14,6 @@ back to the server.
 
 
 import logging
-from queue import Queue
 from ciocore.downloader.download_runner_base import DownloadRunnerBase
 
 LOG_FORMATTER = logging.Formatter(
@@ -72,7 +71,7 @@ class LoggingDownloadRunner(DownloadRunnerBase):
 
         If we find any, then report them as pending.
         """
-        logger.info(f"Download done")
+        logger.info("Download done")
         messages = []
         for job_id in evt["registry"]:
             job = evt["registry"][job_id]

{ciocore-8.0.0b11.dist-info → ciocore-8.0.0b14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ciocore
-Version: 8.0.0b11
+Version: 8.0.0b14
 Summary: Core functionality for Conductor's client tools
 Home-page: https://github.com/ConductorTechnologies/ciocore
 Author: conductor
@@ -56,6 +56,9 @@ See [CONTRIBUTING](CONTRIBUTING.md)
 
 ## Unreleased: 
 
+* 8.0.0-beta.13
+  * fixed permissions error bug with file downloads
+
 * 8.0.0-beta.5 
   * adds kill_tasks kill_jobs get_jobs get_log
   * remove old docs stuff

{ciocore-8.0.0b11.dist-info → ciocore-8.0.0b14.dist-info}/RECORD

@@ -1,12 +1,12 @@
-ciocore/VERSION,sha256=hZKXw8UttJU6x8lR3MHguhunJ99ewsc05-zoXgHvN84,13
+ciocore/VERSION,sha256=5fucTzbeOAkHbJHYqnYwCQgQRPfbsxTCi587-fEGr5s,13
 ciocore/__init__.py,sha256=aTP7LeeosQA8BZE67gDV4jgfTK5zxmwZRjiTRu_ZWj0,646
-ciocore/api_client.py,sha256=_kT-qXutqRTT9gDR2G6q4Wh6hgBPwpU9Wjnw7ztNxlI,25292
-ciocore/cli.py,sha256=WvtLAIiXXFk9-0Ce0X4ZCJjLx4u8ekt2xRJHWbOYLqI,17022
+ciocore/api_client.py,sha256=BTDGXT-59-48SLz3BzP8OtGEhBYDiiEvyytsRUxaK9I,23555
+ciocore/cli.py,sha256=R3tWhlrzUoIcdat70i9tTAaEDQ92dxRj4YaaYFCxSMA,17139
 ciocore/client_db.py,sha256=tTz3bl2xeDPPcYSDS3g3QgV_xYihJMx0Kj6OeN2klK0,12978
 ciocore/common.py,sha256=FnggAL-IGW8VQB6kLsrKLnxWFgLpwGBhOtiZSHz130M,14725
 ciocore/compat.py,sha256=5uEXPSog_jxsDMaHBswAKEtfyXT25VgU6WNGIhz9PHU,256
 ciocore/conductor_submit.py,sha256=ONE0LsA5hGavTJIOXXYx8qzl8_vBPADwhd6Ytq_0E0c,9382
-ciocore/config.py,sha256=n0L_EnGR-xr4jutwtRaU1UxUC5hzR97gfAk6HaKSLp0,8675
+ciocore/config.py,sha256=rCL7kaFn1tYgSglN8q9Wx6SwMpoXTq0BMQGwPRVwVIg,8973
 ciocore/data.py,sha256=m_SqSlcrpjMPHhGtzx3Gn9sHzEmTQKsha3VNIBl1DY0,7349
 ciocore/data_cache.py,sha256=LasIBqKei-VHRZfRVJEbvSRAot-54-xZ3ZYZOUq-yJI,6859
 ciocore/dev_inst_tagger.py,sha256=bPfoFbE7IPCpDbtbVHxW7IlMwvspdnJhPuNq-u4fJN4,3497
@@ -26,12 +26,12 @@ ciocore/auth/server.py,sha256=8btX9-EokUl6q55V8muDmEV2tvvbTBD0BHeWFbwkzUc,3892
 ciocore/docsite/404.html,sha256=DQCrQsaKh8M0zlCFZmjFHUtqy7_gx_i2Rpc3OoDdDI4,17207
 ciocore/docsite/index.html,sha256=p_Dq_6_8cwZZPDI5zjahfCWUkfbSj14NJtoQFAZv0WI,20945
 ciocore/docsite/logo.png,sha256=gArgFFWdw8w985-0TkuGIgU_pW9sziEMZdqytXb5WLo,2825
-ciocore/docsite/objects.inv,sha256=V2CTA5ifhR2WS1ELU2clCxzwRMF_hGKCprr18jmkb3s,724
+ciocore/docsite/objects.inv,sha256=UhlZWOqRV8tA4CzS8HKmk322X-so5ZmIe55155t_7Ls,746
 ciocore/docsite/sitemap.xml,sha256=M_V85zl0y2adRvzJAnoCxlZH_Hl7TLnIb1A-6l_xGmI,109
-ciocore/docsite/sitemap.xml.gz,sha256=vRqzJ582KFZkp7VxUflQMfSIKydB_QG2nAcRz4LVBw0,127
-ciocore/docsite/apidoc/api_client/index.html,sha256=udeUpwlzyhVz_BH4qRPw6Bj4ktj7YsxX4cOdPVT1LvU,165043
+ciocore/docsite/sitemap.xml.gz,sha256=WwV7ZDDXdjDLWQW8ZdVWO7ToorPQikaMxmLw-ftiYBc,127
+ciocore/docsite/apidoc/api_client/index.html,sha256=DYVIV4xZRhTEiDJoIRn-76YRjGia_ce6LDss7G2stsE,164621
 ciocore/docsite/apidoc/apidoc/index.html,sha256=NQn8wjapxa7O2IQhsbE7Y-VMfMFL6Tby-L7qIF6K3m4,26171
-ciocore/docsite/apidoc/config/index.html,sha256=W8jqv5hUJGlmem36w8NrU6zpnEnh3yacZ9Qx_NJLxQg,73311
+ciocore/docsite/apidoc/config/index.html,sha256=1GWkyClM7LJlLBpx07BqCi3xDkU-SKVPjNUEeKuwbNs,72559
 ciocore/docsite/apidoc/data/index.html,sha256=K4Sr6Vmq38Nq1xTQG6ennLjxpD_37bMNEgKZe8S0lJ0,50724
 ciocore/docsite/apidoc/hardware_set/index.html,sha256=DMlpzQCy2ypJ078tcFNrZAvG2sU7P5-ZwU4ZRCObtQg,123042
 ciocore/docsite/apidoc/package_environment/index.html,sha256=S5IE1EgnJaaLVsEpgPogwBvj3jxT6ycNp-1GAlJrPt4,65729
@@ -83,16 +83,16 @@ ciocore/docsite/cmdline/downloader/index.html,sha256=DAVErhWEPuEtkQr7y9D_wjylzM9
 ciocore/docsite/cmdline/packages/index.html,sha256=j1YeMgdwZ6FyJGJii05AdtUWKRjyu1fOr3_bKJsLfEU,20923
 ciocore/docsite/cmdline/uploader/index.html,sha256=y0728lIAYC4b9mfpjNVfwQqXoqJrsdG49UY5u7B1p94,25123
 ciocore/docsite/how-to-guides/index.html,sha256=OFrFBTb9tuMn60Jd4oeM10Mw-d-0pyqwoKoo9g1biBM,20100
-ciocore/docsite/search/search_index.json,sha256=KXnkq9QBss78-d5Y30b5ZFou0TakUlWPqmu4I5L43O4,180228
+ciocore/docsite/search/search_index.json,sha256=xpYzauCSGogatE3F2UoDih_GCpa4UdbvRtm9bDr17I0,180065
 ciocore/docsite/stylesheets/extra.css,sha256=qgfcao9TEBzf6ieAWN5rPyrea7YM_YgVg5qr4NPrxoU,354
 ciocore/docsite/stylesheets/tables.css,sha256=O2PEwlKC0RfvZCRV9UERqQRvhb6jcqO84PLew0bafF0,3279
 ciocore/downloader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ciocore/downloader/base_downloader.py,sha256=1sYWc6e-1FelFN7p1_xt4Zbsz9xtVaN86Nb6jMWF_Zc,20587
+ciocore/downloader/base_downloader.py,sha256=asyjHQ4NQL7uisqXe8IWU6lid5b83PiE_8KpPA1WXjA,20663
 ciocore/downloader/daemon_downloader.py,sha256=ksdfw0PzfO6xnNxMebM27nkHl75lh-rAtf5XT6WmipI,1327
 ciocore/downloader/download_runner_base.py,sha256=x74pmn4vdGKKlR9gaFdtmjIRfN0ME1oyX5e9k92Nn1w,6455
-ciocore/downloader/job_downloader.py,sha256=lzSYff9XS9qX6qOf_BsNpoRBu35UVaINJZsw41lU9cI,5473
+ciocore/downloader/job_downloader.py,sha256=hYDh8Fqn-ZhD0xM8uHQauglhdi70_HK9UQ7nKPFyqds,5417
 ciocore/downloader/legacy_downloader.py,sha256=1dCkagDoRYliQjGUYD2kAw49TQ-4k2AO592e--UHhf4,52087
-ciocore/downloader/logging_download_runner.py,sha256=c232qepb-G-SL0oZYy0ONhR0Oc9u8lrcTw6Cgq5I9zY,3258
+ciocore/downloader/logging_download_runner.py,sha256=KqnR-Hy_kTIqHkZJhCIBkZlkVvkylV30bFLG32rlB88,3233
 ciocore/sequence_checker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ciocore/sequence_checker/bar_chart.py,sha256=Trx_By3A2Eucwp2f0fWWowXphAB1MLSXfZudzwCjXWM,8715
 ciocore/sequence_checker/check_sequence.py,sha256=aZ5h7yWensTjruuC8japRVnS9EZGx8cJagUSQhD6o_I,6673
@@ -106,15 +106,15 @@ tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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/test_api_client.py,sha256=CQKt-ndYI5AV7h4P5iMHaEGF3i2OxXcenR_ZqCPHoug,1402
+tests/test_api_client.py,sha256=lDUkVi6Xq1ilkSepFLebgBAhgchumvfyZnTtei1fnrI,3642
 tests/test_base_downloader.py,sha256=dOtA3uoOBl8KrbyTlI5g4yvXTBH9e1m95rco-lWfJoA,3765
 tests/test_cli.py,sha256=OPcKAQ-zO43_46nFN3UTAuHfHEQMIzfdZ5kNFm0FH9E,6203
-tests/test_common.py,sha256=xA0y_KgEmag7jRKfhEHZgIQkS2WmjrYEcss-rwhQOOs,747
+tests/test_common.py,sha256=tY_-SY-JmJX09UehFs9RIDqZ785AmhfTl6eVKJeIUFY,763
 tests/test_config.py,sha256=-_G682Ss3Zr1FmcMkjla1zAZprX2tQKpKc5_wD28rII,13340
 tests/test_data.py,sha256=ZT_61MQPl6DajXzGAkkJZsVpYaFMsxpZLjtPaoEaPpE,5471
 tests/test_data_cache.py,sha256=PDbRNoMHea_bMw2wgEjWRd9sFEqTt2PEpyxV6nNjoQ4,8719
-tests/test_downloader.py,sha256=-V941RloByv3byiYefd1vt1aR7mWR6HuYEveBrZrZGA,4609
-tests/test_hardware_set.py,sha256=_UE1Q5ii9WP-LByIzKGThDMa4dBAQe41cI9B5fm9w_Y,4452
+tests/test_downloader.py,sha256=-d8MCPnBkd5WS0wqvmoICXvNAhEdPXr2JJXZRWoKPlw,4678
+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
@@ -124,8 +124,8 @@ 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.0.0b11.dist-info/METADATA,sha256=FLxrkHs_N6lYfjJHWbvd_U1pjM96NoaQGT2cQUn8Z-w,16139
-ciocore-8.0.0b11.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
-ciocore-8.0.0b11.dist-info/entry_points.txt,sha256=cCqcALMYbC4d8545V9w0Zysfg9MVuKWhzDQ2er4UfGE,47
-ciocore-8.0.0b11.dist-info/top_level.txt,sha256=SvlM5JlqULzAz00JZWfiUhfjhqDzYzSWssA87zdJl0o,14
-ciocore-8.0.0b11.dist-info/RECORD,,
+ciocore-8.0.0b14.dist-info/METADATA,sha256=ZEO52RjWMXBEL4NBymTzAWYBZRptAh_UwPSDzp_4Y2w,16208
+ciocore-8.0.0b14.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
+ciocore-8.0.0b14.dist-info/entry_points.txt,sha256=cCqcALMYbC4d8545V9w0Zysfg9MVuKWhzDQ2er4UfGE,47
+ciocore-8.0.0b14.dist-info/top_level.txt,sha256=SvlM5JlqULzAz00JZWfiUhfjhqDzYzSWssA87zdJl0o,14
+ciocore-8.0.0b14.dist-info/RECORD,,

tests/test_api_client.py

@@ -2,7 +2,7 @@
 
    isort:skip_file
 """
- 
+import sys
 import unittest
 
 try:
@@ -45,3 +45,63 @@ class ApiClientTest(unittest.TestCase):
             fn = api_client.get_creds_path(api_key=True).replace("\\", "/")
             self.assertEqual(fn, "/users/joebloggs/.config/conductor/api_key_credentials")
 
+
+class TestTruncateMiddle(unittest.TestCase):
+
+    def test_truncation_not_needed(self):
+        self.assertEqual(api_client.truncate_middle("short", 10), "short")
+
+    def test_truncation_with_even_max_length(self):
+        self.assertEqual(api_client.truncate_middle("1234567890ABCDEF", 8), "1234~DEF")
+
+    def test_truncation_with_odd_max_length(self):
+        self.assertEqual(api_client.truncate_middle("1234567890ABCDEF", 9), "1234~CDEF")
+
+    def test_empty_string(self):
+        self.assertEqual(api_client.truncate_middle("", 5), "")
+
+    def test_non_string_input(self):
+        with self.assertRaises(TypeError):
+            api_client.truncate_middle(12345, 5)
+
+class TestRegisterClient(unittest.TestCase):
+    USER_AGENT_MAX_PATH_LENGTH = 10  # Example max length for testing
+
+    @classmethod
+    def setUpClass(cls):
+        cls.original_executable = sys.executable
+        sys.executable = '/usr/bin/python3'  # Example path for testing
+
+    @classmethod
+    def tearDownClass(cls):
+        sys.executable = cls.original_executable
+
+    def test_register_client_with_version(self):
+        client_name = 'ApiClient'
+        client_version = '1.0'
+
+        with mock.patch('platform.python_version', return_value='3.8.2'), \
+             mock.patch('platform.system', return_value='Linux'), \
+             mock.patch('platform.release', return_value='5.4.0-42-generic'):
+            user_agent = api_client.ApiClient.register_client(client_name, client_version)
+
+        expected_user_agent = (
+            f"ApiClient/1.0 (python 3.8.2; Linux 5.4.0-42-generic; "
+        )
+        self.assertTrue(user_agent.startswith(expected_user_agent))
+
+    def test_register_client_without_version(self):
+        client_name = 'ApiClient'
+
+        with mock.patch('platform.python_version', return_value='3.8.2'), \
+             mock.patch('platform.system', return_value='Linux'), \
+             mock.patch('platform.release', return_value='5.4.0-42-generic'):
+            user_agent =  api_client.ApiClient.register_client(client_name)
+
+
+        expected_user_agent = (
+            f"ApiClient/unknown (python 3.8.2; Linux 5.4.0-42-generic; "
+        )
+
+        self.assertTrue(user_agent.startswith(expected_user_agent))
+

tests/test_common.py

@@ -10,14 +10,14 @@ 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_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):

tests/test_downloader.py

@@ -15,6 +15,7 @@ class TempFileTests(unittest.TestCase):
         # Create a temporary file and test if it exists
         with temp_file("tests/files/file.txt") as temp_path:
             self.assertTrue(os.path.exists(temp_path))
+            self.assertTrue(os.access(temp_path, os.W_OK & os.R_OK))
 
     def test_temp_file_overwrite_existing(self):
         # Test if existing file is overwritten by the temporary file

tests/test_hardware_set.py

@@ -3,7 +3,6 @@
    isort:skip_file
 """
 import unittest
- 
 
 
 from ciocore.hardware_set import HardwareSet
@@ -16,7 +15,12 @@ PROJECTS = [
 ]
 
 from package_fixtures import *
-from instance_type_fixtures import CW_INSTANCE_TYPES, AWS_INSTANCE_TYPES, CW_INSTANCE_TYPES_WITH_GPUS, ALL_INSTANCE_TYPES
+from instance_type_fixtures import (
+    CW_INSTANCE_TYPES,
+    AWS_INSTANCE_TYPES,
+    CW_INSTANCE_TYPES_WITH_GPUS,
+    ALL_INSTANCE_TYPES,
+)
 
 
 class TestCategorizedInstanceTypes(unittest.TestCase):
@@ -41,18 +45,20 @@ class TestCategorizedInstanceTypes(unittest.TestCase):
         self.assertIn("cw-a-4-16", extra_category_values)
 
     def test_category_names(self):
-        
-        names =  self.hs.labels()
+        names = self.hs.labels()
         self.assertEqual(names, ["low", "mid", "high", "extra"])
 
 
-
 class TestRecategorizeInstanceTypes(unittest.TestCase):
     def setUp(self):
         self.hs = HardwareSet(CW_INSTANCE_TYPES_WITH_GPUS)
-        
+
     def test_recategorize_cpu_gpu(self):
-        test_func = lambda x: [{'label': 'GPU', 'order': 2}] if "gpu" in x and x["gpu"] else [{'label': 'CPU', 'order': 1}]
+        test_func = (
+            lambda x: [{"label": "GPU", "order": 2}]
+            if "gpu" in x and x["gpu"]
+            else [{"label": "CPU", "order": 1}]
+        )
         self.hs.recategorize(test_func)
         self.assertEqual(self.hs.number_of_categories(), 2)
 
@@ -61,25 +67,23 @@ class TestRecategorizeInstanceTypes(unittest.TestCase):
         result = self.hs.find_all(test_func)
         self.assertEqual(len(result), 2)
         print(self.hs)
-        
+
     def test_find_first_by_condition(self):
-        test_func = lambda x: x[ "memory"] < 32
+        test_func = lambda x: x["memory"] < 32
         result = self.hs.find_first(test_func)
         self.assertTrue(result["memory"] < 32)
-        
+
     def test_find_category(self):
         label = "mid"
         result = self.hs.find_category(label)
-        self.assertEqual(result["label"] , label)
-        self.assertEqual(result["order"] , 2)
-        
-
+        self.assertEqual(result["label"], label)
+        self.assertEqual(result["order"], 2)
 
 
 class TestFind(unittest.TestCase):
     def setUp(self):
         self.hs = HardwareSet(CW_INSTANCE_TYPES_WITH_GPUS)
-        
+
     def test_find_unspecified_category(self):
         result = self.hs.find("cw-e-4-32")
         self.assertIsNotNone(result)
@@ -87,15 +91,16 @@ class TestFind(unittest.TestCase):
     def test_category_that_exists(self):
         result = self.hs.find("cw-e-4-32", category="high")
         self.assertIsNotNone(result)
-        
+
     def test_returns_none_if_not_in_category(self):
         result = self.hs.find("cw-e-4-32", category="low")
         self.assertIsNone(result)
-        
+
     def test_returns_none_if_non_existent_category(self):
         result = self.hs.find("cw-e-4-32", category="foo")
         self.assertIsNone(result)
-        
+
+
 class TestUncategorizedInstanceTypes(unittest.TestCase):
     def setUp(self):
         self.hs = HardwareSet(ALL_INSTANCE_TYPES)
@@ -109,28 +114,26 @@ class TestUncategorizedInstanceTypes(unittest.TestCase):
         self.assertEqual(
             result,
             [
-                'windows 4 core 26.0GB Mem',
-                'linux 4 core 27.0GB Mem',
-                'linux 8 core 30.0GB Mem',
-                'windows 32 core 208.0GB Mem',
-                'linux 32 core 208.0GB Mem',
-                'windows 64 core 416.0GB Mem',
-                'linux 64 core 416.0GB Mem'
+                "windows 4 core 26.0GB Mem",
+                "linux 4 core 27.0GB Mem",
+                "linux 8 core 30.0GB Mem",
+                "windows 32 core 208.0GB Mem",
+                "linux 32 core 208.0GB Mem",
+                "windows 64 core 416.0GB Mem",
+                "linux 64 core 416.0GB Mem",
             ],
         )
 
-        
-class TestProvider(unittest.TestCase):
 
+class TestProvider(unittest.TestCase):
     def test_gcp_provider(self):
         hs = HardwareSet(ALL_INSTANCE_TYPES)
         self.assertEqual(hs.provider, "gcp")
-        
+
     def test_cw_provider(self):
         hs = HardwareSet(CW_INSTANCE_TYPES_WITH_GPUS)
         self.assertEqual(hs.provider, "cw")
-        
+
     def test_aws_provider(self):
         hs = HardwareSet(AWS_INSTANCE_TYPES)
         self.assertEqual(hs.provider, "aws")
-