You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ariatosca.apache.org by ra...@apache.org on 2017/06/06 08:50:18 UTC
incubator-ariatosca git commit: ARIA-64 Remove PyYAML dependency
[Forced Update!]
Repository: incubator-ariatosca
Updated Branches:
refs/heads/ARIA-64-remove-pyyaml 5d1e56b04 -> e4d003680 (forced update)
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/e4d00368
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/e4d00368
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/e4d00368
Branch: refs/heads/ARIA-64-remove-pyyaml
Commit: e4d003680acc1dc4bc442a044a5feb0688475b46
Parents: b6d3c43
Author: Tal Liron <ta...@gmail.com>
Authored: Fri Jun 2 12:39:00 2017 -0500
Committer: Ran Ziv <ra...@gigaspaces.com>
Committed: Tue Jun 6 11:50:09 2017 +0300
----------------------------------------------------------------------
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/e4d00368/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/e4d00368/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/e4d00368/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