diff --git a/tutor-contrib-harmony-plugin/setup.py b/tutor-contrib-harmony-plugin/setup.py index 415c984..87050e4 100644 --- a/tutor-contrib-harmony-plugin/setup.py +++ b/tutor-contrib-harmony-plugin/setup.py @@ -39,8 +39,8 @@ def load_about(): long_description=load_readme(), packages=find_packages(exclude=["tests*"]), include_package_data=True, - python_requires=">=3.7", - install_requires=["tutor>=16.0.0,<17.0.0"], + python_requires=">=3.8", + install_requires=["tutor>=17.0.0,<18.0.0"], entry_points={ "tutor.plugin.v1": [ "k8s_harmony = tutor_k8s_harmony_plugin.plugin", @@ -52,7 +52,6 @@ def load_about(): "License :: OSI Approved :: GNU Affero General Public License v3", "Operating System :: OS Independent", "Programming Language :: Python", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", diff --git a/tutor-contrib-harmony-plugin/tutor_k8s_harmony_plugin/__about__.py b/tutor-contrib-harmony-plugin/tutor_k8s_harmony_plugin/__about__.py index d3ec452..a08b09c 100644 --- a/tutor-contrib-harmony-plugin/tutor_k8s_harmony_plugin/__about__.py +++ b/tutor-contrib-harmony-plugin/tutor_k8s_harmony_plugin/__about__.py @@ -1 +1 @@ -__version__ = "0.2.0" +__version__ = "17.0.0" diff --git a/tutor-contrib-harmony-plugin/tutor_k8s_harmony_plugin/plugin.py b/tutor-contrib-harmony-plugin/tutor_k8s_harmony_plugin/plugin.py index 4d890d6..ff04423 100644 --- a/tutor-contrib-harmony-plugin/tutor_k8s_harmony_plugin/plugin.py +++ b/tutor-contrib-harmony-plugin/tutor_k8s_harmony_plugin/plugin.py @@ -2,7 +2,7 @@ from glob import glob import pkg_resources -from tutor import hooks +from tutor import hooks as tutor_hooks from . import commands from .__about__ import __version__ @@ -38,12 +38,12 @@ } # Load all configuration entries -hooks.Filters.CONFIG_DEFAULTS.add_items( +tutor_hooks.Filters.CONFIG_DEFAULTS.add_items( [(f"K8S_HARMONY_{key}", value) for key, value in config["defaults"].items()] ) -hooks.Filters.CONFIG_OVERRIDES.add_items(list(config["overrides"].items())) -hooks.Filters.CONFIG_UNIQUE.add_items(list(config["unique"].items())) +tutor_hooks.Filters.CONFIG_OVERRIDES.add_items(list(config["overrides"].items())) +tutor_hooks.Filters.CONFIG_UNIQUE.add_items(list(config["unique"].items())) # Load all patches from the "patches" folder for path in glob( @@ -53,6 +53,6 @@ ) ): with open(path, encoding="utf-8") as patch_file: - hooks.Filters.ENV_PATCHES.add_item((os.path.basename(path), patch_file.read())) + tutor_hooks.Filters.ENV_PATCHES.add_item((os.path.basename(path), patch_file.read())) -hooks.Filters.CLI_COMMANDS.add_item(commands.harmony) +tutor_hooks.Filters.CLI_COMMANDS.add_item(commands.harmony)