From 882f2482067e217f07e4e798e6da1e4b627175e4 Mon Sep 17 00:00:00 2001 From: blissful Date: Sun, 12 May 2024 01:00:59 -0400 Subject: [PATCH] rename rose-watchdog to rose-watch --- flake.nix | 8 ++++---- rose-cli/default.nix | 4 ++-- rose-cli/rose_cli/cli.py | 2 +- rose-cli/setup.py | 2 +- {rose-watchdog => rose-watch}/.version | 0 {rose-watchdog => rose-watch}/default.nix | 2 +- .../rose_watchdog => rose-watch/rose_watch}/__init__.py | 2 +- .../rose_watchdog => rose-watch/rose_watch}/py.typed | 0 .../rose_watchdog => rose-watch/rose_watch}/watcher.py | 0 .../rose_watch}/watcher_test.py | 2 +- {rose-watchdog => rose-watch}/setup.py | 6 +++--- 11 files changed, 14 insertions(+), 14 deletions(-) rename {rose-watchdog => rose-watch}/.version (100%) rename {rose-watchdog => rose-watch}/default.nix (88%) rename {rose-watchdog/rose_watchdog => rose-watch/rose_watch}/__init__.py (67%) rename {rose-watchdog/rose_watchdog => rose-watch/rose_watch}/py.typed (100%) rename {rose-watchdog/rose_watchdog => rose-watch/rose_watch}/watcher.py (100%) rename {rose-watchdog/rose_watchdog => rose-watch/rose_watch}/watcher_test.py (99%) rename {rose-watchdog => rose-watch}/setup.py (74%) diff --git a/flake.nix b/flake.nix index 5bed246..fb1209e 100644 --- a/flake.nix +++ b/flake.nix @@ -66,7 +66,7 @@ export ROSE_ROOT="$(find-up flake.nix)" export ROSE_SO_PATH="$ROSE_ROOT/rose-zig/zig-out/lib/librose.so" export PYTHONPATH="$ROSE_ROOT/rose-py:''${PYTHONPATH:-}" - export PYTHONPATH="$ROSE_ROOT/rose-watchdog:$PYTHONPATH" + export PYTHONPATH="$ROSE_ROOT/rose-watch:$PYTHONPATH" export PYTHONPATH="$ROSE_ROOT/rose-vfs:$PYTHONPATH" export PYTHONPATH="$ROSE_ROOT/rose-cli:$PYTHONPATH" ''; @@ -87,12 +87,12 @@ packages = rec { rose-zig = pkgs.callPackage ./rose-zig { inherit version; }; rose-py = pkgs.callPackage ./rose-py { inherit version python-pin py-deps rose-zig; }; - rose-watchdog = pkgs.callPackage ./rose-watchdog { inherit version python-pin py-deps rose-py; }; + rose-watch = pkgs.callPackage ./rose-watch { inherit version python-pin py-deps rose-py; }; rose-vfs = pkgs.callPackage ./rose-vfs { inherit version python-pin py-deps rose-py; }; - rose-cli = pkgs.callPackage ./rose-cli { inherit version python-pin py-deps rose-py rose-vfs rose-watchdog; }; + rose-cli = pkgs.callPackage ./rose-cli { inherit version python-pin py-deps rose-py rose-vfs rose-watch; }; all = pkgs.buildEnv { name = "rose-all"; - paths = [ rose-zig rose-py rose-watchdog rose-vfs rose-cli ]; + paths = [ rose-zig rose-py rose-watch rose-vfs rose-cli ]; }; }; }); diff --git a/rose-cli/default.nix b/rose-cli/default.nix index 9893e73..49261c0 100644 --- a/rose-cli/default.nix +++ b/rose-cli/default.nix @@ -3,7 +3,7 @@ , py-deps , rose-py , rose-vfs -, rose-watchdog +, rose-watch }: python-pin.pkgs.buildPythonPackage { @@ -13,7 +13,7 @@ python-pin.pkgs.buildPythonPackage { propagatedBuildInputs = [ rose-py rose-vfs - rose-watchdog + rose-watch py-deps.click ]; doCheck = false; diff --git a/rose-cli/rose_cli/cli.py b/rose-cli/rose_cli/cli.py index cfd25e8..229a4a1 100644 --- a/rose-cli/rose_cli/cli.py +++ b/rose-cli/rose_cli/cli.py @@ -51,7 +51,7 @@ update_cache, ) from rose_vfs import mount_virtualfs -from rose_watchdog import start_watchdog +from rose_watch import start_watchdog from rose_cli.dump import ( dump_all_artists, diff --git a/rose-cli/setup.py b/rose-cli/setup.py index 6b376f0..58b4e1e 100644 --- a/rose-cli/setup.py +++ b/rose-cli/setup.py @@ -17,6 +17,6 @@ "click", "rose", "rose-vfs", - "rose-watchdog", + "rose-watch", ], ) diff --git a/rose-watchdog/.version b/rose-watch/.version similarity index 100% rename from rose-watchdog/.version rename to rose-watch/.version diff --git a/rose-watchdog/default.nix b/rose-watch/default.nix similarity index 88% rename from rose-watchdog/default.nix rename to rose-watch/default.nix index 11877b1..3b18a53 100644 --- a/rose-watchdog/default.nix +++ b/rose-watch/default.nix @@ -5,7 +5,7 @@ }: python-pin.pkgs.buildPythonPackage { - pname = "rose-watchdog"; + pname = "rose-watch"; version = version; src = ./.; propagatedBuildInputs = [ diff --git a/rose-watchdog/rose_watchdog/__init__.py b/rose-watch/rose_watch/__init__.py similarity index 67% rename from rose-watchdog/rose_watchdog/__init__.py rename to rose-watch/rose_watch/__init__.py index 77dfbde..b9f1e83 100644 --- a/rose-watchdog/rose_watchdog/__init__.py +++ b/rose-watch/rose_watch/__init__.py @@ -1,6 +1,6 @@ from rose import initialize_logging -from rose_watchdog.watcher import start_watchdog +from rose_watch.watcher import start_watchdog __all__ = [ "start_watchdog", diff --git a/rose-watchdog/rose_watchdog/py.typed b/rose-watch/rose_watch/py.typed similarity index 100% rename from rose-watchdog/rose_watchdog/py.typed rename to rose-watch/rose_watch/py.typed diff --git a/rose-watchdog/rose_watchdog/watcher.py b/rose-watch/rose_watch/watcher.py similarity index 100% rename from rose-watchdog/rose_watchdog/watcher.py rename to rose-watch/rose_watch/watcher.py diff --git a/rose-watchdog/rose_watchdog/watcher_test.py b/rose-watch/rose_watch/watcher_test.py similarity index 99% rename from rose-watchdog/rose_watchdog/watcher_test.py rename to rose-watch/rose_watch/watcher_test.py index a0c1337..6ea4944 100644 --- a/rose-watchdog/rose_watchdog/watcher_test.py +++ b/rose-watch/rose_watch/watcher_test.py @@ -8,7 +8,7 @@ from rose.cache import connect from conftest import TEST_COLLAGE_1, TEST_PLAYLIST_1, TEST_RELEASE_2, TEST_RELEASE_3, retry_for_sec -from rose_watchdog.watcher import start_watchdog +from rose_watch.watcher import start_watchdog @contextmanager diff --git a/rose-watchdog/setup.py b/rose-watch/setup.py similarity index 74% rename from rose-watchdog/setup.py rename to rose-watch/setup.py index 36b8d7a..93d5f2b 100644 --- a/rose-watchdog/setup.py +++ b/rose-watch/setup.py @@ -4,14 +4,14 @@ version = f.read().strip() setuptools.setup( - name="rose-watchdog", + name="rose-watch", version=version, python_requires=">=3.11.0", author="blissful", author_email="blissful@sunsetglow.net", license="Apache-2.0", - packages=["rose_watchdog"], - package_data={"rose_watchdog": ["py.typed"]}, + packages=["rose_watch"], + package_data={"rose_watch": ["py.typed"]}, install_requires=[ "rose", "watchdog",