From a40fa2376d0c2eeb96a9188a53b8e674988c13e2 Mon Sep 17 00:00:00 2001
From: Nikhil Dhandre <nik.digitronik@live.com>
Date: Tue, 30 Apr 2019 03:55:09 -0400
Subject: [PATCH 1/2] remove pyyaml and introduce rumel.yaml
Signed-off-by: Nikhil Dhandre <nik.digitronik@live.com>
---
miqsel/config.py | 6 +++---
miqsel/env.py | 6 +++---
setup.py | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/miqsel/config.py b/miqsel/config.py
index 5c82481..e106077 100644
--- a/miqsel/config.py
+++ b/miqsel/config.py
@@ -1,7 +1,7 @@
import os
import click
-import yaml
+from ruamel.yaml import safe_load, safe_dump
class Configuration(object):
@@ -14,11 +14,11 @@ def __init__(self, conf_file=None):
def read(self):
with open(self.conf_file, "r") as ymlfile:
- return yaml.load(ymlfile)
+ return safe_load(ymlfile)
def write(self, cfg):
with open(self.conf_file, "w") as ymlfile:
- return yaml.safe_dump(cfg, ymlfile, default_flow_style=False)
+ return safe_dump(cfg, ymlfile, default_flow_style=False)
@click.command(help="Configure Miq Selenium Server")
diff --git a/miqsel/env.py b/miqsel/env.py
index a3f97e4..e92e0e1 100644
--- a/miqsel/env.py
+++ b/miqsel/env.py
@@ -1,7 +1,7 @@
import os
import click
-import yaml
+from ruamel.yaml import safe_load, safe_dump
from miqsel.config import Configuration
@@ -49,7 +49,7 @@ def read(self):
:return: dict
"""
with open(self.env_file, "r") as ymlfile:
- return yaml.load(ymlfile)
+ return safe_load(ymlfile)
def write(self, cfg):
""" Write Environment file
@@ -58,7 +58,7 @@ def write(self, cfg):
"""
if self.in_env:
with open(self.env_file, "w") as ymlfile:
- return yaml.safe_dump(cfg, ymlfile, default_flow_style=False)
+ return safe_dump(cfg, ymlfile, default_flow_style=False)
else:
click.echo(
"Project directory need set or run from Project directory; 'env.yaml' not updated"
diff --git a/setup.py b/setup.py
index 2cc5648..31777a8 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@
with open("README.md") as readme_file:
readme = readme_file.read()
-install_requirements = ["Click>=5.0", "docker>=3.1", "PyYAML>=3.0"]
+install_requirements = ["Click>=5.0", "docker>=3.1", "ruamel.yaml~=0.15"]
setup_requirements = ["setuptools_scm"]
From db55ad80e1ac1f6c15394957449dcf4fe14b769d Mon Sep 17 00:00:00 2001
From: Nikhil Dhandre <nik.digitronik@live.com>
Date: Tue, 30 Apr 2019 05:59:17 -0400
Subject: [PATCH 2/2] fix conflict in env
Signed-off-by: Nikhil Dhandre <nik.digitronik@live.com>
---
miqsel/env.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/miqsel/env.py b/miqsel/env.py
index e92e0e1..d897f60 100644
--- a/miqsel/env.py
+++ b/miqsel/env.py
@@ -37,11 +37,11 @@ def env_file(self):
@property
def in_env(self):
- """ Check env.local.yaml exist or not
+ """ Check we are in env or not.
:return: return bool
"""
proj_dir = os.path.dirname(self.env_file)
- return os.path.isdir(proj_dir) and proj_dir == "conf"
+ return os.path.isdir(proj_dir)
def read(self):
"""Read Environment file