diff --git a/apptools/persistence/tests/test_file_path.py b/apptools/persistence/tests/test_file_path.py index eeeb0856..dac6206d 100644 --- a/apptools/persistence/tests/test_file_path.py +++ b/apptools/persistence/tests/test_file_path.py @@ -19,7 +19,10 @@ from io import BytesIO # 3rd party imports. -from importlib_resources import files +try: + from importlib.resources import files +except ImportError: + from importlib_resources import files from apptools._testing.optional_dependencies import ( numpy as np, diff --git a/apptools/preferences/tests/test_preference_binding.py b/apptools/preferences/tests/test_preference_binding.py index adc27514..d222a0ce 100644 --- a/apptools/preferences/tests/test_preference_binding.py +++ b/apptools/preferences/tests/test_preference_binding.py @@ -17,7 +17,10 @@ from os.path import join # Major package imports. -from importlib_resources import files +try: + from importlib.resources import files +except ImportError: + from importlib_resources import files # Enthought library imports. from apptools.preferences.api import Preferences diff --git a/apptools/preferences/tests/test_preferences.py b/apptools/preferences/tests/test_preferences.py index 7203ee80..5031e971 100644 --- a/apptools/preferences/tests/test_preferences.py +++ b/apptools/preferences/tests/test_preferences.py @@ -17,7 +17,10 @@ from os.path import join # Major package imports. -from importlib_resources import files +try: + from importlib.resources import files +except ImportError: + from importlib_resources import files # Enthought library imports. from apptools.preferences.api import Preferences diff --git a/apptools/preferences/tests/test_preferences_helper.py b/apptools/preferences/tests/test_preferences_helper.py index e89c71f0..d735f59b 100644 --- a/apptools/preferences/tests/test_preferences_helper.py +++ b/apptools/preferences/tests/test_preferences_helper.py @@ -17,7 +17,10 @@ import unittest # Major package imports. -from importlib_resources import files +try: + from importlib.resources import files +except ImportError: + from importlib_resources import files # Enthought library imports. from apptools.preferences.api import Preferences, PreferencesHelper diff --git a/apptools/preferences/tests/test_py_config_file.py b/apptools/preferences/tests/test_py_config_file.py index d28e7c2d..b7e04870 100644 --- a/apptools/preferences/tests/test_py_config_file.py +++ b/apptools/preferences/tests/test_py_config_file.py @@ -17,7 +17,10 @@ from os.path import join # Major package imports. -from importlib_resources import files +try: + from importlib.resources import files +except ImportError: + from importlib_resources import files # Enthought library imports. from .py_config_file import PyConfigFile diff --git a/apptools/preferences/tests/test_scoped_preferences.py b/apptools/preferences/tests/test_scoped_preferences.py index 39cd665a..4c038ba5 100644 --- a/apptools/preferences/tests/test_scoped_preferences.py +++ b/apptools/preferences/tests/test_scoped_preferences.py @@ -16,7 +16,10 @@ from os.path import join # Major package imports. -from importlib_resources import files +try: + from importlib.resources import files +except ImportError: + from importlib_resources import files # Enthought library imports. from apptools.preferences.api import Preferences, ScopedPreferences diff --git a/setup.py b/setup.py index 3ef0bfa0..8cd0b9e5 100644 --- a/setup.py +++ b/setup.py @@ -308,7 +308,7 @@ def get_long_description(): ], extras_require={ "test": [ - "importlib-resources>=1.1.0", + "importlib-resources>=1.1.0; python_version<'3.9'", ], "h5": [ "numpy",