testcloud 0.12.0__tar.gz → 0.13.0__tar.gz

{testcloud-0.12.0 → testcloud-0.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: testcloud
-Version: 0.12.0
+Version: 0.13.0
 Summary: A tool to download and boot cloud images locally, with an easy to use API.
 Project-URL: Homepage, https://github.com/teemtee/testcloud
 Author-email: Mike Ruckman <roshi@fedoraproject.org>
@@ -457,6 +457,10 @@ The release process can be summed up to these steps:
 
 ### Releases
 
+#### 0.13.0
+
+* Better test for requests-cache presence and enablement
+
 #### 0.12.0
 
 * Add support for the RISC-V architecture

{testcloud-0.12.0 → testcloud-0.13.0}/README.md

@@ -439,6 +439,10 @@ The release process can be summed up to these steps:
 
 ### Releases
 
+#### 0.13.0
+
+* Better test for requests-cache presence and enablement
+
 #### 0.12.0
 
 * Add support for the RISC-V architecture

{testcloud-0.12.0 → testcloud-0.13.0}/testcloud/distro_utils/misc.py

@@ -14,6 +14,17 @@ config_data = config.get_config()
 log = logging.getLogger("testcloud.util")
 
 
+_HAS_REQUESTS_SESSION_CACHE = False
+
+try:
+    import requests_cache
+
+    _HAS_REQUESTS_SESSION_CACHE = True
+
+except ImportError:
+    pass
+
+
 def parse_latest_qcow(rule: str, url: str) -> str:
     session = get_requests_session()
 
@@ -27,12 +38,7 @@ def parse_latest_qcow(rule: str, url: str) -> str:
 
 
 def get_requests_session():
-    try:
-        assert config_data.CACHE_IMAGES
-        import requests_cache
-
-        assert Version(requests_cache.__version__) >= Version("1.2")
-
+    if config_data.CACHE_IMAGES and _HAS_REQUESTS_SESSION_CACHE:
         log.debug("Using local image url cache...")
         return requests_cache.CachedSession(
             cache_name="{}/testcloud_image_resolve_cache".format(config_data.DATA_DIR),
@@ -40,6 +46,6 @@ def get_requests_session():
             stale_if_error=True,
             expire_after=config_data.TRUST_DEADLINE * 60 * 60 * 24,
         )
-    except (ImportError, AssertionError):
-        log.debug("Not using local image url cache due to config or unmet dependencies...")
-        return requests.Session()
+
+    log.debug("Not using local image url cache due to config or unmet dependencies...")
+    return requests.Session()