git-sim 0.3.1__tar.gz → 0.3.3__tar.gz

{git-sim-0.3.1/git_sim.egg-info → git-sim-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: git-sim
-Version: 0.3.1
+Version: 0.3.3
 Summary: Simulate Git commands on your own repos by generating an image (default) or video visualization depicting the command's behavior.
 Home-page: https://initialcommit.com/tools/git-sim
 Author: Jacob Stopak

git-sim-0.3.3/git_sim/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.3.3"

{git-sim-0.3.1 → git-sim-0.3.3}/git_sim/merge.py

@@ -60,7 +60,7 @@ class Merge(GitSimBaseCommand):
         head_commit = self.get_commit()
         branch_commit = self.get_commit(self.branch)
 
-        if not self.is_remote_tracking_branch(self.branch):
+        if self.branch not in self.get_remote_tracking_branches():
             if self.branch in self.repo.git.branch("--contains", head_commit.hexsha):
                 self.ff = True
         else:

git-sim-0.3.3/git_sim/settings.py

@@ -0,0 +1,48 @@
+import pathlib
+from typing import List, Union
+
+from pydantic_settings import BaseSettings
+
+from git_sim.enums import StyleOptions, ColorByOptions, ImgFormat, VideoFormat
+
+
+class Settings(BaseSettings):
+    allow_no_commits: bool = False
+    animate: bool = False
+    auto_open: bool = True
+    n_default: int = 5
+    n: int = 5
+    files: Union[List[pathlib.Path], None] = None
+    hide_first_tag: bool = False
+    img_format: ImgFormat = ImgFormat.JPG
+    INFO_STRING: str = "Simulating: git"
+    light_mode: bool = False
+    transparent_bg: bool = False
+    logo: pathlib.Path = pathlib.Path(__file__).parent.resolve() / "logo.png"
+    low_quality: bool = False
+    max_branches_per_commit: int = 1
+    max_tags_per_commit: int = 1
+    media_dir: pathlib.Path = pathlib.Path().cwd()
+    outro_bottom_text: str = "Learn more at initialcommit.com"
+    outro_top_text: str = "Thanks for using Initial Commit!"
+    reverse: bool = False
+    show_intro: bool = False
+    show_outro: bool = False
+    speed: float = 1.5
+    title: str = "Git-Sim, by initialcommit.com"
+    video_format: VideoFormat = VideoFormat.MP4
+    stdout: bool = False
+    output_only_path: bool = False
+    quiet: bool = False
+    invert_branches: bool = False
+    hide_merged_branches: bool = False
+    all: bool = False
+    color_by: Union[ColorByOptions, None] = None
+    highlight_commit_messages: bool = False
+    style: Union[StyleOptions, None] = StyleOptions.CLEAN
+
+    class Config:
+        env_prefix = "git_sim_"
+
+
+settings = Settings()

{git-sim-0.3.1 → git-sim-0.3.3/git_sim.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: git-sim
-Version: 0.3.1
+Version: 0.3.3
 Summary: Simulate Git commands on your own repos by generating an image (default) or video visualization depicting the command's behavior.
 Home-page: https://initialcommit.com/tools/git-sim
 Author: Jacob Stopak

{git-sim-0.3.1 → git-sim-0.3.3}/git_sim.egg-info/requires.txt

@@ -2,5 +2,5 @@ gitpython
 manim
 opencv-python-headless
 typer
-pydantic
+pydantic_settings
 git-dummy

{git-sim-0.3.1 → git-sim-0.3.3}/setup.py

@@ -26,7 +26,7 @@ setuptools.setup(
         "manim",
         "opencv-python-headless",
         "typer",
-        "pydantic",
+        "pydantic_settings",
         "git-dummy",
     ],
     keywords="git sim simulation simulate git-simulate git-simulation git-sim manim animation gitanimation image video dryrun dry-run",

git-sim-0.3.1/git_sim/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.3.1"

git-sim-0.3.1/git_sim/settings.py

@@ -1,48 +0,0 @@
-import pathlib
-from typing import List, Union
-
-from pydantic import BaseSettings
-
-from git_sim.enums import StyleOptions, ColorByOptions, ImgFormat, VideoFormat
-
-
-class Settings(BaseSettings):
-    allow_no_commits = False
-    animate = False
-    auto_open = True
-    n_default = 5
-    n = 5
-    files: Union[List[pathlib.Path], None] = None
-    hide_first_tag = False
-    img_format: ImgFormat = ImgFormat.JPG
-    INFO_STRING = "Simulating: git"
-    light_mode = False
-    transparent_bg = False
-    logo = pathlib.Path(__file__).parent.resolve() / "logo.png"
-    low_quality = False
-    max_branches_per_commit = 1
-    max_tags_per_commit = 1
-    media_dir = pathlib.Path().cwd()
-    outro_bottom_text = "Learn more at initialcommit.com"
-    outro_top_text = "Thanks for using Initial Commit!"
-    reverse = False
-    show_intro = False
-    show_outro = False
-    speed = 1.5
-    title = "Git-Sim, by initialcommit.com"
-    video_format: VideoFormat = VideoFormat.MP4
-    stdout = False
-    output_only_path = False
-    quiet = False
-    invert_branches = False
-    hide_merged_branches = False
-    all = False
-    color_by: Union[ColorByOptions, None] = None
-    highlight_commit_messages = False
-    style: Union[StyleOptions, None] = StyleOptions.CLEAN
-
-    class Config:
-        env_prefix = "git_sim_"
-
-
-settings = Settings()