Skip to content

Commit

Permalink
split pkgs; rose_lib.__init__
Browse files Browse the repository at this point in the history
  • Loading branch information
azuline committed Apr 16, 2024
1 parent c8f0b97 commit 6b0ec50
Show file tree
Hide file tree
Showing 38 changed files with 419 additions and 237 deletions.
2 changes: 1 addition & 1 deletion bump_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ message="$2"
# Fail if the branch is dirty.
git diff --exit-code

echo "$version" > "$ROSE_ROOT/rose_core/.version"
echo "$version" > "$ROSE_ROOT/rose_lib/.version"
git add .
git commit -am "[Release] v$version - $message"
git tag "$version" HEAD -m "v$version"
Expand Down
8 changes: 4 additions & 4 deletions conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
import pytest
from click.testing import CliRunner

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
from rose_lib.cache import CACHE_SCHEMA_PATH, process_string_for_fts, update_cache
from rose_lib.common import VERSION
from rose_lib.config import Config
from rose_lib.templates import PathTemplateConfig

logger = logging.getLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
packages = rec {
rose = python.pkgs.buildPythonPackage {
pname = "rose";
version = nixpkgs.lib.strings.removeSuffix "\n" (builtins.readFile ./rose_core/.version);
version = nixpkgs.lib.strings.removeSuffix "\n" (builtins.readFile ./rose_lib/.version);
src = ./.;
propagatedBuildInputs = prod-deps;
doCheck = false;
Expand Down
3 changes: 3 additions & 0 deletions rose_cli/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from rose_lib import initialize_logging

initialize_logging()
4 changes: 2 additions & 2 deletions rose_core/__main__.py → rose_cli/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import click

from rose_core.cli import cli
from rose_core.common import RoseExpectedError
from rose_cli.cli import cli
from rose_lib import RoseExpectedError


def main() -> None:
Expand Down
Loading

0 comments on commit 6b0ec50

Please sign in to comment.