Skip to content

Commit

Permalink
[REF] git_trunk: version.py moved to footil
Browse files Browse the repository at this point in the history
Module `version.py` moved to a more generic place, so it could be reused
without depending on `git_trunk`.

[BRANCH] feature/footil-version-manager-sbu
  • Loading branch information
SButko committed Mar 1, 2021
1 parent 364ed4b commit 2075032
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 137 deletions.
2 changes: 1 addition & 1 deletion git_trunk/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.4.0'
__version__ = '0.5.0'
10 changes: 6 additions & 4 deletions git_trunk/git_trunk_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
import natsort
from footil.path import chdir_tmp
from footil.patterns import MethodCommand
from footil import version as version_manager
import git # GitPython

from . import git_trunk_base as gt_base
from . import git_trunk_config as gt_config
from . import version as version_manager

EMPTY_VERSION = '0.0.0' # default version when are no versions yet

Expand Down Expand Up @@ -269,8 +269,9 @@ def handle_tracking_data(
method=self.git_push,
args=(
trunk_tracking_data.remote,
trunk_tracking_data.head)
trunk_tracking_data.head,
)
)
]
)
if active_tracking_data:
Expand All @@ -282,8 +283,9 @@ def handle_tracking_data(
method=self.git_delete_remote_branch,
args=(
active_tracking_data.remote,
active_tracking_data.head)
active_tracking_data.head,
)
)
]
)
force_delete = False
Expand Down Expand Up @@ -549,7 +551,7 @@ def _get_message_for_squash(
return None

def _amend_commit_for_squash(
self, message: Union[None, str] = None):
self, message: Union[None, str]=None):
args = ['--amend']
if message:
args.extend(['-m', message])
Expand Down
131 changes: 0 additions & 131 deletions git_trunk/version.py

This file was deleted.

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
url='https://github.com/focusate/git-trunk',
description="Git Trunk based workflow",
long_description=open('README.rst').read(),
install_requires=['footil>=0.19.0', 'gitpython', 'semver', 'natsort'],
install_requires=['footil>=0.24.0', 'gitpython'],
scripts=['bin/git-trunk'],
maintainer='Andrius Laukavičius',
maintainer_email='[email protected]',
Expand Down

0 comments on commit 2075032

Please sign in to comment.