s2t 0.1.7__tar.gz → 0.1.8__tar.gz

{s2t-0.1.7 → s2t-0.1.8}/Makefile

@@ -4,7 +4,7 @@ PATH := .venv/bin:$(PATH)
 # Prefer the project venv if present
 PYTHON := $(shell if [ -x .venv/bin/python ]; then echo .venv/bin/python; else command -v python; fi)
 PIP := $(PYTHON) -m pip
-.PHONY: help setup dev install ensure-dev lint format test check build publish publish-test record list-models clean version precommit-install guard-venv
+.PHONY: help setup dev install ensure-dev lint format test check build publish publish-test record list-models clean version precommit-install guard-venv tag
 
 help:
 	@echo "Common targets:"
@@ -16,8 +16,9 @@ help:
 	@echo "  test           Run pytest"
 	@echo "  check          Lint + tests (pre-publish gate)"
 	@echo "  build          Build sdist/wheel (installs 'build' if missing)"
-	@echo "  publish        Upload to PyPI via twine (installs 'twine' if missing)"
-	@echo "  publish-test   Upload to TestPyPI via twine"
+	@echo "  publish        Upload to PyPI via twine (username=__token__, requires TWINE_PASSWORD)"
+	@echo "  publish-test   Upload to TestPyPI via twine (username=__token__, requires TWINE_PASSWORD)"
+	@echo "  tag            Create/push git tag (VERSION=x.y.z or auto-bump patch)"
 	@echo "  record         Run s2t (passes ARGS='...' to forward options)"
 	@echo "  profile        Run s2t with --profile (use ARGS to pass flags)"
 	@echo "  list-models    Print whisper.available_models()"
@@ -35,19 +36,16 @@ dev: guard-venv
 install: guard-venv
 	$(PIP) install -e .
 
-lint:
 lint: guard-venv ensure-dev
 	# Auto-fix what Ruff can, then format, then type-check
 	$(PYTHON) -m ruff check . --fix --unsafe-fixes
 	$(PYTHON) -m ruff format .
 	$(PYTHON) -m mypy src
 
-format:
 format: guard-venv ensure-dev
 	$(PYTHON) -m ruff check . --fix --unsafe-fixes
 	$(PYTHON) -m ruff format .
 
-test:
 test: guard-venv ensure-dev
 	$(PYTHON) -m pytest -q
 
@@ -63,30 +61,16 @@ build: guard-venv
 	$(PYTHON) -m build $(if $(NO_ISOLATION),--no-isolation,)
 
 publish: guard-venv build
+	# Ensure twine is available
 	$(PYTHON) -c 'import importlib.util,sys; sys.exit(0) if importlib.util.find_spec("twine") else sys.exit(1)' || $(PIP) install twine ; \
-	[ -f .env.twine ] && set -a && . ./.env.twine && set +a || true; \
-	if [ "$$ALLOW_CUSTOM_TWINE_USERNAME" = "1" ]; then TWINE_USERNAME="$${TWINE_USERNAME:-__token__}"; else TWINE_USERNAME="__token__"; fi; \
-	# Prefer prod-specific secrets first
-	if [ -n "$$TWINE_PROD_PASSWORD_CMD" ] && [ -z "$$TWINE_PASSWORD" ]; then TWINE_PASSWORD="$$(sh -c "$$TWINE_PROD_PASSWORD_CMD" | head -n1 | tr -d '\r\n')"; fi; \
-	if [ -n "$$PASS_PROD_TWINE_ENTRY" ] && [ -z "$$TWINE_PASSWORD" ]; then TWINE_PASSWORD="$$(pass show "$$PASS_PROD_TWINE_ENTRY" | head -n1 | tr -d '\r\n')"; fi; \
-	# Fallback to generic secrets
-	if [ -n "$$TWINE_PASSWORD_CMD" ] && [ -z "$$TWINE_PASSWORD" ]; then TWINE_PASSWORD="$$(sh -c "$$TWINE_PASSWORD_CMD" | head -n1 | tr -d '\r\n')"; fi; \
-	if [ -n "$$PASS_TWINE_ENTRY" ] && [ -z "$$TWINE_PASSWORD" ]; then TWINE_PASSWORD="$$(pass show "$$PASS_TWINE_ENTRY" | head -n1 | tr -d '\r\n')"; fi; \
-	if [ -z "$$TWINE_PASSWORD" ]; then echo "Error: TWINE_PASSWORD is empty. Provide via .env.twine, TWINE_*_PASSWORD_CMD, or PASS_*_TWINE_ENTRY." >&2; exit 2; fi; \
-	env TWINE_USERNAME="$$TWINE_USERNAME" TWINE_PASSWORD="$$TWINE_PASSWORD" twine upload --non-interactive $$TWINE_EXTRA_FLAGS dist/*
+	if [ -z "$$TWINE_PASSWORD" ]; then echo "Error: TWINE_PASSWORD is not set in the environment." >&2; exit 2; fi; \
+	env TWINE_USERNAME="__token__" TWINE_PASSWORD="$$TWINE_PASSWORD" twine upload --non-interactive $$TWINE_EXTRA_FLAGS dist/*
 
 publish-test: guard-venv build
+	# Ensure twine is available
 	$(PYTHON) -c 'import importlib.util,sys; sys.exit(0) if importlib.util.find_spec("twine") else sys.exit(1)' || $(PIP) install twine ; \
-	[ -f .env.twine ] && set -a && . ./.env.twine && set +a || true; \
-	if [ "$$ALLOW_CUSTOM_TWINE_USERNAME" = "1" ]; then TWINE_USERNAME="$${TWINE_USERNAME:-__token__}"; else TWINE_USERNAME="__token__"; fi; \
-	# Prefer test-specific secrets first
-	if [ -n "$$TWINE_TEST_PASSWORD_CMD" ] && [ -z "$$TWINE_PASSWORD" ]; then TWINE_PASSWORD="$$(sh -c "$$TWINE_TEST_PASSWORD_CMD" | head -n1 | tr -d '\r\n')"; fi; \
-	if [ -n "$$PASS_TEST_TWINE_ENTRY" ] && [ -z "$$TWINE_PASSWORD" ]; then TWINE_PASSWORD="$$(pass show "$$PASS_TEST_TWINE_ENTRY" | head -n1 | tr -d '\r\n')"; fi; \
-	# Fallback to generic secrets
-	if [ -n "$$TWINE_PASSWORD_CMD" ] && [ -z "$$TWINE_PASSWORD" ]; then TWINE_PASSWORD="$$(sh -c "$$TWINE_PASSWORD_CMD" | head -n1 | tr -d '\r\n')"; fi; \
-	if [ -n "$$PASS_TWINE_ENTRY" ] && [ -z "$$TWINE_PASSWORD" ]; then TWINE_PASSWORD="$$(pass show "$$PASS_TWINE_ENTRY" | head -n1 | tr -d '\r\n')"; fi; \
-	if [ -z "$$TWINE_PASSWORD" ]; then echo "Error: TWINE_PASSWORD is empty. Provide via .env.twine, TWINE_*_PASSWORD_CMD, or PASS_*_TWINE_ENTRY." >&2; exit 2; fi; \
-	env TWINE_USERNAME="$$TWINE_USERNAME" TWINE_PASSWORD="$$TWINE_PASSWORD" twine upload --non-interactive --repository testpypi $$TWINE_EXTRA_FLAGS dist/*
+	if [ -z "$$TWINE_PASSWORD" ]; then echo "Error: TWINE_PASSWORD is not set in the environment." >&2; exit 2; fi; \
+	env TWINE_USERNAME="__token__" TWINE_PASSWORD="$$TWINE_PASSWORD" twine upload --non-interactive --repository testpypi $$TWINE_EXTRA_FLAGS dist/*
 
 record: guard-venv
 	@if [ -x .venv/bin/s2t ]; then .venv/bin/s2t $(ARGS); else s2t $(ARGS); fi
@@ -117,8 +101,17 @@ precommit-install: guard-venv ensure-dev
 	pre-commit install --install-hooks
 
 guard-venv:
-	@if [ -n "$$VIRTUAL_ENV" ] && [ "$$VIRTUAL_ENV" != "$$PWD/.venv312" ]; then \
-		echo "Error: active venv ($$VIRTUAL_ENV) differs from project .venv ($$PWD/.venv312)."; \
-		echo "Please 'deactivate' or use the project venv (.venv312)."; \
+	@if [ -n "$$VIRTUAL_ENV" ] && [ "$$VIRTUAL_ENV" != "$$PWD/.venv" ]; then \
+		echo "Error: active venv ($$VIRTUAL_ENV) differs from project .venv ($$PWD/.venv)."; \
+		echo "Please 'deactivate' or use the project venv (.venv)."; \
 		exit 1; \
-	fi
+		fi
+
+# Create and push a git tag
+# Usage:
+#   make tag VERSION=1.2.3            # use provided version
+#   make tag TAG_PREFIX=v              # default prefix 'v'
+#   make tag REMOTE=origin             # default remote 'origin'
+#   make tag                           # auto-bump patch from latest tag
+tag:
+	@VERSION="$(VERSION)" scripts/tag.sh

{s2t-0.1.7/src/s2t.egg-info → s2t-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: s2t
-Version: 0.1.7
+Version: 0.1.8
 Summary: Speech to Text (s2t): Record audio, run Whisper, export formats, and copy transcript to clipboard.
 Author: Maintainers
 License-Expression: LicenseRef-Proprietary
@@ -15,6 +15,7 @@ Requires-Dist: sounddevice>=0.4.6
 Requires-Dist: soundfile>=0.12.1
 Requires-Dist: numpy>=1.23
 Requires-Dist: openai-whisper>=20231117
+Requires-Dist: argostranslate>=1.9.0
 Provides-Extra: dev
 Requires-Dist: pytest>=7; extra == "dev"
 Requires-Dist: pytest-cov>=4; extra == "dev"

{s2t-0.1.7 → s2t-0.1.8}/pyproject.toml

@@ -21,6 +21,7 @@ dependencies = [
   "soundfile>=0.12.1",
   "numpy>=1.23",
   "openai-whisper>=20231117",
+  "argostranslate>=1.9.0",
 ]
 classifiers = [
   "Programming Language :: Python :: 3",

s2t-0.1.8/scripts/tag.sh

@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Configurable via environment:
+# - VERSION=x.y.z   # explicit version to tag
+# - TAG_PREFIX=v    # default 'v'
+# - REMOTE=origin   # default 'origin'
+
+REMOTE="${REMOTE:-origin}"
+TAG_PREFIX="${TAG_PREFIX:-v}"
+VER="${VERSION:-}"
+
+if [[ -z "$VER" ]]; then
+  LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || true)
+  if [[ -n "$LAST_TAG" ]]; then
+    BASE="${LAST_TAG#v}"
+    IFS='.' read -r MA MI PA <<< "$BASE"
+    MA="${MA:-0}"; MI="${MI:-0}"; PA="${PA:-0}"
+    if ! [[ "$MA" =~ ^[0-9]+$ && "$MI" =~ ^[0-9]+$ && "$PA" =~ ^[0-9]+$ ]]; then
+      echo "Error: last tag '$LAST_TAG' is not a semantic version (x.y.z)." >&2
+      exit 1
+    fi
+    PA=$((PA + 1))
+    VER="${MA}.${MI}.${PA}"
+    echo "No VERSION provided; bumping patch from ${LAST_TAG} -> ${VER}"
+  else
+    VER="0.1.0"
+    echo "No VERSION provided and no existing tags; defaulting to ${VER}"
+  fi
+else
+  echo "Using provided VERSION: ${VER}"
+fi
+
+TAG="${TAG_PREFIX}${VER}"
+echo "Preparing tag ${TAG} (remote ${REMOTE})"
+
+# Remove existing tag locally/remote if present
+git tag -d "${TAG}" >/dev/null 2>&1 || true
+git push "${REMOTE}" --delete "${TAG}" >/dev/null 2>&1 || true
+
+# Create annotated tag and push
+git tag -a "${TAG}" -m "Release ${TAG}"
+git push "${REMOTE}" "${TAG}"
+echo "Tag ${TAG} pushed to ${REMOTE}"
+

{s2t-0.1.7 → s2t-0.1.8/src/s2t.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: s2t
-Version: 0.1.7
+Version: 0.1.8
 Summary: Speech to Text (s2t): Record audio, run Whisper, export formats, and copy transcript to clipboard.
 Author: Maintainers
 License-Expression: LicenseRef-Proprietary
@@ -15,6 +15,7 @@ Requires-Dist: sounddevice>=0.4.6
 Requires-Dist: soundfile>=0.12.1
 Requires-Dist: numpy>=1.23
 Requires-Dist: openai-whisper>=20231117
+Requires-Dist: argostranslate>=1.9.0
 Provides-Extra: dev
 Requires-Dist: pytest>=7; extra == "dev"
 Requires-Dist: pytest-cov>=4; extra == "dev"

{s2t-0.1.7 → s2t-0.1.8}/src/s2t.egg-info/SOURCES.txt

@@ -9,6 +9,7 @@ pyproject.toml
 docs/RELEASING.md
 docs/SESSION_STATE.md
 scripts/bench_transcribe.py
+scripts/tag.sh
 src/s2t/__init__.py
 src/s2t/cli.py
 src/s2t/config.py

{s2t-0.1.7 → s2t-0.1.8}/src/s2t.egg-info/requires.txt

@@ -2,6 +2,7 @@ sounddevice>=0.4.6
 soundfile>=0.12.1
 numpy>=1.23
 openai-whisper>=20231117
+argostranslate>=1.9.0
 
 [dev]
 pytest>=7