remove deprecated env var

Author: pjbull

cloudpathlib/enums.py

@@ -1,5 +1,4 @@
 from enum import Enum
-import warnings
 import os
 from typing import Optional
 
@@ -38,25 +37,7 @@ def from_environment(cls) -> Optional["FileCacheMode"]:
         """
 
         env_string = os.environ.get("CLOUDPATHLIB_FILE_CACHE_MODE", "").lower()
-        env_string_typo = os.environ.get("CLOUPATHLIB_FILE_CACHE_MODE", "").lower()
-
-        if env_string_typo:
-            warnings.warn(
-                "envvar CLOUPATHLIB_FILE_CACHE_MODE has been renamed to "
-                "CLOUDPATHLIB_FILE_CACHE_MODE. Reading from the old value "
-                "will become deprecated in version 0.20.0",
-                DeprecationWarning,
-            )
-
-        if env_string and env_string_typo and env_string != env_string_typo:
-            warnings.warn(
-                "CLOUDPATHLIB_FILE_CACHE_MODE and CLOUPATHLIB_FILE_CACHE_MODE "
-                "envvars set to different values. Disregarding old value and "
-                f"using CLOUDPATHLIB_FILE_CACHE_MODE = {env_string}",
-                RuntimeWarning,
-            )
-
-        env_string = env_string or env_string_typo
+
         if not env_string:
             return None
         else:

tests/test_caching.py

@@ -282,43 +282,6 @@ def test_string_instantiation(rig: CloudProviderTestRig, tmpdir):
         assert client.file_cache_mode == v
 
 
-def test_environment_variable_contentious_instantiation(rig: CloudProviderTestRig, tmpdir):
-    # environment instantiation
-    original_typo_env_setting = os.environ.get("CLOUPATHLIB_FILE_CACHE_MODE", "")
-    original_env_setting = os.environ.get("CLOUDPATHLIB_FILE_CACHE_MODE", "")
-
-    v_old = FileCacheMode.persistent
-    try:
-        for v in FileCacheMode:
-            os.environ["CLOUPATHLIB_FILE_CACHE_MODE"] = v_old.value
-            os.environ["CLOUDPATHLIB_FILE_CACHE_MODE"] = v.value
-            local = tmpdir if v == FileCacheMode.persistent else None
-            client = rig.client_class(local_cache_dir=local, **rig.required_client_kwargs)
-            assert client.file_cache_mode == v
-
-    finally:
-        os.environ["CLOUPATHLIB_FILE_CACHE_MODE"] = original_typo_env_setting
-        os.environ["CLOUDPATHLIB_FILE_CACHE_MODE"] = original_env_setting
-
-
-def test_environment_variable_old_instantiation(rig: CloudProviderTestRig, tmpdir):
-    # environment instantiation
-    original_typo_env_setting = os.environ.get("CLOUPATHLIB_FILE_CACHE_MODE", "")
-    original_env_setting = os.environ.get("CLOUDPATHLIB_FILE_CACHE_MODE", "")
-
-    try:
-        os.environ["CLOUDPATHLIB_FILE_CACHE_MODE"] = ""
-        for v in FileCacheMode:
-            os.environ["CLOUPATHLIB_FILE_CACHE_MODE"] = v.value
-            local = tmpdir if v == FileCacheMode.persistent else None
-            client = rig.client_class(local_cache_dir=local, **rig.required_client_kwargs)
-            assert client.file_cache_mode == v
-
-    finally:
-        os.environ["CLOUPATHLIB_FILE_CACHE_MODE"] = original_typo_env_setting
-        os.environ["CLOUDPATHLIB_FILE_CACHE_MODE"] = original_env_setting
-
-
 def test_environment_variable_instantiation(rig: CloudProviderTestRig, tmpdir):
     # environment instantiation
     original_env_setting = os.environ.get("CLOUDPATHLIB_FILE_CACHE_MODE", "")