From 7e577284e96dfd23702f3809d234819c4f5649ee Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Mon, 2 Sep 2024 23:29:40 +0000 Subject: [PATCH 1/7] Prepare Next Version --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index 76c4342..03ebedf 100644 --- a/version.py +++ b/version.py @@ -1,6 +1,6 @@ # START_VERSION_BLOCK VERSION_MAJOR = 0 VERSION_MINOR = 0 -VERSION_BUILD = 1 +VERSION_BUILD = 2 VERSION_ALPHA = 0 # END_VERSION_BLOCK From bd61597022f023eb1425fce7b6de93e0305f956d Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 15 Oct 2024 04:10:01 +0100 Subject: [PATCH 2/7] fix:update_requirements (#8) --- .github/workflows/auto_translate.yml | 29 ------ .github/workflows/conventional-label.yaml | 10 ++ .github/workflows/dev2master.yml | 20 ---- .github/workflows/prepare_skillstore.yml | 29 ------ .github/workflows/propose_translation.yml | 55 ----------- .github/workflows/publish_alpha.yml | 106 --------------------- .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 | 109 ++++++++++++++++++++++ __init__.py | 2 +- requirements.txt | 6 +- 13 files changed, 181 insertions(+), 471 deletions(-) delete mode 100644 .github/workflows/auto_translate.yml create mode 100644 .github/workflows/conventional-label.yaml delete mode 100644 .github/workflows/dev2master.yml delete mode 100644 .github/workflows/prepare_skillstore.yml delete mode 100644 .github/workflows/propose_translation.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 diff --git a/.github/workflows/auto_translate.yml b/.github/workflows/auto_translate.yml deleted file mode 100644 index 409a93e..0000000 --- a/.github/workflows/auto_translate.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: Auto translate -on: - workflow_dispatch: - -jobs: - autotranslate: - env: - API_KEY: ${{secrets.DL_API_KEY}} - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - ref: dev - fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. - - name: Setup Python - uses: actions/setup-python@v4 - with: - python-version: 3.8 - - name: Install Translate Tools - run: | - python -m pip install ovos-translate-plugin-deepl ovos-utils - - name: Auto Translate - run: | - python scripts/translate.py - - name: Commit to dev - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: autotranslate - branch: dev 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 f6d5572..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@v3 - 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/prepare_skillstore.yml b/.github/workflows/prepare_skillstore.yml deleted file mode 100644 index b27dd73..0000000 --- a/.github/workflows/prepare_skillstore.yml +++ /dev/null @@ -1,29 +0,0 @@ -# This workflow will generate a distribution and upload it to PyPI - -name: Create Skill Store Metadata -on: - workflow_dispatch: - -jobs: - build_and_publish: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - ref: dev - fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. - - name: Setup Python - uses: actions/setup-python@v4 - with: - python-version: 3.8 - - name: Install OSM - run: | - pip install ovos-skills-manager~=0.0.10 - - name: Update Skill Store metadata - run: | - python scripts/prepare_skillstore.py - - name: Commit to dev - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: Update skill store metadata - branch: dev diff --git a/.github/workflows/propose_translation.yml b/.github/workflows/propose_translation.yml deleted file mode 100644 index cb03a37..0000000 --- a/.github/workflows/propose_translation.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: Propose Translation -on: - workflow_dispatch: - inputs: - language: - type: choice - description: Language to translate - options: - - de-de - - ca-es - - es-es - - cs-cz - - fr-fr - - it-it - - da-dk - - nl-nl - - hu-hu - - pl-pl - - pt-pt - - ru-ru - - sv-fi - - sv-se - - tr-tr - -jobs: - Propose_translation: - env: - TARGET_LANG: ${{ inputs.language }} - API_KEY: ${{ secrets.DL_API_KEY }} - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - ref: ${{ github.ref_name }} - fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. - - name: Setup Python - uses: actions/setup-python@v4 - with: - python-version: 3.8 - - name: Install Translate Tools - run: | - python -m pip install ovos-translate-plugin-deepl ovos-utils - - name: Run Translate Script - run: python scripts/translate.py - - name: Create Pull Request - uses: peter-evans/create-pull-request@v5 - with: - token: ${{ secrets.GITHUB_TOKEN }} - commit-message: autotranslate - author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com> - title: Proposed ${{ inputs.language }} Translations - body: Translations for review - labels: translation - branch: staging/translation_${{ inputs.language }} - reviewers: emphasize diff --git a/.github/workflows/publish_alpha.yml b/.github/workflows/publish_alpha.yml deleted file mode 100644 index 784d7e8..0000000 --- a/.github/workflows/publish_alpha.yml +++ /dev/null @@ -1,106 +0,0 @@ -# This workflow will generate a distribution and upload it to PyPI - -name: Publish Alpha Build ...aX -on: - push: - branches: - - dev - paths-ignore: - - 'version.py' - - '.github/**' - - '.gitignore' - - 'LICENSE' - - 'CHANGELOG.md' - - 'MANIFEST.in' - - 'README.md' - - 'scripts/**' - - 'translations/**' - workflow_dispatch: - -jobs: - autotranslate: - runs-on: ubuntu-latest - env: - API_KEY: ${{secrets.DL_API_KEY}} - steps: - - uses: actions/checkout@v3 - with: - ref: dev - fetch-depth: 0 - - uses: dorny/paths-filter@v2 - id: filter - with: - filters: | - locales: - - 'locale/en-us/**' - - 'dialog/en-us/**' - - 'vocab/en-us/**' - - name: Setup Python - if: steps.filter.outputs.locales == 'true' - uses: actions/setup-python@v4 - with: - python-version: 3.8 - - name: Auto Translate - if: steps.filter.outputs.locales == 'true' - run: | - python -m pip install ovos-translate-plugin-deepl ovos-utils - python scripts/translate.py - - name: Commit to dev - if: steps.filter.outputs.locales == 'true' - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: autotranslate - branch: dev - - build_and_publish: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - ref: dev - fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. - - name: Setup Python - uses: actions/setup-python@v4 - 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 - commitish: dev - - name: Build Distribution Packages - run: | - python setup.py bdist_wheel - - name: Publish to Test PyPI - uses: pypa/gh-action-pypi-publish@release/v1 - 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 60291c6..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@v3 - with: - ref: dev - fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. - - name: Setup Python - uses: actions/setup-python@v4 - 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 a26569a..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@v3 - with: - ref: dev - fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. - - name: Setup Python - uses: actions/setup-python@v4 - 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 f014906..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@v3 - with: - ref: dev - fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository. - - name: Setup Python - uses: actions/setup-python@v4 - 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..6b5412a --- /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: '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..727075d --- /dev/null +++ b/.github/workflows/release_workflow.yml @@ -0,0 +1,109 @@ +name: Release Alpha and Propose Stable + +on: + workflow_dispatch: + 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: '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/__init__.py b/__init__.py index d7ac316..c7f3575 100644 --- a/__init__.py +++ b/__init__.py @@ -1,6 +1,6 @@ from os.path import join, dirname -from ovos_workshop.backwards_compat import MediaType, PlaybackType, Playlist, MediaEntry +from ovos_utils.ocp import MediaType, PlaybackType, Playlist, MediaEntry from ovos_workshop.decorators import ocp_search, ocp_featured_media from ovos_workshop.skills.common_play import OVOSCommonPlaybackSkill from tunein import TuneIn diff --git a/requirements.txt b/requirements.txt index 529790f..ee72c12 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -ovos-utils >= 0.0.38 -ovos-bus-client>=0.0.9a1 -ovos-workshop>=0.0.16a43 +ovos-utils >= 0.1.0 +ovos-bus-client>=0.0.9 +ovos-workshop>=0.0.16 tunein~=0.0,>=0.0.4a1 From 67731499e766ec89cfcbed89aad39f3b1c9bc5f7 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Tue, 15 Oct 2024 03:10:16 +0000 Subject: [PATCH 3/7] Increment Version to --- version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.py b/version.py index 03ebedf..874672d 100644 --- a/version.py +++ b/version.py @@ -1,6 +1,6 @@ # START_VERSION_BLOCK VERSION_MAJOR = 0 VERSION_MINOR = 0 -VERSION_BUILD = 2 -VERSION_ALPHA = 0 +VERSION_BUILD = 3 +VERSION_ALPHA = 1 # END_VERSION_BLOCK From 071953a7e6978474450d39b3dab0e0e1618f810b Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Tue, 15 Oct 2024 03:10:37 +0000 Subject: [PATCH 4/7] Update Changelog --- CHANGELOG.md | 46 +++------------------------------------------- 1 file changed, 3 insertions(+), 43 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd79ba7..90b3aae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,52 +1,12 @@ # Changelog -## [V0.0.1a6](https://github.com/OpenVoiceOS/skill-ovos-tunein/tree/V0.0.1a6) (2024-07-11) +## [Unreleased](https://github.com/OpenVoiceOS/skill-ovos-tunein/tree/HEAD) -[Full Changelog](https://github.com/OpenVoiceOS/skill-ovos-tunein/compare/V0.0.1a5...V0.0.1a6) +[Full Changelog](https://github.com/OpenVoiceOS/skill-ovos-tunein/compare/V0.0.1...HEAD) **Merged pull requests:** -- feat/skill\_aliases [\#7](https://github.com/OpenVoiceOS/skill-ovos-tunein/pull/7) ([JarbasAl](https://github.com/JarbasAl)) - -## [V0.0.1a5](https://github.com/OpenVoiceOS/skill-ovos-tunein/tree/V0.0.1a5) (2024-06-21) - -[Full Changelog](https://github.com/OpenVoiceOS/skill-ovos-tunein/compare/V0.0.1a4...V0.0.1a5) - -**Merged pull requests:** - -- refactor/ocp\_modernize [\#6](https://github.com/OpenVoiceOS/skill-ovos-tunein/pull/6) ([JarbasAl](https://github.com/JarbasAl)) - -## [V0.0.1a4](https://github.com/OpenVoiceOS/skill-ovos-tunein/tree/V0.0.1a4) (2024-05-24) - -[Full Changelog](https://github.com/OpenVoiceOS/skill-ovos-tunein/compare/V0.0.1a3...V0.0.1a4) - -**Fixed bugs:** - -- 'TuneInSkill' object has no attribute 'skill\_name' [\#4](https://github.com/OpenVoiceOS/skill-ovos-tunein/issues/4) - -## [V0.0.1a3](https://github.com/OpenVoiceOS/skill-ovos-tunein/tree/V0.0.1a3) (2024-01-13) - -[Full Changelog](https://github.com/OpenVoiceOS/skill-ovos-tunein/compare/V0.0.1a2...V0.0.1a3) - -## [V0.0.1a2](https://github.com/OpenVoiceOS/skill-ovos-tunein/tree/V0.0.1a2) (2024-01-12) - -[Full Changelog](https://github.com/OpenVoiceOS/skill-ovos-tunein/compare/V0.0.1a1...V0.0.1a2) - -**Merged pull requests:** - -- modernize [\#3](https://github.com/OpenVoiceOS/skill-ovos-tunein/pull/3) ([NeonJarbas](https://github.com/NeonJarbas)) - -## [V0.0.1a1](https://github.com/OpenVoiceOS/skill-ovos-tunein/tree/V0.0.1a1) (2023-09-05) - -[Full Changelog](https://github.com/OpenVoiceOS/skill-ovos-tunein/compare/3a9bc88b6e19b2674044ba0249758cf2aa5e3885...V0.0.1a1) - -**Implemented enhancements:** - -- add featured media [\#1](https://github.com/OpenVoiceOS/skill-ovos-tunein/pull/1) ([emphasize](https://github.com/emphasize)) - -**Merged pull requests:** - -- pypi ready [\#2](https://github.com/OpenVoiceOS/skill-ovos-tunein/pull/2) ([emphasize](https://github.com/emphasize)) +- fix:update\_requirements [\#8](https://github.com/OpenVoiceOS/skill-ovos-tunein/pull/8) ([JarbasAl](https://github.com/JarbasAl)) From f62b38fbab73d99b73248dbca413ce7a047797e8 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 15 Oct 2024 05:23:10 +0100 Subject: [PATCH 5/7] fix:long description (#9) semver automations fail if dont use full path for README --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9cf9541..ea6e7a8 100755 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ def find_resource_files(): return package_data -with open("README.md", "r") as f: +with open(path.join(path.abspath(path.dirname(__file__)), "README.md"), "r") as f: long_description = f.read() From 427708b9aaf72e9c2957f99ca6d56f54fc5c792d Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Tue, 15 Oct 2024 04:23:35 +0000 Subject: [PATCH 6/7] Increment Version to 0.0.4a1 --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index 874672d..441e978 100644 --- a/version.py +++ b/version.py @@ -1,6 +1,6 @@ # START_VERSION_BLOCK VERSION_MAJOR = 0 VERSION_MINOR = 0 -VERSION_BUILD = 3 +VERSION_BUILD = 4 VERSION_ALPHA = 1 # END_VERSION_BLOCK From 752f2d0470b885cfd9f001edf6729056a38a1a47 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Tue, 15 Oct 2024 04:23:55 +0000 Subject: [PATCH 7/7] Update Changelog --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90b3aae..863f767 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,12 @@ # Changelog -## [Unreleased](https://github.com/OpenVoiceOS/skill-ovos-tunein/tree/HEAD) +## [0.0.4a1](https://github.com/OpenVoiceOS/skill-ovos-tunein/tree/0.0.4a1) (2024-10-15) -[Full Changelog](https://github.com/OpenVoiceOS/skill-ovos-tunein/compare/V0.0.1...HEAD) +[Full Changelog](https://github.com/OpenVoiceOS/skill-ovos-tunein/compare/V0.0.1...0.0.4a1) **Merged pull requests:** +- fix:long description [\#9](https://github.com/OpenVoiceOS/skill-ovos-tunein/pull/9) ([JarbasAl](https://github.com/JarbasAl)) - fix:update\_requirements [\#8](https://github.com/OpenVoiceOS/skill-ovos-tunein/pull/8) ([JarbasAl](https://github.com/JarbasAl))