Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-64-remove-pyyaml [created] 62d3b8d7c
ARIA-64 Remove PyYAML dependency Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/62d3b8d7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/62d3b8d7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/62d3b8d7 Branch: refs/heads/ARIA-64-remove-pyyaml Commit: 62d3b8d7c2b7bcacd6d456c971e6c97abd8378f1 Parents: 9174f94 Author: Tal Liron <tal.li...@gmail.com> Authored: Fri Jun 2 12:39:00 2017 -0500 Committer: Tal Liron <tal.li...@gmail.com> Committed: Fri Jun 2 12:39:00 2017 -0500 ---------------------------------------------------------------------- aria/cli/config/config.py | 2 +- aria/cli/inputs.py | 2 +- requirements.in | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/62d3b8d7/aria/cli/config/config.py ---------------------------------------------------------------------- diff --git a/aria/cli/config/config.py b/aria/cli/config/config.py index 8c4214c..d584fad 100644 --- a/aria/cli/config/config.py +++ b/aria/cli/config/config.py @@ -15,8 +15,8 @@ import os -import yaml import pkg_resources +from ruamel import yaml from jinja2.environment import Template http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/62d3b8d7/aria/cli/inputs.py ---------------------------------------------------------------------- diff --git a/aria/cli/inputs.py b/aria/cli/inputs.py index 0ff48dc..4d46ebb 100644 --- a/aria/cli/inputs.py +++ b/aria/cli/inputs.py @@ -15,7 +15,7 @@ import os import glob -import yaml +from ruamel import yaml from .env import logger from .exceptions import AriaCliError http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/62d3b8d7/requirements.in ---------------------------------------------------------------------- diff --git a/requirements.in b/requirements.in index ab06d93..54e8714 100644 --- a/requirements.in +++ b/requirements.in @@ -13,7 +13,6 @@ # In order to create the requirements.txt file, execute # pip-compile --output-file requirements.txt requirements.in (pip-tools package is needed). -PyYAML<3.13 requests>=2.3.0, <2.14.0 networkx>=1.9, <1.10 # version 1.10 dropped support of python 2.6 retrying>=1.3.0, <1.4.0