diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index bd35c297..eed9af18 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -120,7 +120,7 @@ jobs: uses: actions/download-artifact@v3 with: name: dist - path: dist/ + path: build/dist/ - name: Publish distribution to PyPI uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/bumpver.toml b/bumpver.toml index 4cd19dbc..f0d88a1d 100644 --- a/bumpver.toml +++ b/bumpver.toml @@ -2,9 +2,9 @@ current_version = "1.2.9" version_pattern = "MAJOR.MINOR.PATCH" commit_message = "++version {old_version} -> {new_version}" -commit = true -tag = true -push = true +commit = false +tag = false +push = false [bumpver.file_patterns] "bumpver.toml" = ['current_version = "{version}"'] diff --git a/gradle/pypi-publish.gradle b/gradle/pypi-publish.gradle index e6429868..e36933b7 100644 --- a/gradle/pypi-publish.gradle +++ b/gradle/pypi-publish.gradle @@ -97,8 +97,34 @@ task sdist(type: Task) { task publish(type: Task) { group = 'Publish' description = "Publish the module to PyPi repository" - dependsOn sdist - finalizedBy patchVersion + def out = new ByteArrayOutputStream() + exec { + commandLine 'git', 'log', '--pretty=format:%s', 'origin/master..HEAD' + standardOutput = out + } + def tag = "v${project.ext.app_version}" + def commit_logs = out.toString() + def prefix = commit_logs?.trim() ? commit_logs?.split('\n').size() + ' commits' : ' No commits' + def commitMsg = "New ${project.app_name} revision: '${tag}' >> ${prefix}" + println("Publishing ${project.app_name}...") + println("Revision commits: ${commitMsg} Tag?= ${tag}") + if (tag) { + exec { + commandLine 'git', 'tag', '-a', "${tag}", '-m', "New ${project.app_name} revision ${tag}" + } + exec { + commandLine 'git', 'push', 'origin', "${tag}" + } + } + exec { + commandLine 'git', 'add', '-A', ':/' + } + exec { + commandLine 'git', 'commit', '-m', "${commitMsg}" + } + exec { + commandLine 'git', 'push', 'origin', 'HEAD' + } } /* Show PyPi module details */ diff --git a/src/demo/__init__.py b/src/demo/__init__.py index ec726317..08696f2c 100644 --- a/src/demo/__init__.py +++ b/src/demo/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: demo """Package initialization.""" @@ -12,4 +12,4 @@ 'others', 'utils' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/demo/components/__init__.py b/src/demo/components/__init__.py index 379c5f01..3a0ef04f 100644 --- a/src/demo/components/__init__.py +++ b/src/demo/components/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: demo.components """Package initialization.""" @@ -14,4 +14,4 @@ 'vision_demo', 'webcam_demo' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/demo/devel/__init__.py b/src/demo/devel/__init__.py index df3d5a6d..e608643f 100644 --- a/src/demo/devel/__init__.py +++ b/src/demo/devel/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: demo.devel """Package initialization.""" @@ -10,4 +10,4 @@ 'gpt2_suggester', 'vision-tests' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/demo/features/__init__.py b/src/demo/features/__init__.py index 2b6f6dd5..72ffcac2 100644 --- a/src/demo/features/__init__.py +++ b/src/demo/features/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: demo.features """Package initialization.""" @@ -10,4 +10,4 @@ 'router_demo', 'tools' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/demo/features/rag/__init__.py b/src/demo/features/rag/__init__.py index 7e402580..e3e9894a 100644 --- a/src/demo/features/rag/__init__.py +++ b/src/demo/features/rag/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: demo.features.rag """Package initialization.""" @@ -8,4 +8,4 @@ __all__ = [ 'x_refs_demo' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/demo/features/tools/__init__.py b/src/demo/features/tools/__init__.py index 7d845624..9c1ce073 100644 --- a/src/demo/features/tools/__init__.py +++ b/src/demo/features/tools/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: demo.features.tools """Package initialization.""" @@ -8,4 +8,4 @@ __all__ = [ 'query_output_demo' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/demo/others/__init__.py b/src/demo/others/__init__.py index 5c860c31..685d005c 100644 --- a/src/demo/others/__init__.py +++ b/src/demo/others/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: demo.others """Package initialization.""" @@ -14,4 +14,4 @@ 'translate_demo', 'vision_model_demos' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/main/README.md b/src/main/README.md index 43173faa..b0f6958b 100644 --- a/src/main/README.md +++ b/src/main/README.md @@ -6,7 +6,7 @@ [![Terminal](https://badgen.net/badge/icon/terminal?icon=terminal&label)](https://github.com/yorevs/homesetup) [![License](https://badgen.net/badge/license/MIT/gray)](LICENSE.md) -[![Release](https://badgen.net/badge/release/v1.2.8/gray)](docs/CHANGELOG.md#unreleased) +[![Release](https://badgen.net/badge/release/v1.2.9/gray)](docs/CHANGELOG.md#unreleased) [![Donate](https://badgen.net/badge/paypal/donate/yellow)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=J5CDEFLF6M3H4) [![build-and-test](https://github.com/yorevs/askai/actions/workflows/build-and-test.yml/badge.svg)](https://github.com/yorevs/askai/actions/workflows/build-and-test.yml) diff --git a/src/main/__init__.py b/src/main/__init__.py index e7d0f1b4..19baa4be 100644 --- a/src/main/__init__.py +++ b/src/main/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: main """Package initialization.""" @@ -8,4 +8,4 @@ __all__ = [ 'askai' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/main/askai/__init__.py b/src/main/askai/__init__.py index c5c8aba6..f1d9890b 100644 --- a/src/main/askai/__init__.py +++ b/src/main/askai/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: main.askai """Package initialization.""" @@ -11,4 +11,4 @@ 'language', 'tui' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/main/askai/core/__init__.py b/src/main/askai/core/__init__.py index 350ba726..50d06bf2 100644 --- a/src/main/askai/core/__init__.py +++ b/src/main/askai/core/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: main.askai.core """Package initialization.""" @@ -22,4 +22,4 @@ 'router', 'support' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/main/askai/core/commander/__init__.py b/src/main/askai/core/commander/__init__.py index e7fa6e58..75a3a81d 100644 --- a/src/main/askai/core/commander/__init__.py +++ b/src/main/askai/core/commander/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: main.askai.core.commander """Package initialization.""" @@ -9,4 +9,4 @@ 'commander', 'commands' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/main/askai/core/commander/commands/__init__.py b/src/main/askai/core/commander/commands/__init__.py index c986ee6d..090be73e 100644 --- a/src/main/askai/core/commander/commands/__init__.py +++ b/src/main/askai/core/commander/commands/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: main.askai.core.commander.commands """Package initialization.""" @@ -13,4 +13,4 @@ 'settings_cmd', 'tts_stt_cmd' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/main/askai/core/component/__init__.py b/src/main/askai/core/component/__init__.py index 2007b809..1025fff6 100644 --- a/src/main/askai/core/component/__init__.py +++ b/src/main/askai/core/component/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: main.askai.core.component """Package initialization.""" @@ -18,4 +18,4 @@ 'summarizer', 'text_streamer' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/main/askai/core/engine/__init__.py b/src/main/askai/core/engine/__init__.py index b6cb177a..5ae10871 100644 --- a/src/main/askai/core/engine/__init__.py +++ b/src/main/askai/core/engine/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: main.askai.core.engine """Package initialization.""" @@ -12,4 +12,4 @@ 'engine_factory', 'openai' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/main/askai/core/engine/openai/__init__.py b/src/main/askai/core/engine/openai/__init__.py index ef7e5c40..38f1aa27 100644 --- a/src/main/askai/core/engine/openai/__init__.py +++ b/src/main/askai/core/engine/openai/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: main.askai.core.engine.openai """Package initialization.""" @@ -12,4 +12,4 @@ 'openai_vision', 'temperature' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/main/askai/core/enums/__init__.py b/src/main/askai/core/enums/__init__.py index ff66f849..8e04de4f 100644 --- a/src/main/askai/core/enums/__init__.py +++ b/src/main/askai/core/enums/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: main.askai.core.enums """Package initialization.""" @@ -12,4 +12,4 @@ 'run_modes', 'verbosity' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/main/askai/core/model/__init__.py b/src/main/askai/core/model/__init__.py index 1fbb6b15..44e4a671 100644 --- a/src/main/askai/core/model/__init__.py +++ b/src/main/askai/core/model/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: main.askai.core.model """Package initialization.""" @@ -16,4 +16,4 @@ 'search_result', 'summary_result' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/main/askai/core/processors/__init__.py b/src/main/askai/core/processors/__init__.py index 018097db..14681553 100644 --- a/src/main/askai/core/processors/__init__.py +++ b/src/main/askai/core/processors/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: main.askai.core.processors """Package initialization.""" @@ -14,4 +14,4 @@ 'splitter', 'task_splitter' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/main/askai/core/processors/splitter/__init__.py b/src/main/askai/core/processors/splitter/__init__.py index 1212c7e0..d5a0317a 100644 --- a/src/main/askai/core/processors/splitter/__init__.py +++ b/src/main/askai/core/processors/splitter/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: main.askai.core.processors.splitter """Package initialization.""" @@ -13,4 +13,4 @@ 'splitter_states', 'splitter_transitions' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/main/askai/core/router/__init__.py b/src/main/askai/core/router/__init__.py index 54908eaf..a467ca0a 100644 --- a/src/main/askai/core/router/__init__.py +++ b/src/main/askai/core/router/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: main.askai.core.router """Package initialization.""" @@ -12,4 +12,4 @@ 'task_agent', 'tools' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/main/askai/core/router/tools/__init__.py b/src/main/askai/core/router/tools/__init__.py index 7f396a9b..0c422872 100644 --- a/src/main/askai/core/router/tools/__init__.py +++ b/src/main/askai/core/router/tools/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: main.askai.core.router.tools """Package initialization.""" @@ -15,4 +15,4 @@ 'vision', 'webcam' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/main/askai/core/support/__init__.py b/src/main/askai/core/support/__init__.py index 41e64b02..17d37009 100644 --- a/src/main/askai/core/support/__init__.py +++ b/src/main/askai/core/support/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: main.askai.core.support """Package initialization.""" @@ -16,4 +16,4 @@ 'text_formatter', 'utilities' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/main/askai/exception/__init__.py b/src/main/askai/exception/__init__.py index 8fbf3ba7..4bea1afd 100644 --- a/src/main/askai/exception/__init__.py +++ b/src/main/askai/exception/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: main.askai.exception """Package initialization.""" @@ -8,4 +8,4 @@ __all__ = [ 'exceptions' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/main/askai/language/__init__.py b/src/main/askai/language/__init__.py index 0e2152cb..ca443fd5 100644 --- a/src/main/askai/language/__init__.py +++ b/src/main/askai/language/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: main.askai.language """Package initialization.""" @@ -10,4 +10,4 @@ 'language', 'translators' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/main/askai/language/translators/__init__.py b/src/main/askai/language/translators/__init__.py index 7d10a710..9aabefe8 100644 --- a/src/main/askai/language/translators/__init__.py +++ b/src/main/askai/language/translators/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: main.askai.language.translators """Package initialization.""" @@ -10,4 +10,4 @@ 'deepl_translator', 'marian_translator' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/main/askai/tui/__init__.py b/src/main/askai/tui/__init__.py index fb8861e0..36eeaab2 100644 --- a/src/main/askai/tui/__init__.py +++ b/src/main/askai/tui/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: main.askai.tui """Package initialization.""" @@ -12,4 +12,4 @@ 'app_widgets', 'askai_app' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/test/__init__.py b/src/test/__init__.py index e0a5c79c..56566cea 100644 --- a/src/test/__init__.py +++ b/src/test/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: test """Package initialization.""" @@ -10,4 +10,4 @@ 'fixtures', 'test_main' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/test/core/__init__.py b/src/test/core/__init__.py index 40e8b027..ebc46127 100644 --- a/src/test/core/__init__.py +++ b/src/test/core/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: test.core """Package initialization.""" @@ -9,4 +9,4 @@ 'model', 'support' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/test/core/model/__init__.py b/src/test/core/model/__init__.py index 9e9e90c6..d9c11ffd 100644 --- a/src/test/core/model/__init__.py +++ b/src/test/core/model/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: test.core.model """Package initialization.""" @@ -9,4 +9,4 @@ 'test_acc_response', 'test_action_plan' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/test/core/support/__init__.py b/src/test/core/support/__init__.py index 605c7ccb..398c361d 100644 --- a/src/test/core/support/__init__.py +++ b/src/test/core/support/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: test.core.support """Package initialization.""" @@ -8,4 +8,4 @@ __all__ = [ 'test_utilities' ] -__version__ = '1.2.8' +__version__ = '1.2.9' diff --git a/src/test/fixtures/__init__.py b/src/test/fixtures/__init__.py index 104b6c71..ab63c47c 100644 --- a/src/test/fixtures/__init__.py +++ b/src/test/fixtures/__init__.py @@ -1,6 +1,6 @@ # _*_ coding: utf-8 _*_ # -# hspylib-askai v1.2.8 +# hspylib-askai v1.2.9 # # Package: test.fixtures """Package initialization.""" @@ -9,4 +9,4 @@ 'acc_response_stubs', 'action_plan_stubs' ] -__version__ = '1.2.8' +__version__ = '1.2.9'