Merge pull request #278 from dclong/dev

Merge dev into main

Author: dclong

dsutil/__init__.py

@@ -3,4 +3,4 @@
 from . import git
 from . import poetry
 
-__version__ = "0.61.2"
+__version__ = "0.61.3"

dsutil/docker/builder.py

@@ -443,12 +443,11 @@ def _compare_git_branches(path: str, b1: str, b2: str) -> bool:
         :param b2: Another branches.
         :return: True if there are no differences between the 2 branches and false otherwise.
         """
-        repo = git.Repo(path)
         logger.debug("Comparing branches {} and {} of the local repo {}", b1, b2, path)
         if b1 == b2:
             return True
-        cmd = f"git -C {path} diff {b1}..{b2} -- :(exclude)test :(exclude)tests"
-        diff = sp.run(cmd, shell=True, check=True, capture_output=True)
+        cmd = f"git -C {path} diff {b1}..{b2} -- ':(exclude)test' ':(exclude)tests'"
+        diff = sp.run(cmd, shell=True, check=True, capture_output=True).stdout
         return not diff
 
     def _add_root_node(self, node) -> Node:

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dsutil"
-version = "0.61.2"
+version = "0.61.3"
 description = "A utils Python package for data scientists."
 authors = ["Benjamin Du <[email protected]>"]
 

readme.md

@@ -24,7 +24,7 @@ Currently, Python 3.7 and 3.8 are supported.
 
 You can download a copy of the latest release and install it using pip.
 ```
-pip3 install --user -U https://github.com/dclong/dsutil/releases/download/v0.61.2/dsutil-0.61.2-py3-none-any.whl
+pip3 install --user -U https://github.com/dclong/dsutil/releases/download/v0.61.3/dsutil-0.61.3-py3-none-any.whl
 ```
 Or you can use the following command to install the latest master branch
 if you have pip 20.0+.