mv rose rose_core

azuline · Apr 16, 2024 · c8f0b97 · c8f0b97
1 parent b8dced7
commit c8f0b97
Show file tree

Hide file tree

Showing 35 changed files with 176 additions and 167 deletions.
diff --git a/bump_version.sh b/bump_version.sh
@@ -9,7 +9,7 @@ message="$2"
 # Fail if the branch is dirty.
 git diff --exit-code
 
-echo "$version" > "$ROSE_ROOT/rose/.version"
+echo "$version" > "$ROSE_ROOT/rose_core/.version"
 git add .
 git commit -am "[Release] v$version - $message"
 git tag "$version" HEAD -m "v$version"

diff --git a/conftest.py b/conftest.py
@@ -9,10 +9,10 @@
 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
-from rose.templates import PathTemplateConfig
+from rose_core.cache import CACHE_SCHEMA_PATH, process_string_for_fts, update_cache
+from rose_core.common import VERSION
+from rose_core.config import Config
+from rose_core.templates import PathTemplateConfig
 
 logger = logging.getLogger(__name__)
 

diff --git a/flake.nix b/flake.nix
@@ -47,7 +47,7 @@
       ];
       dev-cli = pkgs.writeShellScriptBin "rose" ''
         cd $ROSE_ROOT
-        python -m rose "$@"
+        python -m rose_cli "$@"
       '';
     in
     {
@@ -78,7 +78,7 @@
       packages = rec {
         rose = python.pkgs.buildPythonPackage {
           pname = "rose";
-          version = nixpkgs.lib.strings.removeSuffix "\n" (builtins.readFile ./rose/.version);
+          version = nixpkgs.lib.strings.removeSuffix "\n" (builtins.readFile ./rose_core/.version);
           src = ./.;
           propagatedBuildInputs = prod-deps;
           doCheck = false;

diff --git a/rose/.version → rose_core/.version b/rose/.version → rose_core/.version
diff --git a/rose/__init__.py → rose_core/__init__.py b/rose/__init__.py → rose_core/__init__.py
diff --git a/rose/__main__.py → rose_core/__main__.py b/rose/__main__.py → rose_core/__main__.py
@@ -2,8 +2,8 @@
 
 import click
 
-from rose.cli import cli
-from rose.common import RoseExpectedError
+from rose_core.cli import cli
+from rose_core.common import RoseExpectedError
 
 
 def main() -> None:

diff --git a/rose/audiotags.py → rose_core/audiotags.py b/rose/audiotags.py → rose_core/audiotags.py
@@ -25,7 +25,7 @@
 import mutagen.oggopus
 import mutagen.oggvorbis
 
-from rose.common import Artist, ArtistMapping, RoseError, RoseExpectedError, uniq
+from rose_core.common import Artist, ArtistMapping, RoseError, RoseExpectedError, uniq
 
 if typing.TYPE_CHECKING:
     pass

diff --git a/rose/audiotags_test.py → rose_core/audiotags_test.py b/rose/audiotags_test.py → rose_core/audiotags_test.py
@@ -4,14 +4,14 @@
 import pytest
 
 from conftest import TEST_TAGGER
-from rose.audiotags import (
+from rose_core.audiotags import (
     AudioTags,
     UnsupportedTagValueTypeError,
     _split_tag,
     format_artist_string,
     parse_artist_string,
 )
-from rose.common import Artist, ArtistMapping
+from rose_core.common import Artist, ArtistMapping
 
 
 @pytest.mark.parametrize(

diff --git a/rose/cache.py → rose_core/cache.py b/rose/cache.py → rose_core/cache.py
@@ -50,8 +50,8 @@
 import tomllib
 import uuid6
 
-from rose.audiotags import SUPPORTED_AUDIO_EXTENSIONS, AudioTags
-from rose.common import (
+from rose_core.audiotags import SUPPORTED_AUDIO_EXTENSIONS, AudioTags
+from rose_core.common import (
     VERSION,
     Artist,
     ArtistMapping,
@@ -60,8 +60,8 @@
     sha256_dataclass,
     uniq,
 )
-from rose.config import Config
-from rose.templates import artistsfmt, eval_release_template, eval_track_template
+from rose_core.config import Config
+from rose_core.templates import artistsfmt, eval_release_template, eval_track_template
 
 logger = logging.getLogger(__name__)
 

diff --git a/rose/cache.sql → rose_core/cache.sql b/rose/cache.sql → rose_core/cache.sql
diff --git a/rose/cache_test.py → rose_core/cache_test.py b/rose/cache_test.py → rose_core/cache_test.py
@@ -8,8 +8,8 @@
 import tomllib
 
 from conftest import TEST_COLLAGE_1, TEST_PLAYLIST_1, TEST_RELEASE_1, TEST_RELEASE_2, TEST_RELEASE_3
-from rose.audiotags import AudioTags
-from rose.cache import (
+from rose_core.audiotags import AudioTags
+from rose_core.cache import (
     CACHE_SCHEMA_PATH,
     STORED_DATA_FILE_REGEX,
     CachedCollage,
@@ -47,8 +47,8 @@
     update_cache_evict_nonexistent_releases,
     update_cache_for_releases,
 )
-from rose.common import VERSION, Artist, ArtistMapping
-from rose.config import Config
+from rose_core.common import VERSION, Artist, ArtistMapping
+from rose_core.config import Config
 
 
 def test_schema(config: Config) -> None: