diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | packaging/arch/PKGBUILD | 4 | ||||
| -rw-r--r-- | parley/__init__.py (renamed from src/parley/__init__.py) | 0 | ||||
| -rw-r--r-- | parley/cli.py (renamed from src/parley/cli.py) | 0 | ||||
| -rw-r--r-- | parley/config.py (renamed from src/parley/config.py) | 2 | ||||
| -rw-r--r-- | parley/controller.py (renamed from src/parley/controller.py) | 0 | ||||
| -rw-r--r-- | parley/ctl.py (renamed from src/parley/ctl.py) | 0 | ||||
| -rw-r--r-- | parley/daemon.py (renamed from src/parley/daemon.py) | 0 | ||||
| -rw-r--r-- | parley/desktop.py (renamed from src/parley/desktop.py) | 0 | ||||
| -rw-r--r-- | parley/errors.py (renamed from src/parley/errors.py) | 0 | ||||
| -rw-r--r-- | parley/ibus_engine.py (renamed from src/parley/ibus_engine.py) | 0 | ||||
| -rw-r--r-- | parley/interfaces/__init__.py (renamed from src/parley/interfaces/__init__.py) | 0 | ||||
| -rw-r--r-- | parley/interfaces/org.parley.Transcription1.xml (renamed from src/parley/interfaces/org.parley.Transcription1.xml) | 0 | ||||
| -rw-r--r-- | parley/persistence.py (renamed from src/parley/persistence.py) | 0 | ||||
| -rw-r--r-- | parley/recording.py (renamed from src/parley/recording.py) | 0 | ||||
| -rw-r--r-- | parley/state.py (renamed from src/parley/state.py) | 0 | ||||
| -rw-r--r-- | parley/transcription.py (renamed from src/parley/transcription.py) | 0 | ||||
| -rw-r--r-- | pyproject.toml | 9 | ||||
| -rwxr-xr-x | scripts/install-dev | 2 | ||||
| -rwxr-xr-x | scripts/install-extension | 2 | ||||
| -rwxr-xr-x | scripts/parley | 4 | ||||
| -rwxr-xr-x | scripts/parleyctl | 4 | ||||
| -rwxr-xr-x | scripts/parleyd | 4 |
23 files changed, 17 insertions, 16 deletions
@@ -59,7 +59,7 @@ Parley runs directly with Arch's system Python and PyGObject bindings. No virtua ```bash ./scripts/install-dev -PYTHONPATH=src /usr/bin/python -m unittest discover -s tests +python -m unittest discover -s tests ``` Restart and inspect the daemon with: diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index 983ddc4..3613166 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -35,7 +35,7 @@ build() { check() { cd "$srcdir/$pkgname" - PYTHONPATH=src python -m unittest discover -s tests -v + python -m unittest discover -s tests -v } package() { @@ -46,7 +46,7 @@ package() { "$pkgdir/usr/lib/systemd/user/parley.service" install -Dm644 data/dbus/org.parley.Transcription1.service \ "$pkgdir/usr/share/dbus-1/services/org.parley.Transcription1.service" - install -Dm644 src/parley/interfaces/org.parley.Transcription1.xml \ + install -Dm644 parley/interfaces/org.parley.Transcription1.xml \ "$pkgdir/usr/share/dbus-1/interfaces/org.parley.Transcription1.xml" local extension_dir="$pkgdir/usr/share/gnome-shell/extensions/parley@org.parley" diff --git a/src/parley/__init__.py b/parley/__init__.py index 8340b53..8340b53 100644 --- a/src/parley/__init__.py +++ b/parley/__init__.py diff --git a/src/parley/cli.py b/parley/cli.py index 735d532..735d532 100644 --- a/src/parley/cli.py +++ b/parley/cli.py diff --git a/src/parley/config.py b/parley/config.py index 923812c..971b6da 100644 --- a/src/parley/config.py +++ b/parley/config.py @@ -19,7 +19,7 @@ def _default_data_home() -> Path: def _prototype_root() -> Path: # The source checkout layout documented in README.md. - return Path(__file__).resolve().parents[3] / "transcribe-parakeet" + return Path(__file__).resolve().parents[2] / "transcribe-parakeet" @dataclass(frozen=True, slots=True) diff --git a/src/parley/controller.py b/parley/controller.py index 567544f..567544f 100644 --- a/src/parley/controller.py +++ b/parley/controller.py diff --git a/src/parley/ctl.py b/parley/ctl.py index 8ae7450..8ae7450 100644 --- a/src/parley/ctl.py +++ b/parley/ctl.py diff --git a/src/parley/daemon.py b/parley/daemon.py index de76bcd..de76bcd 100644 --- a/src/parley/daemon.py +++ b/parley/daemon.py diff --git a/src/parley/desktop.py b/parley/desktop.py index 3802985..3802985 100644 --- a/src/parley/desktop.py +++ b/parley/desktop.py diff --git a/src/parley/errors.py b/parley/errors.py index 7862463..7862463 100644 --- a/src/parley/errors.py +++ b/parley/errors.py diff --git a/src/parley/ibus_engine.py b/parley/ibus_engine.py index 1f80868..1f80868 100644 --- a/src/parley/ibus_engine.py +++ b/parley/ibus_engine.py diff --git a/src/parley/interfaces/__init__.py b/parley/interfaces/__init__.py index bded51d..bded51d 100644 --- a/src/parley/interfaces/__init__.py +++ b/parley/interfaces/__init__.py diff --git a/src/parley/interfaces/org.parley.Transcription1.xml b/parley/interfaces/org.parley.Transcription1.xml index 12b7960..12b7960 100644 --- a/src/parley/interfaces/org.parley.Transcription1.xml +++ b/parley/interfaces/org.parley.Transcription1.xml diff --git a/src/parley/persistence.py b/parley/persistence.py index bd004d8..bd004d8 100644 --- a/src/parley/persistence.py +++ b/parley/persistence.py diff --git a/src/parley/recording.py b/parley/recording.py index 5ee3ec2..5ee3ec2 100644 --- a/src/parley/recording.py +++ b/parley/recording.py diff --git a/src/parley/state.py b/parley/state.py index 8ec7a35..8ec7a35 100644 --- a/src/parley/state.py +++ b/parley/state.py diff --git a/src/parley/transcription.py b/parley/transcription.py index 0735bb2..0735bb2 100644 --- a/src/parley/transcription.py +++ b/parley/transcription.py diff --git a/pyproject.toml b/pyproject.toml index f3455c5..baec27e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,12 +20,13 @@ parleyctl = "parley.ctl:main" "parley.interfaces" = ["*.xml"] [tool.setuptools.packages.find] -where = ["src"] +where = ["."] +include = ["parley*"] [tool.pytest.ini_options] testpaths = ["tests"] [tool.ruff.lint.per-file-ignores] -"src/parley/ctl.py" = ["E402"] -"src/parley/daemon.py" = ["E402"] -"src/parley/ibus_engine.py" = ["E402"] +"parley/ctl.py" = ["E402"] +"parley/daemon.py" = ["E402"] +"parley/ibus_engine.py" = ["E402"] diff --git a/scripts/install-dev b/scripts/install-dev index a2eb660..cd4a7fc 100755 --- a/scripts/install-dev +++ b/scripts/install-dev @@ -6,7 +6,7 @@ unit_dir=${XDG_CONFIG_HOME:-$HOME/.config}/systemd/user dbus_dir=${XDG_DATA_HOME:-$HOME/.local/share}/dbus-1/services cd "$root" -/usr/bin/python -c 'import gi' >/dev/null +python -c 'import gi' >/dev/null mkdir -p "$unit_dir" "$dbus_dir" sed "s|^ExecStart=.*|ExecStart=$root/scripts/parleyd|" \ diff --git a/scripts/install-extension b/scripts/install-extension index e32e9da..fd861dc 100755 --- a/scripts/install-extension +++ b/scripts/install-extension @@ -14,7 +14,7 @@ fi ln -s "$root/extension" "$destination" cd "$root" -/usr/bin/python - "$uuid" <<'PY' +python - "$uuid" <<'PY' import sys from gi.repository import Gio diff --git a/scripts/parley b/scripts/parley index 9213cbd..49e7098 100755 --- a/scripts/parley +++ b/scripts/parley @@ -1,5 +1,5 @@ #!/usr/bin/env bash set -euo pipefail root=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd) -export PYTHONPATH="$root/src${PYTHONPATH:+:$PYTHONPATH}" -exec /usr/bin/python -m parley.cli "$@" +cd "$root" +exec python -m parley.cli "$@" diff --git a/scripts/parleyctl b/scripts/parleyctl index 2973c88..0fda0ba 100755 --- a/scripts/parleyctl +++ b/scripts/parleyctl @@ -1,5 +1,5 @@ #!/usr/bin/env bash set -euo pipefail root=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd) -export PYTHONPATH="$root/src${PYTHONPATH:+:$PYTHONPATH}" -exec /usr/bin/python -m parley.ctl "$@" +cd "$root" +exec python -m parley.ctl "$@" diff --git a/scripts/parleyd b/scripts/parleyd index 9e66846..8584093 100755 --- a/scripts/parleyd +++ b/scripts/parleyd @@ -1,5 +1,5 @@ #!/usr/bin/env bash set -euo pipefail root=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd) -export PYTHONPATH="$root/src${PYTHONPATH:+:$PYTHONPATH}" -exec /usr/bin/python -m parley.daemon "$@" +cd "$root" +exec python -m parley.daemon "$@" |
