Skip to content

Commit

Permalink
rename rose-watchdog to rose-watch
Browse files Browse the repository at this point in the history
  • Loading branch information
azuline committed May 12, 2024
1 parent 088e0bc commit 882f248
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"
'';
Expand All @@ -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 ];
};
};
});
Expand Down
4 changes: 2 additions & 2 deletions rose-cli/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
, py-deps
, rose-py
, rose-vfs
, rose-watchdog
, rose-watch
}:

python-pin.pkgs.buildPythonPackage {
Expand All @@ -13,7 +13,7 @@ python-pin.pkgs.buildPythonPackage {
propagatedBuildInputs = [
rose-py
rose-vfs
rose-watchdog
rose-watch
py-deps.click
];
doCheck = false;
Expand Down
2 changes: 1 addition & 1 deletion rose-cli/rose_cli/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion rose-cli/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
"click",
"rose",
"rose-vfs",
"rose-watchdog",
"rose-watch",
],
)
File renamed without changes.
2 changes: 1 addition & 1 deletion rose-watchdog/default.nix → rose-watch/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
}:

python-pin.pkgs.buildPythonPackage {
pname = "rose-watchdog";
pname = "rose-watch";
version = version;
src = ./.;
propagatedBuildInputs = [
Expand Down
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions rose-watchdog/setup.py → rose-watch/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 882f248

Please sign in to comment.