From afd924d473176ed71754e051ce959d6592bd960a Mon Sep 17 00:00:00 2001 From: Marcus Gutierrez Date: Tue, 25 Jan 2022 21:33:56 -0600 Subject: [PATCH 1/2] Fix import paths --- cli/base_service.py | 4 ++-- cli/identity.py | 4 ++-- cli/keys.py | 4 ++-- cli/kube.py | 4 ++-- cli/main.py | 12 ++++++------ cli/network.py | 4 ++-- cli/vm.py | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/cli/base_service.py b/cli/base_service.py index ba9b8e4..cb5e5a7 100644 --- a/cli/base_service.py +++ b/cli/base_service.py @@ -1,11 +1,11 @@ import sys import argparse import json -from functools import reduce import operator +from functools import reduce from tabulate import tabulate from echome.session import Session -from defaults import APP_NAME, DEFAULT_FORMAT +from .defaults import APP_NAME, DEFAULT_FORMAT class BaseService: diff --git a/cli/identity.py b/cli/identity.py index 9e62c2e..c04af79 100644 --- a/cli/identity.py +++ b/cli/identity.py @@ -3,8 +3,8 @@ import json from echome import Session from echome.identity import Identity -from base_service import BaseService -from defaults import APP_NAME +from .base_service import BaseService +from .defaults import APP_NAME class IdentityService(BaseService): diff --git a/cli/keys.py b/cli/keys.py index 527af79..f603211 100644 --- a/cli/keys.py +++ b/cli/keys.py @@ -3,8 +3,8 @@ import json from echome import Session from echome.keys import Keys -from base_service import BaseService -from defaults import APP_NAME +from .base_service import BaseService +from .defaults import APP_NAME class KeysService(BaseService): diff --git a/cli/kube.py b/cli/kube.py index 15604a2..4c4cc2c 100644 --- a/cli/kube.py +++ b/cli/kube.py @@ -3,8 +3,8 @@ import json from echome import Session from echome.kube import Kube -from base_service import BaseService -from defaults import APP_NAME +from .base_service import BaseService +from .defaults import APP_NAME class KubeService(BaseService): diff --git a/cli/main.py b/cli/main.py index ea34556..9d9647d 100644 --- a/cli/main.py +++ b/cli/main.py @@ -5,12 +5,12 @@ import sys import argparse import logging -from identity import IdentityService -from keys import KeysService -from kube import KubeService -from network import NetworkService -from vm import VmService -from defaults import APP_NAME +from .identity import IdentityService +from .keys import KeysService +from .kube import KubeService +from .network import NetworkService +from .vm import VmService +from .defaults import APP_NAME logging.basicConfig(level=logging.DEBUG) logger = logging.getLogger(__name__) diff --git a/cli/network.py b/cli/network.py index 721f889..a22382e 100644 --- a/cli/network.py +++ b/cli/network.py @@ -3,8 +3,8 @@ import json from echome import Session from echome.network import Network -from base_service import BaseService -from defaults import APP_NAME +from .base_service import BaseService +from .defaults import APP_NAME class NetworkService(BaseService): diff --git a/cli/vm.py b/cli/vm.py index 21f0c41..e2d894f 100644 --- a/cli/vm.py +++ b/cli/vm.py @@ -4,8 +4,8 @@ from tabulate import tabulate from echome import Session from echome.vm import Vm -from base_service import BaseService -from defaults import APP_NAME +from .base_service import BaseService +from .defaults import APP_NAME class VmService(BaseService): From 67d45707235aeb22cf7cd12347d85a466a1b8bbb Mon Sep 17 00:00:00 2001 From: Marcus Gutierrez Date: Tue, 25 Jan 2022 21:34:48 -0600 Subject: [PATCH 2/2] Update version --- CHANGELOG.md | 8 +++++++- cli/main.py | 2 +- setup.py | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f13fae..46e92cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,11 @@ Types of changes: ## [Unreleased] +## [0.3.1] - 2022-01-25 + +### Fixed +- Issue with Python imports + ## [0.3.0] - 2022-01-25 ### Added @@ -48,7 +53,8 @@ Types of changes: ### Added - Initial import of ecHome CLI -[unreleased]: https://github.com/mgtrrz/echome-cli/compare/0.3.0...HEAD +[unreleased]: https://github.com/mgtrrz/echome-cli/compare/0.3.1...HEAD +[0.3.1]: https://github.com/mgtrrz/echome-cli/compare/0.3.0...0.3.1 [0.3.0]: https://github.com/mgtrrz/echome-cli/compare/0.2.0...0.3.0 [0.2.0]: https://github.com/mgtrrz/echome-cli/compare/0.1.0...0.2.0 [0.1.1]: https://github.com/mgtrrz/echome-cli/compare/0.1.0...0.1.1 diff --git a/cli/main.py b/cli/main.py index 9d9647d..154f2c9 100644 --- a/cli/main.py +++ b/cli/main.py @@ -1,5 +1,5 @@ __title__ = 'echome-cli' -__version__ = '0.3.0' +__version__ = '0.3.1' __author__ = 'Marcus Gutierrez' import sys diff --git a/setup.py b/setup.py index c4ff7c4..239a06e 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="echome-cli", - version="0.3.0", + version="0.3.1", author="Marcus Gutierrez", author_email="markg90@gmail.com", description="EcHome CLI",