ARIA-64 Remove PyYAML dependency * Added "requirements" target to Makefile * Small tweak to README
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/5d1e56b0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/5d1e56b0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/5d1e56b0 Branch: refs/heads/ARIA-64-remove-pyyaml Commit: 5d1e56b04b643ae786d1573ca00ede894e19d2ae Parents: b6d3c43 Author: Tal Liron <[email protected]> Authored: Fri Jun 2 12:39:00 2017 -0500 Committer: Tal Liron <[email protected]> Committed: Mon Jun 5 11:41:40 2017 -0500 ---------------------------------------------------------------------- Makefile | 21 ++++++++++++--------- README.md | 5 +++-- aria/cli/config/config.py | 2 +- aria/cli/inputs.py | 2 +- requirements.in | 1 - requirements.txt | 1 - 6 files changed, 17 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/5d1e56b0/Makefile ---------------------------------------------------------------------- diff --git a/Makefile b/Makefile index 3bafd3b..2b267c4 100644 --- a/Makefile +++ b/Makefile @@ -29,18 +29,21 @@ clean: install: pip install --upgrade . -requirements: - pip install --upgrade --requirement requirements.txt +requirements-dependencies: + pip install pip-tools==1.9.0 -docs-requirements: - pip install --upgrade --requirement "$(DOCS)/requirements.txt" +requirements: requirements-dependencies + pip-compile --output-file requirements.txt requirements.in -test-requirements: - pip install tox==2.5.0 +docs-dependencies: + pip install --upgrade --requirement "$(DOCS)/requirements.txt" -docs: docs-requirements requirements +docs: docs-dependencies install rm -rf "$(HTML)" sphinx-build -b html "$(DOCS)" "$(HTML)" -test: test-requirements requirements - PYTHONPATH="$(EXTENSIONS):$(PYTHONPATH)" tox +test-dependencies: + pip install tox==2.7.0 + +test: test-dependencies + tox http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/5d1e56b0/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index e534645..8a91a01 100644 --- a/README.md +++ b/README.md @@ -46,11 +46,12 @@ Quick Start You need Python 2.6 or 2.7. Python 3+ is not currently supported. To install, we recommend using [pip](https://pip.pypa.io/) and a -[virtualenv](https://virtualenv.pypa.io/en/stable/). +[virtualenv](https://virtualenv.pypa.io/en/stable/). Note the extra libraries required for +[installing cryptography support](https://cryptography.io/en/latest/installation/). In Debian-based systems: - sudo apt install python-setuptools + sudo apt install python-setuptools python-dev build-essential libssl-dev libffi-dev sudo -H easy_install pip sudo -H pip install virtualenv virtualenv env http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/5d1e56b0/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/5d1e56b0/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/5d1e56b0/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 http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/5d1e56b0/requirements.txt ---------------------------------------------------------------------- diff --git a/requirements.txt b/requirements.txt index 8551c65..f3027e9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -48,7 +48,6 @@ prettytable==0.7.2 pyasn1==0.2.3 # via paramiko pycparser==2.17 # via cffi pyparsing==2.2.0 # via packaging -pyyaml==3.12 requests==2.13.0 retrying==1.3.3 ruamel.ordereddict==0.4.9 # via ruamel.yaml
