From 73cda2d9f35c33c420701f944df4d24f8db134d7 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Sun, 21 Jan 2024 22:45:29 +0000 Subject: [PATCH 1/8] Prepare Next Version --- ovos_tts_plugin_piper/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovos_tts_plugin_piper/version.py b/ovos_tts_plugin_piper/version.py index 3372f11..6df8531 100644 --- a/ovos_tts_plugin_piper/version.py +++ b/ovos_tts_plugin_piper/version.py @@ -3,6 +3,6 @@ # START_VERSION_BLOCK VERSION_MAJOR = 0 VERSION_MINOR = 0 -VERSION_BUILD = 1 +VERSION_BUILD = 2 VERSION_ALPHA = 0 # END_VERSION_BLOCK From 6ba8c1752f14fd3ee4730bf0de010e09bcf42c26 Mon Sep 17 00:00:00 2001 From: David Blencowe Date: Sun, 21 Jan 2024 23:06:30 +0000 Subject: [PATCH 2/8] feat: upgrade to piper-tts 1.2.0 and remove support for Python < 3.9 (#22) Co-authored-by: JarbasAI <33701864+JarbasAl@users.noreply.github.com> --- .github/workflows/unit_tests.yml | 2 +- requirements.txt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index b086a6b..c22e4fd 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -35,7 +35,7 @@ jobs: strategy: max-parallel: 2 matrix: - python-version: [ 3.7, 3.8, 3.9, "3.10" ] + python-version: [ 3.9, "3.10" ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/requirements.txt b/requirements.txt index 442362e..4423924 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ ovos-plugin-manager>=0.0.5 -piper-phonemize~=1.0.0 -piper-tts==1.1.0 \ No newline at end of file +piper-tts==1.2.0 From 9766e71c7f31d529894cb8a269c4375d0cb13117 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Sun, 21 Jan 2024 23:07:09 +0000 Subject: [PATCH 3/8] Increment Version --- CHANGELOG.md | 12 ++++++++++++ ovos_tts_plugin_piper/version.py | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b69436c..248afce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [Unreleased](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/tree/HEAD) + +[Full Changelog](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/compare/V0.0.1...HEAD) + +**Merged pull requests:** + +- feat: upgrade to piper-tts 1.2.0 and remove support for Python \< 3.9 [\#22](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/pull/22) ([dblencowe](https://github.com/dblencowe)) + +## [V0.0.1](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/tree/V0.0.1) (2024-01-21) + +[Full Changelog](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/compare/V0.0.1a11...V0.0.1) + ## [V0.0.1a11](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/tree/V0.0.1a11) (2024-01-21) [Full Changelog](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/compare/V0.0.1a10...V0.0.1a11) diff --git a/ovos_tts_plugin_piper/version.py b/ovos_tts_plugin_piper/version.py index 6df8531..573f54d 100644 --- a/ovos_tts_plugin_piper/version.py +++ b/ovos_tts_plugin_piper/version.py @@ -4,5 +4,5 @@ VERSION_MAJOR = 0 VERSION_MINOR = 0 VERSION_BUILD = 2 -VERSION_ALPHA = 0 +VERSION_ALPHA = 1 # END_VERSION_BLOCK From 708d82f6e6db8462b62347959760b8c6e3903540 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Sun, 28 Jan 2024 13:45:53 +0000 Subject: [PATCH 4/8] Create dependabot.yml --- .github/dependabot.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..9d866e3 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file + +version: 2 +updates: + - package-ecosystem: "pip" # See documentation for possible values + directory: "/" # Location of package manifests + schedule: + interval: "weekly" From d33c5cc3a6deaf0150c20fdaa0f0e1298ee62f53 Mon Sep 17 00:00:00 2001 From: Gavin Morgan Date: Sun, 28 Apr 2024 21:51:28 -0700 Subject: [PATCH 5/8] readme.md links to OpenVoiceOS.org (#24) I came to this repo from rhasspy/piper, looking for ways to maximally utilize my GPU, and lacked context to recognize the meaning of "OVOS". --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 0db55d4..e417a47 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,6 @@ ## Description -OVOS TTS plugin for [piper](https://github.com/rhasspy/piper) +[OpenVoiceOS (OVOS)](https://openvoiceos.org) TTS plugin for [piper](https://github.com/rhasspy/piper) ## Install From c2fcaeda0a83cfe9c87fdf2bf98d96538338cd2f Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Thu, 12 Sep 2024 11:34:39 +0100 Subject: [PATCH 6/8] feat:semver (#29) --- .github/workflows/conventional-label.yaml | 10 ++ .github/workflows/dev2master.yml | 20 ---- .github/workflows/docker_tests.yml | 15 --- .github/workflows/license_tests.yml | 35 ------- .github/workflows/publish_alpha.yml | 72 --------------- .github/workflows/publish_build.yml | 76 --------------- .github/workflows/publish_major.yml | 76 --------------- .github/workflows/publish_minor.yml | 76 --------------- .github/workflows/publish_stable.yml | 58 ++++++++++++ .github/workflows/release_workflow.yml | 108 ++++++++++++++++++++++ .github/workflows/unit_tests.yml | 72 --------------- readme.md => README.md | 0 scripts/bump_alpha.py | 17 ---- scripts/bump_build.py | 20 ---- scripts/bump_major.py | 26 ------ scripts/bump_minor.py | 23 ----- scripts/remove_alpha.py | 12 --- 17 files changed, 176 insertions(+), 540 deletions(-) create mode 100644 .github/workflows/conventional-label.yaml delete mode 100644 .github/workflows/dev2master.yml delete mode 100644 .github/workflows/docker_tests.yml delete mode 100644 .github/workflows/license_tests.yml delete mode 100644 .github/workflows/publish_alpha.yml delete mode 100644 .github/workflows/publish_build.yml delete mode 100644 .github/workflows/publish_major.yml delete mode 100644 .github/workflows/publish_minor.yml create mode 100644 .github/workflows/publish_stable.yml create mode 100644 .github/workflows/release_workflow.yml delete mode 100644 .github/workflows/unit_tests.yml rename readme.md => README.md (100%) delete mode 100644 scripts/bump_alpha.py delete mode 100644 scripts/bump_build.py delete mode 100644 scripts/bump_major.py delete mode 100644 scripts/bump_minor.py delete mode 100644 scripts/remove_alpha.py diff --git a/.github/workflows/conventional-label.yaml b/.github/workflows/conventional-label.yaml new file mode 100644 index 0000000..0a449cb --- /dev/null +++ b/.github/workflows/conventional-label.yaml @@ -0,0 +1,10 @@ +# auto add labels to PRs +on: + pull_request_target: + types: [ opened, edited ] +name: conventional-release-labels +jobs: + label: + runs-on: ubuntu-latest + steps: + - uses: bcoe/conventional-release-labels@v1 \ No newline at end of file diff --git a/.github/workflows/dev2master.yml b/.github/workflows/dev2master.yml deleted file mode 100644 index cc76fee..0000000 --- a/.github/workflows/dev2master.yml +++ /dev/null @@ -1,20 +0,0 @@ -# This workflow will generate a distribution and upload it to PyPI - -name: Push dev -> master -on: - workflow_dispatch: - -jobs: - build_and_publish: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. - ref: dev - - name: Push dev -> master - uses: ad-m/github-push-action@master - - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: master \ No newline at end of file diff --git a/.github/workflows/docker_tests.yml b/.github/workflows/docker_tests.yml deleted file mode 100644 index a29f663..0000000 --- a/.github/workflows/docker_tests.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: Run Build Tests -on: - push: - workflow_dispatch: - -jobs: - docker_build_tests: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - ref: ${{ github.head_ref }} - - uses: docker-practice/actions-setup-docker@master - - run: | - sudo docker build . -t ovosttsserver diff --git a/.github/workflows/license_tests.yml b/.github/workflows/license_tests.yml deleted file mode 100644 index 561e773..0000000 --- a/.github/workflows/license_tests.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Run License Tests -on: - push: - workflow_dispatch: - -jobs: - license_tests: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - ref: ${{ github.head_ref }} - - name: Setup Python - uses: actions/setup-python@v1 - with: - python-version: 3.8 - - name: Install Build Tools - run: | - python -m pip install build wheel - - name: Install System Dependencies - run: | - sudo apt-get update - sudo apt install python3-dev swig libssl-dev - - name: Install core repo - run: | - pip install . - - name: Install licheck - run: | - pip install git+https://github.com/NeonJarbas/lichecker - - name: Install test dependencies - run: | - pip install pytest pytest-timeout pytest-cov - - name: Test Licenses - run: | - pytest test/license_tests.py \ No newline at end of file diff --git a/.github/workflows/publish_alpha.yml b/.github/workflows/publish_alpha.yml deleted file mode 100644 index 47f1e6d..0000000 --- a/.github/workflows/publish_alpha.yml +++ /dev/null @@ -1,72 +0,0 @@ -# This workflow will generate a distribution and upload it to PyPI - -name: Publish Alpha Build ...aX -on: - push: - branches: - - dev - paths-ignore: - - 'ovos_tts_plugin_piper/version.py' - - 'test/**' - - 'examples/**' - - '.github/**' - - '.gitignore' - - 'LICENSE' - - 'CHANGELOG.md' - - 'MANIFEST.in' - - 'readme.md' - - 'scripts/**' - workflow_dispatch: - -jobs: - build_and_publish: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - ref: dev - fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. - - name: Setup Python - uses: actions/setup-python@v1 - with: - python-version: 3.8 - - name: Install Build Tools - run: | - python -m pip install build wheel - - name: Increment Version - run: | - VER=$(python setup.py --version) - python scripts/bump_alpha.py - - name: "Generate release changelog" - uses: heinrichreimer/github-changelog-generator-action@v2.3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - id: changelog - - name: Commit to dev - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: Increment Version - branch: dev - - name: version - run: echo "::set-output name=version::$(python setup.py --version)" - id: version - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token - with: - tag_name: V${{ steps.version.outputs.version }} - release_name: Release ${{ steps.version.outputs.version }} - body: | - Changes in this Release - ${{ steps.changelog.outputs.changelog }} - draft: false - prerelease: true - - name: Build Distribution Packages - run: | - python setup.py bdist_wheel - - name: Publish to Test PyPI - uses: pypa/gh-action-pypi-publish@master - with: - password: ${{secrets.PYPI_TOKEN}} \ No newline at end of file diff --git a/.github/workflows/publish_build.yml b/.github/workflows/publish_build.yml deleted file mode 100644 index 9fdcd30..0000000 --- a/.github/workflows/publish_build.yml +++ /dev/null @@ -1,76 +0,0 @@ -# This workflow will generate a distribution and upload it to PyPI - -name: Publish Build Release ..X -on: - workflow_dispatch: - -jobs: - build_and_publish: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - ref: dev - fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. - - name: Setup Python - uses: actions/setup-python@v1 - with: - python-version: 3.8 - - name: Install Build Tools - run: | - python -m pip install build wheel - - name: Remove alpha (declare stable) - run: | - VER=$(python setup.py --version) - python scripts/remove_alpha.py - - name: "Generate release changelog" - uses: heinrichreimer/github-changelog-generator-action@v2.3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - id: changelog - - name: Commit to dev - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: Declare alpha stable - branch: dev - - name: Push dev -> master - uses: ad-m/github-push-action@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: master - force: true - - name: version - run: echo "::set-output name=version::$(python setup.py --version)" - id: version - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token - with: - tag_name: V${{ steps.version.outputs.version }} - release_name: Release ${{ steps.version.outputs.version }} - body: | - Changes in this Release - ${{ steps.changelog.outputs.changelog }} - draft: false - prerelease: false - - name: Build Distribution Packages - run: | - python setup.py bdist_wheel - - name: Prepare next Build version - run: echo "::set-output name=version::$(python setup.py --version)" - id: alpha - - name: Increment Version ${{ steps.alpha.outputs.version }}Alpha0 - run: | - VER=$(python setup.py --version) - python scripts/bump_build.py - - name: Commit to dev - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: Prepare Next Version - branch: dev - - name: Publish to Test PyPI - uses: pypa/gh-action-pypi-publish@master - with: - password: ${{secrets.PYPI_TOKEN}} \ No newline at end of file diff --git a/.github/workflows/publish_major.yml b/.github/workflows/publish_major.yml deleted file mode 100644 index 87cee86..0000000 --- a/.github/workflows/publish_major.yml +++ /dev/null @@ -1,76 +0,0 @@ -# This workflow will generate a distribution and upload it to PyPI - -name: Publish Major Release X.0.0 -on: - workflow_dispatch: - -jobs: - build_and_publish: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - ref: dev - fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. - - name: Setup Python - uses: actions/setup-python@v1 - with: - python-version: 3.8 - - name: Install Build Tools - run: | - python -m pip install build wheel - - name: Remove alpha (declare stable) - run: | - VER=$(python setup.py --version) - python scripts/remove_alpha.py - - name: "Generate release changelog" - uses: heinrichreimer/github-changelog-generator-action@v2.3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - id: changelog - - name: Commit to dev - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: Declare alpha stable - branch: dev - - name: Push dev -> master - uses: ad-m/github-push-action@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: master - force: true - - name: version - run: echo "::set-output name=version::$(python setup.py --version)" - id: version - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token - with: - tag_name: V${{ steps.version.outputs.version }} - release_name: Release ${{ steps.version.outputs.version }} - body: | - Changes in this Release - ${{ steps.changelog.outputs.changelog }} - draft: false - prerelease: false - - name: Build Distribution Packages - run: | - python setup.py bdist_wheel - - name: Prepare next Major version - run: echo "::set-output name=version::$(python setup.py --version)" - id: alpha - - name: Increment Version ${{ steps.alpha.outputs.version }}Alpha0 - run: | - VER=$(python setup.py --version) - python scripts/bump_major.py - - name: Commit to dev - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: Prepare Next Version - branch: dev - - name: Publish to Test PyPI - uses: pypa/gh-action-pypi-publish@master - with: - password: ${{secrets.PYPI_TOKEN}} \ No newline at end of file diff --git a/.github/workflows/publish_minor.yml b/.github/workflows/publish_minor.yml deleted file mode 100644 index 4e8b231..0000000 --- a/.github/workflows/publish_minor.yml +++ /dev/null @@ -1,76 +0,0 @@ -# This workflow will generate a distribution and upload it to PyPI - -name: Publish Minor Release .X.0 -on: - workflow_dispatch: - -jobs: - build_and_publish: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - ref: dev - fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. - - name: Setup Python - uses: actions/setup-python@v1 - with: - python-version: 3.8 - - name: Install Build Tools - run: | - python -m pip install build wheel - - name: Remove alpha (declare stable) - run: | - VER=$(python setup.py --version) - python scripts/remove_alpha.py - - name: "Generate release changelog" - uses: heinrichreimer/github-changelog-generator-action@v2.3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - id: changelog - - name: Commit to dev - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: Declare alpha stable - branch: dev - - name: Push dev -> master - uses: ad-m/github-push-action@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: master - force: true - - name: version - run: echo "::set-output name=version::$(python setup.py --version)" - id: version - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token - with: - tag_name: V${{ steps.version.outputs.version }} - release_name: Release ${{ steps.version.outputs.version }} - body: | - Changes in this Release - ${{ steps.changelog.outputs.changelog }} - draft: false - prerelease: false - - name: Build Distribution Packages - run: | - python setup.py bdist_wheel - - name: Prepare next Minor version - run: echo "::set-output name=version::$(python setup.py --version)" - id: alpha - - name: Increment Version ${{ steps.alpha.outputs.version }}Alpha0 - run: | - VER=$(python setup.py --version) - python scripts/bump_minor.py - - name: Commit to dev - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: Prepare Next Version - branch: dev - - name: Publish to Test PyPI - uses: pypa/gh-action-pypi-publish@master - with: - password: ${{secrets.PYPI_TOKEN}} \ No newline at end of file diff --git a/.github/workflows/publish_stable.yml b/.github/workflows/publish_stable.yml new file mode 100644 index 0000000..002b788 --- /dev/null +++ b/.github/workflows/publish_stable.yml @@ -0,0 +1,58 @@ +name: Stable Release +on: + push: + branches: [master] + workflow_dispatch: + +jobs: + publish_stable: + uses: TigreGotico/gh-automations/.github/workflows/publish-stable.yml@master + secrets: inherit + with: + branch: 'master' + version_file: 'ovos_tts_plugin_piper/version.py' + setup_py: 'setup.py' + publish_release: true + + publish_pypi: + needs: publish_stable + if: success() # Ensure this job only runs if the previous job succeeds + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + ref: dev + fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. + - name: Setup Python + uses: actions/setup-python@v1 + with: + python-version: 3.8 + - name: Install Build Tools + run: | + python -m pip install build wheel + - name: version + run: echo "::set-output name=version::$(python setup.py --version)" + id: version + - name: Build Distribution Packages + run: | + python setup.py sdist bdist_wheel + - name: Publish to PyPI + uses: pypa/gh-action-pypi-publish@master + with: + password: ${{secrets.PYPI_TOKEN}} + + + sync_dev: + needs: publish_stable + if: success() # Ensure this job only runs if the previous job succeeds + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. + ref: master + - name: Push master -> dev + uses: ad-m/github-push-action@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + branch: dev \ No newline at end of file diff --git a/.github/workflows/release_workflow.yml b/.github/workflows/release_workflow.yml new file mode 100644 index 0000000..d911860 --- /dev/null +++ b/.github/workflows/release_workflow.yml @@ -0,0 +1,108 @@ +name: Release Alpha and Propose Stable + +on: + pull_request: + types: [closed] + branches: [dev] + +jobs: + publish_alpha: + if: github.event.pull_request.merged == true + uses: TigreGotico/gh-automations/.github/workflows/publish-alpha.yml@master + secrets: inherit + with: + branch: 'dev' + version_file: 'ovos_tts_plugin_piper/version.py' + setup_py: 'setup.py' + update_changelog: true + publish_prerelease: true + changelog_max_issues: 100 + + notify: + if: github.event.pull_request.merged == true + needs: publish_alpha + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Send message to Matrix bots channel + id: matrix-chat-message + uses: fadenb/matrix-chat-message@v0.0.6 + with: + homeserver: 'matrix.org' + token: ${{ secrets.MATRIX_TOKEN }} + channel: '!WjxEKjjINpyBRPFgxl:krbel.duckdns.org' + message: | + new ${{ github.event.repository.name }} PR merged! https://github.com/${{ github.repository }}/pull/${{ github.event.number }} + + publish_pypi: + needs: publish_alpha + if: success() # Ensure this job only runs if the previous job succeeds + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + ref: dev + fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. + - name: Setup Python + uses: actions/setup-python@v1 + with: + python-version: 3.8 + - name: Install Build Tools + run: | + python -m pip install build wheel + - name: version + run: echo "::set-output name=version::$(python setup.py --version)" + id: version + - name: Build Distribution Packages + run: | + python setup.py sdist bdist_wheel + - name: Publish to PyPI + uses: pypa/gh-action-pypi-publish@master + with: + password: ${{secrets.PYPI_TOKEN}} + + + propose_release: + needs: publish_alpha + if: success() # Ensure this job only runs if the previous job succeeds + runs-on: ubuntu-latest + steps: + - name: Checkout dev branch + uses: actions/checkout@v3 + with: + ref: dev + + - name: Setup Python + uses: actions/setup-python@v2 + with: + python-version: '3.10' + + - name: Get version from setup.py + id: get_version + run: | + VERSION=$(python setup.py --version) + echo "VERSION=$VERSION" >> $GITHUB_ENV + + - name: Create and push new branch + run: | + git checkout -b release-${{ env.VERSION }} + git push origin release-${{ env.VERSION }} + + - name: Open Pull Request from dev to master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + # Variables + BRANCH_NAME="release-${{ env.VERSION }}" + BASE_BRANCH="master" + HEAD_BRANCH="release-${{ env.VERSION }}" + PR_TITLE="Release ${{ env.VERSION }}" + PR_BODY="Human review requested!" + + # Create a PR using GitHub API + curl -X POST \ + -H "Accept: application/vnd.github+json" \ + -H "Authorization: token $GITHUB_TOKEN" \ + -d "{\"title\":\"$PR_TITLE\",\"body\":\"$PR_BODY\",\"head\":\"$HEAD_BRANCH\",\"base\":\"$BASE_BRANCH\"}" \ + https://api.github.com/repos/${{ github.repository }}/pulls + diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml deleted file mode 100644 index c22e4fd..0000000 --- a/.github/workflows/unit_tests.yml +++ /dev/null @@ -1,72 +0,0 @@ -name: Run UnitTests -on: - pull_request: - branches: - - dev - paths-ignore: - - 'ovos_tts_plugin_piper/version.py' - - 'requirements/**' - - 'examples/**' - - '.github/**' - - '.gitignore' - - 'LICENSE' - - 'CHANGELOG.md' - - 'MANIFEST.in' - - 'readme.md' - - 'scripts/**' - push: - branches: - - master - paths-ignore: - - 'ovos_tts_plugin_piper/version.py' - - 'requirements/**' - - 'examples/**' - - '.github/**' - - '.gitignore' - - 'LICENSE' - - 'CHANGELOG.md' - - 'MANIFEST.in' - - 'readme.md' - - 'scripts/**' - workflow_dispatch: - -jobs: - unit_tests: - strategy: - max-parallel: 2 - matrix: - python-version: [ 3.9, "3.10" ] - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Set up python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} - - name: Install System Dependencies - run: | - sudo apt-get update - sudo apt install python3-dev - python -m pip install build wheel - - name: Install piper - run: | - sudo apt install -y curl - curl https://forslund.github.io/mycroft-desktop-repo/mycroft-desktop.gpg.key | sudo apt-key add - 2> /dev/null && echo "deb http://forslund.github.io/mycroft-desktop-repo bionic main" | sudo tee /etc/apt/sources.list.d/mycroft-desktop.list - sudo apt-get update - sudo apt install portaudio19-dev libpulse-dev piper - - name: Install core repo - run: | - pip install . - - name: Install test dependencies - run: | - pip install pytest pytest-timeout pytest-cov - - name: Run unittests - run: | - pytest --cov=ovos_tts_plugin_piper --cov-report xml test/unittests - # NOTE: additional pytest invocations should also add the --cov-append flag - # or they will overwrite previous invocations' coverage reports - # (for an example, see OVOS Skill Manager's workflow) - - name: Upload coverage - env: - CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}} - uses: codecov/codecov-action@v2 diff --git a/readme.md b/README.md similarity index 100% rename from readme.md rename to README.md diff --git a/scripts/bump_alpha.py b/scripts/bump_alpha.py deleted file mode 100644 index c1ea551..0000000 --- a/scripts/bump_alpha.py +++ /dev/null @@ -1,17 +0,0 @@ -import fileinput -from os.path import join, dirname - -version_file = join(dirname(dirname(__file__)), "ovos_tts_plugin_piper", "version.py") -version_var_name = "VERSION_ALPHA" - -with open(version_file, "r", encoding="utf-8") as v: - for line in v.readlines(): - if line.startswith(version_var_name): - version = int(line.split("=")[-1]) - new_version = int(version) + 1 - -for line in fileinput.input(version_file, inplace=True): - if line.startswith(version_var_name): - print(f"{version_var_name} = {new_version}") - else: - print(line.rstrip('\n')) diff --git a/scripts/bump_build.py b/scripts/bump_build.py deleted file mode 100644 index 42c095a..0000000 --- a/scripts/bump_build.py +++ /dev/null @@ -1,20 +0,0 @@ -import fileinput -from os.path import join, dirname - -version_file = join(dirname(dirname(__file__)), "ovos_tts_plugin_piper", "version.py") -version_var_name = "VERSION_BUILD" -alpha_var_name = "VERSION_ALPHA" - -with open(version_file, "r", encoding="utf-8") as v: - for line in v.readlines(): - if line.startswith(version_var_name): - version = int(line.split("=")[-1]) - new_version = int(version) + 1 - -for line in fileinput.input(version_file, inplace=True): - if line.startswith(version_var_name): - print(f"{version_var_name} = {new_version}") - elif line.startswith(alpha_var_name): - print(f"{alpha_var_name} = 0") - else: - print(line.rstrip('\n')) diff --git a/scripts/bump_major.py b/scripts/bump_major.py deleted file mode 100644 index 7f6232b..0000000 --- a/scripts/bump_major.py +++ /dev/null @@ -1,26 +0,0 @@ -import fileinput -from os.path import join, dirname - -version_file = join(dirname(dirname(__file__)), "ovos_tts_plugin_piper", "version.py") -version_var_name = "VERSION_MAJOR" -minor_var_name = "VERSION_MINOR" -build_var_name = "VERSION_BUILD" -alpha_var_name = "VERSION_ALPHA" - -with open(version_file, "r", encoding="utf-8") as v: - for line in v.readlines(): - if line.startswith(version_var_name): - version = int(line.split("=")[-1]) - new_version = int(version) + 1 - -for line in fileinput.input(version_file, inplace=True): - if line.startswith(version_var_name): - print(f"{version_var_name} = {new_version}") - elif line.startswith(minor_var_name): - print(f"{minor_var_name} = 0") - elif line.startswith(build_var_name): - print(f"{build_var_name} = 0") - elif line.startswith(alpha_var_name): - print(f"{alpha_var_name} = 0") - else: - print(line.rstrip('\n')) diff --git a/scripts/bump_minor.py b/scripts/bump_minor.py deleted file mode 100644 index 978c1c7..0000000 --- a/scripts/bump_minor.py +++ /dev/null @@ -1,23 +0,0 @@ -import fileinput -from os.path import join, dirname - -version_file = join(dirname(dirname(__file__)), "ovos_tts_plugin_piper", "version.py") -version_var_name = "VERSION_MINOR" -build_var_name = "VERSION_BUILD" -alpha_var_name = "VERSION_ALPHA" - -with open(version_file, "r", encoding="utf-8") as v: - for line in v.readlines(): - if line.startswith(version_var_name): - version = int(line.split("=")[-1]) - new_version = int(version) + 1 - -for line in fileinput.input(version_file, inplace=True): - if line.startswith(version_var_name): - print(f"{version_var_name} = {new_version}") - elif line.startswith(build_var_name): - print(f"{build_var_name} = 0") - elif line.startswith(alpha_var_name): - print(f"{alpha_var_name} = 0") - else: - print(line.rstrip('\n')) diff --git a/scripts/remove_alpha.py b/scripts/remove_alpha.py deleted file mode 100644 index 3583360..0000000 --- a/scripts/remove_alpha.py +++ /dev/null @@ -1,12 +0,0 @@ -import fileinput -from os.path import join, dirname - -version_file = join(dirname(dirname(__file__)), "ovos_tts_plugin_piper", "version.py") - -alpha_var_name = "VERSION_ALPHA" - -for line in fileinput.input(version_file, inplace=True): - if line.startswith(alpha_var_name): - print(f"{alpha_var_name} = 0") - else: - print(line.rstrip('\n')) From 6eb2add4d9d2a3fc00040d8ba73999280109af68 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Thu, 12 Sep 2024 10:34:52 +0000 Subject: [PATCH 7/8] Increment Version to 0.0.2a2 --- ovos_tts_plugin_piper/version.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ovos_tts_plugin_piper/version.py b/ovos_tts_plugin_piper/version.py index 573f54d..6e7e2ae 100644 --- a/ovos_tts_plugin_piper/version.py +++ b/ovos_tts_plugin_piper/version.py @@ -1,8 +1,6 @@ - -# The following lines are replaced during the release process. # START_VERSION_BLOCK VERSION_MAJOR = 0 VERSION_MINOR = 0 VERSION_BUILD = 2 -VERSION_ALPHA = 1 +VERSION_ALPHA = 2 # END_VERSION_BLOCK From 5fd3deac93b1682ff5c98088f2dd7a9a71da1f99 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Thu, 12 Sep 2024 10:35:12 +0000 Subject: [PATCH 8/8] Update Changelog --- CHANGELOG.md | 124 ++++----------------------------------------------- 1 file changed, 8 insertions(+), 116 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 248afce..02a6df4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,133 +1,25 @@ # Changelog -## [Unreleased](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/tree/HEAD) +## [0.0.2a2](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/tree/0.0.2a2) (2024-09-12) -[Full Changelog](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/compare/V0.0.1...HEAD) - -**Merged pull requests:** - -- feat: upgrade to piper-tts 1.2.0 and remove support for Python \< 3.9 [\#22](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/pull/22) ([dblencowe](https://github.com/dblencowe)) - -## [V0.0.1](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/tree/V0.0.1) (2024-01-21) - -[Full Changelog](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/compare/V0.0.1a11...V0.0.1) - -## [V0.0.1a11](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/tree/V0.0.1a11) (2024-01-21) - -[Full Changelog](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/compare/V0.0.1a10...V0.0.1a11) - -**Implemented enhancements:** - -- adds en-gb-alba model [\#19](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/pull/19) ([dblencowe](https://github.com/dblencowe)) - -## [V0.0.1a10](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/tree/V0.0.1a10) (2024-01-21) - -[Full Changelog](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/compare/V0.0.1a9...V0.0.1a10) - -**Closed issues:** - -- Doesn't handle the "?" properly [\#16](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/issues/16) - -**Merged pull requests:** - -- WIP: fix: fixes confict between piper-tts versions [\#20](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/pull/20) ([dblencowe](https://github.com/dblencowe)) - -## [V0.0.1a9](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/tree/V0.0.1a9) (2023-12-09) - -[Full Changelog](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/compare/V0.0.1a8...V0.0.1a9) - -**Closed issues:** - -- TypeError: 'NoneType' object is not callable [\#14](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/issues/14) - -**Merged pull requests:** - -- moves to upstream piper package [\#15](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/pull/15) ([JarbasAl](https://github.com/JarbasAl)) -- fix: incorrect config example [\#13](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/pull/13) ([mikejgray](https://github.com/mikejgray)) - -## [V0.0.1a8](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/tree/V0.0.1a8) (2023-10-07) - -[Full Changelog](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/compare/V0.0.1a7...V0.0.1a8) - -**Implemented enhancements:** - -- Add all models from rhasspy/piper-voices [\#12](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/pull/12) ([putnik](https://github.com/putnik)) - -## [V0.0.1a7](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/tree/V0.0.1a7) (2023-10-02) - -[Full Changelog](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/compare/V0.0.1a6...V0.0.1a7) - -**Implemented enhancements:** - -- Add Russian voices [\#11](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/pull/11) ([putnik](https://github.com/putnik)) - -## [V0.0.1a6](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/tree/V0.0.1a6) (2023-07-06) - -[Full Changelog](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/compare/V0.0.1a5...V0.0.1a6) - -**Fixed bugs:** - -- no phonemes [\#8](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/pull/8) ([JarbasAl](https://github.com/JarbasAl)) - -## [V0.0.1a5](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/tree/V0.0.1a5) (2023-07-06) - -[Full Changelog](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/compare/V0.0.1a4...V0.0.1a5) +[Full Changelog](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/compare/V0.0.2a1...0.0.2a2) **Fixed bugs:** -- feat/split\_sents [\#7](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/pull/7) ([JarbasAl](https://github.com/JarbasAl)) - -## [V0.0.1a4](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/tree/V0.0.1a4) (2023-06-28) - -[Full Changelog](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/compare/V0.0.1a3...V0.0.1a4) - -**Implemented enhancements:** - -- feat/runtime\_voices [\#6](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/pull/6) ([JarbasAl](https://github.com/JarbasAl)) - -**Closed issues:** - -- "model" argument not handled [\#5](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/issues/5) - -## [V0.0.1a3](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/tree/V0.0.1a3) (2023-06-16) - -[Full Changelog](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/compare/V0.0.1a2...V0.0.1a3) +- Plugin doesn't work [\#25](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/issues/25) **Merged pull requests:** -- Update requirements.txt [\#4](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/pull/4) ([JarbasAl](https://github.com/JarbasAl)) +- feat:semver [\#29](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/pull/29) ([JarbasAl](https://github.com/JarbasAl)) +- readme.md links to OpenVoiceOS.org [\#24](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/pull/24) ([gavmor](https://github.com/gavmor)) -## [V0.0.1a2](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/tree/V0.0.1a2) (2023-06-10) +## [V0.0.2a1](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/tree/V0.0.2a1) (2024-01-21) -[Full Changelog](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/compare/V0.0.1a1...V0.0.1a2) +[Full Changelog](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/compare/V0.0.1...V0.0.2a1) **Merged pull requests:** -- Neon patch [\#3](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/pull/3) ([mikejgray](https://github.com/mikejgray)) - -## [V0.0.1a1](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/tree/V0.0.1a1) (2023-04-30) - -[Full Changelog](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/compare/V0.0.0...V0.0.1a1) - -**Fixed bugs:** - -- fix phonemes error [\#1](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/pull/1) ([JarbasAl](https://github.com/JarbasAl)) - -## [V0.0.0](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/tree/V0.0.0) (2023-04-28) - -[Full Changelog](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/compare/V0.0.0a4...V0.0.0) - -## [V0.0.0a4](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/tree/V0.0.0a4) (2023-04-28) - -[Full Changelog](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/compare/V0.0.0a3...V0.0.0a4) - -## [V0.0.0a3](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/tree/V0.0.0a3) (2023-04-28) - -[Full Changelog](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/compare/V0.0.0a2...V0.0.0a3) - -## [V0.0.0a2](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/tree/V0.0.0a2) (2023-04-28) - -[Full Changelog](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/compare/7f3ba2645de2823e5c78ff069129b8eb68785435...V0.0.0a2) +- feat: upgrade to piper-tts 1.2.0 and remove support for Python \< 3.9 [\#22](https://github.com/OpenVoiceOS/ovos-tts-plugin-piper/pull/22) ([dblencowe](https://github.com/dblencowe))