From c2c6eee8e9ebc18101892c60c32b0aeeacf33125 Mon Sep 17 00:00:00 2001 From: miro Date: Fri, 17 Apr 2026 02:13:17 +0100 Subject: [PATCH 1/2] chore: drop setup.py and requirements.txt, pyproject.toml is the source of truth MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit AI-Generated Change: - Model: claude-sonnet-4-6 - Intent: fix CI build failure — setup.py read requirements.txt which no longer exists; pyproject.toml already declares all deps and entry points - Impact: python -m build now uses pyproject.toml exclusively; setup.py and requirements.txt removed - Verified via: pyproject.toml has all deps, entry-points, and dynamic version from version.py --- requirements.txt | 1 - setup.py | 99 ------------------------------------------------ 2 files changed, 100 deletions(-) delete mode 100644 requirements.txt delete mode 100755 setup.py diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index aa43c4b..0000000 --- a/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -ovos-utils>=0.6.0,<1.0.0 diff --git a/setup.py b/setup.py deleted file mode 100755 index ddfd5db..0000000 --- a/setup.py +++ /dev/null @@ -1,99 +0,0 @@ -#!/usr/bin/env python3 -import os - -from setuptools import setup - -# parse the repo name from the git repository - -URL = "https://github.com/OpenVoiceOS/ovos-utterance-plugin-cancel" -PLUGIN_CLAZZ = "NevermindPlugin" - -AUTHOR, REPO = URL.split(".com/")[-1].split("/") -ADDITIONAL_AUTHORS = ["jarbasai"] -AUTHORS = ADDITIONAL_AUTHORS + [AUTHOR] -PKG = "ovos_utterance_plugin_cancel" - -BASEDIR = os.path.abspath(os.path.dirname(__file__)) -PKGDIR = os.path.join(BASEDIR, PKG) -UTTERANCE_ENTRY_POINT = f'{REPO.lower()}={PKG}:{PLUGIN_CLAZZ}' - - -def get_version(): - """ Find the version of the package""" - version_file = f'{BASEDIR}/ovos_utterance_plugin_cancel/version.py' - major, minor, build, alpha = (None, None, None, None) - with open(version_file) as f: - for line in f: - if 'VERSION_MAJOR' in line: - major = line.split('=')[1].strip() - elif 'VERSION_MINOR' in line: - minor = line.split('=')[1].strip() - elif 'VERSION_BUILD' in line: - build = line.split('=')[1].strip() - elif 'VERSION_ALPHA' in line: - alpha = line.split('=')[1].strip() - - if ((major and minor and build and alpha) or - '# END_VERSION_BLOCK' in line): - break - version = f"{major}.{minor}.{build}" - if alpha and int(alpha) > 0: - version += f"a{alpha}" - return version - - -def find_resource_files(): - resource_base_dirs = ("locale", "res",) # Removed "ui" - package_data = list() - for res in resource_base_dirs: - if os.path.isdir(os.path.join(PKGDIR, res)): - for directory, _, files in os.walk(os.path.join(PKGDIR, res)): - for f in files: - path = os.path.relpath(os.path.join(directory, f), PKGDIR) - package_data.append(path) - return package_data - - -def required(requirements_file): - """ Read requirements file and remove comments and empty lines. """ - with open(os.path.join(BASEDIR, requirements_file), 'r') as f: - requirements = f.read().splitlines() - if 'MYCROFT_LOOSE_REQUIREMENTS' in os.environ: - print('USING LOOSE REQUIREMENTS!') - requirements = [r.replace('==', '>=').replace('~=', '>=') for r in requirements] - return [pkg for pkg in requirements - if pkg.strip() and not pkg.startswith("#")] - - - -with open(os.path.join(BASEDIR, "README.md"), "r") as f: - long_description = f.read() - - -setup( - name=REPO, - description='OpenVoiceOS Utterance Cancel Plugin', - long_description=long_description, - version=get_version(), - author=AUTHOR, - author_email='jarbasai@mailfence.com', - url=URL, - license='apache-2.0', - packages=[PKG], - package_data={PKG: find_resource_files()}, - install_requires=required("requirements.txt"), - include_package_data=True, - zip_safe=True, - classifiers=[ - 'Development Status :: 3 - Alpha', - 'Intended Audience :: Developers', - 'Topic :: Text Processing :: Linguistic', - 'License :: OSI Approved :: Apache Software License', - 'Programming Language :: Python :: 3.4', - 'Programming Language :: Python :: 3.5', - 'Programming Language :: Python :: 3.6', - ], - entry_points={ - 'neon.plugin.text': UTTERANCE_ENTRY_POINT - } -) From 1d5f5e86b93a2209aeb92c3a715ab8adff45639f Mon Sep 17 00:00:00 2001 From: miro Date: Fri, 17 Apr 2026 14:16:09 +0100 Subject: [PATCH 2/2] fix: remove invalid PYPI_TOKEN/MATRIX_TOKEN secrets from non-release workflows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit AI-Generated Change: - Model: claude-sonnet-4-6 - Intent: fix startup_failure on repo-health, build-tests, coverage, lint, license_check, pip_audit, release-preview — those reusable workflows do not declare PYPI_TOKEN/MATRIX_TOKEN as inputs so passing them causes a validation error - Impact: secrets block removed from 7 workflows; only release_workflow and publish_stable retain them - Verified via: gh-automations workflow definitions confirm none of these accept those secrets --- .github/workflows/build-tests.yml | 3 --- .github/workflows/coverage.yml | 3 --- .github/workflows/license_check.yml | 3 --- .github/workflows/lint.yml | 3 --- .github/workflows/pip_audit.yml | 3 --- .github/workflows/release-preview.yml | 3 --- .github/workflows/repo-health.yml | 3 --- 7 files changed, 21 deletions(-) diff --git a/.github/workflows/build-tests.yml b/.github/workflows/build-tests.yml index 837c0f6..6dff7ba 100644 --- a/.github/workflows/build-tests.yml +++ b/.github/workflows/build-tests.yml @@ -8,9 +8,6 @@ on: jobs: build: uses: OpenVoiceOS/gh-automations/.github/workflows/build-tests.yml@dev - secrets: - PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} - MATRIX_TOKEN: ${{ secrets.MATRIX_TOKEN }} with: python_versions: '["3.10", "3.11", "3.12", "3.13", "3.14"]' install_extras: 'dev' diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 424e472..d6cb8d8 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -8,9 +8,6 @@ on: jobs: coverage: uses: OpenVoiceOS/gh-automations/.github/workflows/coverage.yml@dev - secrets: - PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} - MATRIX_TOKEN: ${{ secrets.MATRIX_TOKEN }} with: python_version: '3.11' coverage_source: 'ovos_utterance_plugin_cancel' diff --git a/.github/workflows/license_check.yml b/.github/workflows/license_check.yml index 6ea042a..214edaa 100644 --- a/.github/workflows/license_check.yml +++ b/.github/workflows/license_check.yml @@ -8,6 +8,3 @@ on: jobs: license_check: uses: OpenVoiceOS/gh-automations/.github/workflows/license-check.yml@dev - secrets: - PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} - MATRIX_TOKEN: ${{ secrets.MATRIX_TOKEN }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 17f489e..0cb9564 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -8,9 +8,6 @@ on: jobs: lint: uses: OpenVoiceOS/gh-automations/.github/workflows/lint.yml@dev - secrets: - PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} - MATRIX_TOKEN: ${{ secrets.MATRIX_TOKEN }} with: ruff: true pre_commit: false # set true if .pre-commit-config.yaml exists diff --git a/.github/workflows/pip_audit.yml b/.github/workflows/pip_audit.yml index 23c3207..131320d 100644 --- a/.github/workflows/pip_audit.yml +++ b/.github/workflows/pip_audit.yml @@ -8,6 +8,3 @@ on: jobs: pip_audit: uses: OpenVoiceOS/gh-automations/.github/workflows/pip-audit.yml@dev - secrets: - PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} - MATRIX_TOKEN: ${{ secrets.MATRIX_TOKEN }} diff --git a/.github/workflows/release-preview.yml b/.github/workflows/release-preview.yml index 75107b6..f966afa 100644 --- a/.github/workflows/release-preview.yml +++ b/.github/workflows/release-preview.yml @@ -8,9 +8,6 @@ on: jobs: release_preview: uses: OpenVoiceOS/gh-automations/.github/workflows/release-preview.yml@dev - secrets: - PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} - MATRIX_TOKEN: ${{ secrets.MATRIX_TOKEN }} with: package_name: 'ovos_utterance_plugin_cancel' version_file: 'ovos_utterance_plugin_cancel/version.py' diff --git a/.github/workflows/repo-health.yml b/.github/workflows/repo-health.yml index 4465b61..e5a8a2b 100644 --- a/.github/workflows/repo-health.yml +++ b/.github/workflows/repo-health.yml @@ -8,8 +8,5 @@ on: jobs: repo_health: uses: OpenVoiceOS/gh-automations/.github/workflows/repo-health.yml@dev - secrets: - PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} - MATRIX_TOKEN: ${{ secrets.MATRIX_TOKEN }} with: version_file: 'ovos_utterance_plugin_cancel/version.py'