Merge pull request #93 from OpenVoiceOS/release-1.1.15a1

Release 1.1.15a1

Author: JarbasAl

CHANGELOG.md

@@ -1,37 +1,12 @@
 # Changelog
 
-## [1.1.14a4](https://github.com/OpenVoiceOS/ovos-ocp-pipeline-plugin/tree/1.1.14a4) (2025-06-07)
+## [1.1.15a1](https://github.com/OpenVoiceOS/ovos-ocp-pipeline-plugin/tree/1.1.15a1) (2025-06-08)
 
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-pipeline-plugin/compare/1.1.14a3...1.1.14a4)
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-pipeline-plugin/compare/1.1.14...1.1.15a1)
 
 **Merged pull requests:**
 
-- nl-nl translation [\#90](https://github.com/OpenVoiceOS/ovos-ocp-pipeline-plugin/pull/90) ([gitlocalize-app[bot]](https://github.com/apps/gitlocalize-app))
-- nl-nl translation [\#89](https://github.com/OpenVoiceOS/ovos-ocp-pipeline-plugin/pull/89) ([gitlocalize-app[bot]](https://github.com/apps/gitlocalize-app))
-
-## [1.1.14a3](https://github.com/OpenVoiceOS/ovos-ocp-pipeline-plugin/tree/1.1.14a3) (2025-06-07)
-
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-pipeline-plugin/compare/1.1.14a2...1.1.14a3)
-
-**Merged pull requests:**
-
-- nl-nl translation [\#87](https://github.com/OpenVoiceOS/ovos-ocp-pipeline-plugin/pull/87) ([gitlocalize-app[bot]](https://github.com/apps/gitlocalize-app))
-
-## [1.1.14a2](https://github.com/OpenVoiceOS/ovos-ocp-pipeline-plugin/tree/1.1.14a2) (2025-06-05)
-
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-pipeline-plugin/compare/1.1.14a1...1.1.14a2)
-
-**Merged pull requests:**
-
-- gl/translate [\#85](https://github.com/OpenVoiceOS/ovos-ocp-pipeline-plugin/pull/85) ([gitlocalize-app[bot]](https://github.com/apps/gitlocalize-app))
-
-## [1.1.14a1](https://github.com/OpenVoiceOS/ovos-ocp-pipeline-plugin/tree/1.1.14a1) (2025-06-04)
-
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-pipeline-plugin/compare/1.1.13...1.1.14a1)
-
-**Merged pull requests:**
-
-- gl/translate [\#83](https://github.com/OpenVoiceOS/ovos-ocp-pipeline-plugin/pull/83) ([gitlocalize-app[bot]](https://github.com/apps/gitlocalize-app))
+- fix: compatibility with ovos-workshop 7.X.X and ovos-plugin-manager 1.X.X [\#92](https://github.com/OpenVoiceOS/ovos-ocp-pipeline-plugin/pull/92) ([JarbasAl](https://github.com/JarbasAl))
 
 
 

ocp_pipeline/opm.py

@@ -14,7 +14,7 @@
 from ovos_bus_client.session import SessionManager
 from ovos_config import Configuration
 from ovos_plugin_manager.ocp import available_extractors
-from ovos_plugin_manager.templates.pipeline import IntentHandlerMatch, ConfidenceMatcherPipeline, PipelineStageMatcher
+from ovos_plugin_manager.templates.pipeline import IntentHandlerMatch, ConfidenceMatcherPipeline, PipelinePlugin
 from ovos_utils.lang import standardize_lang_tag, get_language_dir
 from ovos_utils.log import LOG, deprecated, log_deprecation
 from ovos_utils.fakebus import FakeBus
@@ -1208,12 +1208,12 @@ def match_legacy(self, utterances: List[str], lang: str, message: Message = None
         return MycroftCPSLegacyPipeline(self.bus, self.config).match(utterances, lang, message)
 
 
-class MycroftCPSLegacyPipeline(PipelineStageMatcher, OVOSAbstractApplication):
+class MycroftCPSLegacyPipeline(PipelinePlugin, OVOSAbstractApplication):
     def __init__(self, bus: Optional[Union[MessageBusClient, FakeBus]] = None,
                  config: Optional[Dict] = None):
         OVOSAbstractApplication.__init__(self, bus=bus or FakeBus(),
                                          skill_id=OCP_ID, resources_dir=f"{dirname(__file__)}")
-        PipelineStageMatcher.__init__(self, bus, config)
+        PipelinePlugin.__init__(self, bus, config)
         self.mycroft_cps = LegacyCommonPlay(self.bus)
         OCPPipelineMatcher.load_intent_files()
         self.add_event("ocp:legacy_cps", self.handle_legacy_cps, is_intent=True)

ocp_pipeline/version.py

@@ -1,6 +1,6 @@
 # START_VERSION_BLOCK
 VERSION_MAJOR = 1
 VERSION_MINOR = 1
-VERSION_BUILD = 14
-VERSION_ALPHA = 0
+VERSION_BUILD = 15
+VERSION_ALPHA = 1
 # END_VERSION_BLOCK

requirements.txt

@@ -1,4 +1,4 @@
-ovos-workshop>=0.1.7,<4.0.0
+ovos-workshop>=0.1.7,<8.0.0
 ovos-classifiers
 ovos-utils[extras]>=0.3.5,<1.0.0
-ovos-plugin-manager>=0.5.0,<1.0.0
+ovos-plugin-manager>=1.0.0,<2.0.0