[@yorevs] Push for new revision

yorevs · Dec 6, 2024 · d37f6b1 · d37f6b1
1 parent 85e2194
commit d37f6b1
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 184 deletions.
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -4,10 +4,10 @@ run-name: Create Release
 on:
   push:
     tags:
-      - "[0-9]+.[0-9]+.[0-9]+"
-      - "[0-9]+.[0-9]+.[0-9]+a[0-9]+"
-      - "[0-9]+.[0-9]+.[0-9]+b[0-9]+"
-      - "[0-9]+.[0-9]+.[0-9]+rc[0-9]+"
+      - "v?[0-9]+.[0-9]+.[0-9]+"
+      - "v?[0-9]+.[0-9]+.[0-9]+a[0-9]+"
+      - "v?[0-9]+.[0-9]+.[0-9]+b[0-9]+"
+      - "v?[0-9]+.[0-9]+.[0-9]+rc[0-9]+"
 
 env:
   PACKAGE_NAME: "${vars.PACKAGE_NAME}"

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -51,7 +51,7 @@ jobs:
         with:
           python-version: ${{ vars.PYTHON_VERSION }}
       - name: Install Python tools
-        run: gradle installBuildTools ${{ inputs.gradle_debug_params }}
+        run: gradle installBuildTools build copyLicenseAndReadme ${{ inputs.gradle_debug_params }}
       - name: Publish
         id: publish-it
         run: |

diff --git 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.4/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/build.gradle b/build.gradle
@@ -40,7 +40,6 @@ ext {
 apply from: "${gradleDir}/dependencies.gradle"
 apply from: "${gradleDir}/python.gradle"
 apply from: "${gradleDir}/versioning.gradle"
-apply from: "${gradleDir}/pypi-publish.gradle"
 apply from: "${gradleDir}/docker.gradle"
 apply from: "${gradleDir}/docgen.gradle"
 apply from: "${gradleDir}/idea.gradle"

diff --git a/bumpver.toml b/bumpver.toml
@@ -1,5 +1,5 @@
 [bumpver]
-current_version = "1.2.4"
+current_version = "1.2.5"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "++version {old_version} -> {new_version}"
 commit = false

diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ author        = <B>H</B>ugo <B>S</B>aporetti <B>J</B>unior
 mailTo        = yorevs@hotmail.com
 siteUrl       = https://github.com/yorevs/askai
 app_name      = hspylib-askai
-app_version   = 1.2.4
+app_version   = 1.2.5
 
 # Build Tools
 buildTools    = setuptools, wheel, build, twine, bumpver, pipenv, isort, black, mypy, pylint, pdoc, pytest, PyInstaller
diff --git a/gradle/pypi-publish.gradle b/gradle/pypi-publish.gradle
diff --git a/gradle/python.gradle b/gradle/python.gradle
@@ -192,6 +192,17 @@ task syncPythonPackages(type: Task) {
   }
 }
 
+/* Copy LICENSE and README files into main folder */
+task copyLicenseAndReadme(type: Copy) {
+  group = 'Publish'
+  description = "Copy LICENSE file into main folder"
+  from(rootDir) {
+    include 'LICENSE*'
+    include 'README*'
+  }
+  into "${sourceRoot}/main"
+}
+
 /* Install module in editable mode (i.e. setuptools 'develop mode') */
 task installModule(type: Task) {
   group = 'Install'
@@ -330,7 +341,6 @@ task mypy(type: Task) {
 tasks.register('clean', Task) {
   group = 'Build'
   dependsOn cleanPython
-  dependsOn cleanDist
 }
 
 tasks.register('compile', Task) {

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
   name = "hspylib-askai"
-  version = "1.2.4"
+  version = "1.2.5"
   description = "HomeSetup - AskAI"
   authors = ["Hugo Saporetti Junior <yorevs@hotmail.com>"]
   license = "MIT"

diff --git a/src/main/askai/.version b/src/main/askai/.version
@@ -1 +1 @@
-1.2.4
+1.2.5
diff --git 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.4",
+    version="1.2.5",
     description="HomeSetup - AskAI",
     author="Hugo Saporetti Junior",
     author_email="yorevs@hotmail.com",