repackage everything into proper subdirectories

.gitignore

@@ -11,6 +11,7 @@ __pycache__
 .coverage
 .coverage.*
 htmlcov
+*.egg-info
 
 # Zig
 *.so

Makefile

@@ -2,7 +2,7 @@ check: typecheck test lintcheck
 
 # Build the Zig library for development.
 build-zig:
-	cd rose_zig && zig build -Doptimize=Debug
+	cd rose-zig && zig build -Doptimize=Debug
 
 typecheck:
 	mypy .

conftest.py

@@ -9,7 +9,6 @@
 
 import pytest
 from click.testing import CliRunner
-
 from rose.cache import CACHE_SCHEMA_PATH, process_string_for_fts, update_cache
 from rose.common import VERSION
 from rose.config import Config, VirtualFSConfig

flake.nix

@@ -14,8 +14,9 @@
     flake-utils.lib.eachDefaultSystem (system:
     let
       pkgs = import nixpkgs { inherit system; };
-      python = pkgs.python311;
-      uuid6-python = python.pkgs.buildPythonPackage {
+      python-pin = pkgs.python311;
+      version = nixpkgs.lib.strings.removeSuffix "\n" (builtins.readFile ./rose-py/rose/.version);
+      uuid6 = python-pin.pkgs.buildPythonPackage {
         pname = "uuid6-python";
         version = "2023.5.2";
         src = pkgs.fetchFromGitHub {
@@ -26,28 +27,31 @@
         };
         doCheck = false;
       };
-      prod-py-deps = with python.pkgs; [
-        appdirs
-        cffi
-        click
-        jinja2
-        llfuse
-        mutagen
-        send2trash
-        setuptools
-        tomli-w
-        uuid6-python
-        watchdog
-      ];
-      dev-py-deps = with python.pkgs; [
-        mypy
-        pytest
-        pytest-timeout
-        pytest-cov
-        pytest-xdist
-        snapshottest
-      ];
-      version = nixpkgs.lib.strings.removeSuffix "\n" (builtins.readFile ./rose/.version);
+      py-deps = with python-pin.pkgs; {
+        inherit
+          # Runtime deps.
+          appdirs
+          cffi
+          click
+          jinja2
+          llfuse
+          mutagen
+          send2trash
+          setuptools
+          tomli-w
+          uuid6
+          watchdog
+          # Dev tools.
+          mypy
+          pytest
+          pytest-timeout
+          pytest-cov
+          pytest-xdist
+          snapshottest;
+      };
+      python-with-deps = python-pin.withPackages (_:
+        pkgs.lib.attrsets.mapAttrsToList (a: b: b) py-deps
+      );
     in
     {
       devShells.default = pkgs.mkShell {
@@ -60,13 +64,17 @@
             echo "$path"
           }
           export ROSE_ROOT="$(find-up flake.nix)"
-          export ROSE_SO_PATH="$ROSE_ROOT/rose_zig/zig-out/lib/librose.so"
+          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-vfs:$PYTHONPATH"
+          export PYTHONPATH="$ROSE_ROOT/rose-cli:$PYTHONPATH"
         '';
         buildInputs = [
           (pkgs.buildEnv {
             name = "rose-devshell";
             paths = with pkgs; [
-              (python.withPackages (_: prod-py-deps ++ dev-py-deps))
+              python-with-deps
               ruff
               nodePackages.pyright
               nodePackages.prettier
@@ -77,29 +85,14 @@
         ];
       };
       packages = rec {
-        rose-zig = pkgs.callPackage ./rose_zig { inherit version; };
-        # TODO: Split up into multiple packages.
-        rose-py = python.pkgs.buildPythonPackage {
-          pname = "rose";
-          version = version;
-          src = ./.;
-          propagatedBuildInputs = prod-py-deps ++ [ rose-zig ];
-          nativeBuildInputs = [ pkgs.makeWrapper ];
-          postInstall = ''
-            wrapProgram $out/bin/rose --set ROSE_SO_PATH "${rose-zig}/lib/librose.so"
-          '';
-          doCheck = false;
-        };
-        # CLI is currently rose-py...
-        rose-cli = rose-py;
-        # Mainly for building everything in CI.
+        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-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; };
         all = pkgs.buildEnv {
           name = "rose-all";
-          paths = [
-            rose-zig
-            rose-py
-            rose-cli
-          ];
+          paths = [ rose-zig rose-py rose-watchdog rose-vfs rose-cli ];
         };
       };
     });

pyproject.toml

@@ -61,6 +61,9 @@ unfixable = [
 strict = true
 strict_optional = true
 explicit_package_bases = true
+exclude = [
+    "setup.py"
+]
 
 [[tool.mypy.overrides]]
 module = "fuse"

rose-cli/default.nix

@@ -0,0 +1,20 @@
+{ python-pin
+, version
+, py-deps
+, rose-py
+, rose-vfs
+, rose-watchdog
+}:
+
+python-pin.pkgs.buildPythonPackage {
+  pname = "rose-cli";
+  version = version;
+  src = ./.;
+  propagatedBuildInputs = [
+    rose-py
+    rose-vfs
+    rose-watchdog
+    py-deps.click
+  ];
+  doCheck = false;
+}

rose_cli/__main__.py → rose-cli/rose_cli/__main__.py

@@ -1,13 +1,12 @@
 import sys
 
 import click
+from rose import RoseExpectedError
 
 from rose_cli.cli import CliExpectedError, cli
 
 
 def main() -> None:
-    from rose import RoseExpectedError
-
     try:
         cli()
     except (RoseExpectedError, CliExpectedError) as e:

rose_cli/cli.py → rose-cli/rose_cli/cli.py

@@ -15,7 +15,6 @@
 from pathlib import Path
 
 import click
-
 from rose import (
     VERSION,
     Action,
@@ -51,6 +50,9 @@
     toggle_release_new,
     update_cache,
 )
+from rose_vfs import mount_virtualfs
+from rose_watchdog import start_watchdog
+
 from rose_cli.dump import (
     dump_all_artists,
     dump_all_collages,
@@ -70,8 +72,6 @@
     dump_track,
 )
 from rose_cli.templates import preview_path_templates
-from rose_vfs import mount_virtualfs
-from rose_watchdog import start_watchdog
 
 logger = logging.getLogger(__name__)
 

rose_cli/cli_test.py → rose-cli/rose_cli/cli_test.py

@@ -5,9 +5,10 @@
 
 import pytest
 from click.testing import CliRunner
-
 from rose import AudioTags, Config
 from rose.ffi import get_release
+from rose_vfs.virtualfs_test import start_virtual_fs
+
 from rose_cli.cli import (
     Context,
     InvalidReleaseArgError,
@@ -19,7 +20,6 @@
     unwatch,
     watch,
 )
-from rose_vfs.virtualfs_test import start_virtual_fs
 
 
 @pytest.mark.usefixtures("seeded_cache")

rose_cli/dump_test.py → rose-cli/rose_cli/dump_test.py

@@ -2,8 +2,8 @@
 from typing import Any
 
 import pytest
-
 from rose import Config, Matcher
+
 from rose_cli.dump import (
     dump_all_artists,
     dump_all_collages,

rose_cli/templates.py → rose-cli/rose_cli/templates.py

@@ -1,5 +1,4 @@
 import click
-
 from rose import (
     Config,
     PathTemplate,

rose_cli/templates_test.py → rose-cli/rose_cli/templates_test.py

@@ -1,7 +1,7 @@
 import click
 from click.testing import CliRunner
-
 from rose import Config
+
 from rose_cli.templates import (
     preview_path_templates,
 )

rose-cli/setup.py

@@ -0,0 +1,21 @@
+import setuptools
+
+with open(".version") as f:
+    version = f.read().strip()
+
+setuptools.setup(
+    name="rose-cli",
+    version=version,
+    python_requires=">=3.11.0",
+    author="blissful",
+    author_email="blissful@sunsetglow.net",
+    license="Apache-2.0",
+    entry_points={"console_scripts": ["rose = rose_cli.__main__:main"]},
+    packages=["rose_cli"],
+    install_requires=[
+        "click",
+        "rose",
+        "rose-vfs",
+        "rose-watchdog",
+    ],
+)

rose-py/default.nix

@@ -0,0 +1,23 @@
+{ python-pin
+, version
+, py-deps
+, rose-zig
+}:
+
+python-pin.pkgs.buildPythonPackage {
+  pname = "rose";
+  version = version;
+  src = ./.;
+  propagatedBuildInputs = [
+    rose-zig
+    py-deps.appdirs
+    py-deps.click
+    py-deps.jinja2
+    py-deps.mutagen
+    py-deps.send2trash
+    py-deps.tomli-w
+    py-deps.uuid6
+  ];
+  doCheck = false;
+  ROSE_SO_PATH = "${rose-zig}/lib/librose.so";
+}

rose-py/rose/.version

@@ -0,0 +1 @@
+0.5.0

setup.py → rose-py/setup.py

@@ -10,8 +10,7 @@
     author="blissful",
     author_email="blissful@sunsetglow.net",
     license="Apache-2.0",
-    entry_points={"console_scripts": ["rose = rose_cli.__main__:main"]},
-    packages=setuptools.find_namespace_packages(where="."),
+    packages=["rose"],
     package_data={"rose": ["*.sql", ".version"]},
     install_requires=[
         "appdirs",

rose-vfs/.version

@@ -0,0 +1 @@
+0.5.0

rose-vfs/default.nix

@@ -0,0 +1,16 @@
+{ python-pin
+, version
+, py-deps
+, rose-py
+}:
+
+python-pin.pkgs.buildPythonPackage {
+  pname = "rose-vfs";
+  version = version;
+  src = ./.;
+  propagatedBuildInputs = [
+    rose-py
+    py-deps.llfuse
+  ];
+  doCheck = false;
+}

rose_vfs/__init__.py → rose-vfs/rose_vfs/__init__.py

@@ -1,4 +1,5 @@
 from rose import initialize_logging
+
 from rose_vfs.virtualfs import mount_virtualfs, unmount_virtualfs
 
 __all__ = [

rose_vfs/virtualfs.py → rose-vfs/rose_vfs/virtualfs.py

@@ -54,7 +54,6 @@
 from typing import Any, Generic, Literal, TypeVar
 
 import llfuse
-
 from rose import (
     SUPPORTED_AUDIO_EXTENSIONS,
     AudioTags,

rose_vfs/virtualfs_test.py → rose-vfs/rose_vfs/virtualfs_test.py

@@ -8,9 +8,9 @@
 from pathlib import Path
 
 import pytest
+from rose import AudioTags, Config
 
 from conftest import retry_for_sec
-from rose import AudioTags, Config
 from rose_vfs.virtualfs import ALL_TRACKS, mount_virtualfs, unmount_virtualfs
 
 R1_VNAME = "Techno Man & Bass Man - 2023. Release 1"

rose-vfs/setup.py

@@ -0,0 +1,18 @@
+import setuptools
+
+with open(".version") as f:
+    version = f.read().strip()
+
+setuptools.setup(
+    name="rose-vfs",
+    version=version,
+    python_requires=">=3.11.0",
+    author="blissful",
+    author_email="blissful@sunsetglow.net",
+    license="Apache-2.0",
+    packages=["rose_vfs"],
+    install_requires=[
+        "rose",
+        "llfuse",
+    ],
+)

rose-watchdog/.version

@@ -0,0 +1 @@
+0.5.0