diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index fdbf446c..e9e2c4c2 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -2,6 +2,7 @@ name: create-release run-name: Create Release on: + workflow_dispatch: push: tags: - "v?[0-9]+.[0-9]+.[0-9]+" @@ -31,18 +32,21 @@ jobs: run: | if [ "${{ github.ref_type }}" = "tag" ]; then TAG_NAME=${GITHUB_REF#refs/tags/} - NEW_VERSION=$(echo $TAG_NAME | awk -F'-' '{print $1}') - SUFFIX=$(echo $TAG_NAME | grep -oP '[a-z]+[0-9]+' || echo "") - echo "new_version=$NEW_VERSION" >> "$GITHUB_OUTPUT" - echo "suffix=$SUFFIX" >> "$GITHUB_OUTPUT" - echo "tag_name=$TAG_NAME" >> "$GITHUB_OUTPUT" - echo "Version is $NEW_VERSION" - echo "Suffix is $SUFFIX" - echo "Tag name is $TAG_NAME" else - echo "No tags found" - exit 1 + TAG_NAME="$(git tag | tail -n1)" + if [ -z "${TAG_NAME}" ]; then + echo "No tags found" + exit 1 + fi fi + NEW_VERSION=$(echo $TAG_NAME | awk -F'-' '{print $1}') + SUFFIX=$(echo $TAG_NAME | grep -oP '[a-z]+[0-9]+' || echo "") + echo "new_version=$NEW_VERSION" >> "$GITHUB_OUTPUT" + echo "suffix=$SUFFIX" >> "$GITHUB_OUTPUT" + echo "tag_name=$TAG_NAME" >> "$GITHUB_OUTPUT" + echo "Version is $NEW_VERSION" + echo "Suffix is $SUFFIX" + echo "Tag name is $TAG_NAME" check_pypi: needs: details @@ -91,7 +95,7 @@ jobs: with: python-version: ${{ vars.PYTHON_VERSION }} - name: Install Python tools - run: gradle installBuildTools installModule ${{ gradle_debug_params }} + run: gradle installBuildTools installModule - name: Upload artifacts uses: actions/upload-artifact@v3 with: diff --git a/README.md b/README.md index 069142d5..139929e3 100644 --- a/README.md +++ b/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.5/gray)](docs/CHANGELOG.md#unreleased) +[![Release](https://badgen.net/badge/release/v1.2.6/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/bumpver.toml b/bumpver.toml index fb5c4dff..87472b58 100644 --- a/bumpver.toml +++ b/bumpver.toml @@ -1,5 +1,5 @@ [bumpver] -current_version = "1.2.5" +current_version = "1.2.6" version_pattern = "MAJOR.MINOR.PATCH" commit_message = "++version {old_version} -> {new_version}" commit = false diff --git a/gradle.properties b/gradle.properties index 1d412af1..696b68c3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ author = Hugo Saporetti Junior mailTo = yorevs@hotmail.com siteUrl = https://github.com/yorevs/askai app_name = hspylib-askai -app_version = 1.2.5 +app_version = 1.2.6 # Build Tools buildTools = setuptools, wheel, build, twine, bumpver, pipenv, isort, black, mypy, pylint, pdoc, pytest, PyInstaller diff --git a/pyproject.toml b/pyproject.toml index 3487a7f2..33618098 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "hspylib-askai" - version = "1.2.5" + version = "1.2.6" description = "HomeSetup - AskAI" authors = ["Hugo Saporetti Junior "] license = "MIT" diff --git a/src/main/README.md b/src/main/README.md index 96cf77fc..069142d5 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.3/gray)](docs/CHANGELOG.md#unreleased) +[![Release](https://badgen.net/badge/release/v1.2.5/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/askai/.version b/src/main/askai/.version index c813fe11..3c43790f 100644 --- a/src/main/askai/.version +++ b/src/main/askai/.version @@ -1 +1 @@ -1.2.5 +1.2.6 diff --git a/src/main/requirements.txt b/src/main/requirements.txt deleted file mode 100644 index b0fdb764..00000000 --- a/src/main/requirements.txt +++ /dev/null @@ -1,49 +0,0 @@ -###### AUTO-GENERATED Requirements file for: AskAI ###### - -hspylib>=1.12.53 -hspylib-clitt>=0.9.140 -hspylib-setman>=0.10.43 -retry2==0.9.5 -pause==0.3 -tqdm==4.66.5 -pyperclip==1.9.0 -python-magic==0.4.27 -pytz==2024.2 -transitions==0.9.2 -pydantic==2.10.2 -langchain==0.3.9 -langchain-openai>=0.2.10 -langchain-community==0.3.8 -langchain-google-community==2.0.3 -openai-whisper==20240930 -openai==1.55.3 -google-api-python-client==2.154.0 -fake_useragent==1.5.1 -requests==2.32.3 -urllib3==2.2.3 -protobuf==4.25.4 -aiohttp==3.10.5 -html2text==2024.2.26 -rich==13.8.1 -textual==0.87.1 -soundfile==0.12.1 -PyAudio==0.2.14 -SpeechRecognition==3.10.4 -opencv-python==4.10.0.84 -pyautogui==0.9.54 -torch>=2.2.2 -torchvision>=0.17.2 -open-clip-torch -opentelemetry-api==1.27.0 -opentelemetry-sdk==1.27.0 -opentelemetry-proto==1.27.0 -transformers==4.45.2 -unstructured==0.16.0 -unstructured[md]==0.16.0 -tiktoken==0.8.0 -stanza==1.1.1 -nltk==3.9.1 -faiss-cpu~=1.8.0 -chromadb==0.5.5 -deepl==1.18.0 -argostranslate==1.9.1 diff --git a/src/main/setup.py b/src/main/setup.py index 66272ee9..01bc04d5 100644 --- a/src/main/setup.py +++ b/src/main/setup.py @@ -31,7 +31,7 @@ # This call to setup() does all the work setuptools.setup( name="hspylib-askai", - version="1.2.5", + version="1.2.6", description="HomeSetup - AskAI", author="Hugo Saporetti Junior", author_email="yorevs@hotmail.com",