Skip to content

Commit

Permalink
Merge branch 'hotfix/v0.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
etienne-napoleone committed Sep 28, 2018
2 parents f6b9356 + 2edbc18 commit 782d4e9
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "tmn"
version = "0.2.0"
version = "0.2.1"
description = "Quickstart your masternode"
readme = "README.md"
license = "GPL-3.0+"
Expand Down
2 changes: 1 addition & 1 deletion tests/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def _clean(tmn):


def test_version(runner, tmn):
version = '0.2.0'
version = '0.2.1'
result = runner.invoke(tmn.main, ['--version'])
assert result.output[-6:-1] == version
assert package.__version__ == version
Expand Down
2 changes: 1 addition & 1 deletion tmn/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import logging

__version__ = '0.2.0'
__version__ = '0.2.1'

handler = logging.StreamHandler()
handler.setFormatter(logging.Formatter('[%(levelname)s] %(message)s'))
Expand Down
4 changes: 3 additions & 1 deletion tmn/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ def __init__(self, name: str = None, net: str = None,
self.networks = {}
self.services = {}
self.volumes = {}
self.id = self._new_id()
self.name = name
self.net = net
self.pkey = pkey
self.id = None
if not docker_url:
self.client = docker.from_env()
else:
Expand All @@ -54,6 +54,7 @@ def _new_id(self) -> str:
def _load(self) -> None:
if self.name or self.net or self.pkey:
display.warning_ignoring_start_options(self.name)
self.id = resources.user.read('id')
self.name = resources.user.read('name')
self.net = resources.user.read('net')
self.pkey = resources.user.read('pkey')
Expand All @@ -76,6 +77,7 @@ def _write(self) -> None:
display.error_start_option_required('--pkey')
sys.exit()
self._validate()
self.id = self._new_id()
resources.user.write('id', self.id)
resources.user.write('name', self.name)
resources.user.write('net', self.net)
Expand Down

0 comments on commit 782d4e9

Please sign in to comment.