You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ariatosca.apache.org by mx...@apache.org on 2017/10/19 12:01:20 UTC
[10/10] incubator-ariatosca git commit: wip
wip
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/ac88b0bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/ac88b0bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/ac88b0bc
Branch: refs/heads/new_wagon_setuptools
Commit: ac88b0bc1014e8f2b46657161a0da3d888a657ec
Parents: 8e4f4e2
Author: max-orlov <ma...@gigaspaces.com>
Authored: Thu Oct 19 15:00:38 2017 +0300
Committer: max-orlov <ma...@gigaspaces.com>
Committed: Thu Oct 19 15:00:38 2017 +0300
----------------------------------------------------------------------
aria/__init__.py | 32 ++++++++++++++++++++++++++++++++
requirements.in | 4 ++--
requirements.txt | 10 ++++------
3 files changed, 38 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/ac88b0bc/aria/__init__.py
----------------------------------------------------------------------
diff --git a/aria/__init__.py b/aria/__init__.py
index 76a62ce..0496e33 100644
--- a/aria/__init__.py
+++ b/aria/__init__.py
@@ -18,11 +18,43 @@ The ARIA root package provides entry points for extension and storage initializa
"""
import sys
+import types
+import os
import pkg_resources
aria_package_name = 'apache-ariatosca'
__version__ = pkg_resources.get_distribution(aria_package_name).version
+
+
+
+try:
+ import ruamel # noqa: F401
+except ImportError:
+ if sys.version_info[0] > 2:
+ raise
+
+ # Traverse all of the site-packages and try to load ruamel.
+ for packages_dir in sys.path:
+ ruamel_path = os.path.join(packages_dir, 'ruamel')
+ if not os.path.exists(ruamel_path):
+ continue
+
+ # If the top dir has an __init__.py file, the loading should have
+ # succeeded automatically
+ if os.path.exists(os.path.join(ruamel_path, '__init__.py')):
+ raise
+
+ # Dynamically create mapping to the ruamel package
+ ruamel_module = sys.modules.setdefault(
+ 'ruamel',
+ types.ModuleType('ruamel')
+ )
+ # add path to the mapped package
+ ruamel_module.__dict__.setdefault('__path__', []).append(ruamel_path)
+
+
+
from .orchestrator.decorators import workflow, operation # pylint: disable=wrong-import-position
from . import ( # pylint: disable=wrong-import-position
extension,
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/ac88b0bc/requirements.in
----------------------------------------------------------------------
diff --git a/requirements.in b/requirements.in
index 723ed51..06ea55c 100644
--- a/requirements.in
+++ b/requirements.in
@@ -24,9 +24,9 @@ shortuuid>=0.5, <0.6
CacheControl[filecache]>=0.11.0, <0.13
clint>=0.5.0, <0.6
SQLAlchemy>=1.1.0, <1.2 # version 1.2 dropped support of python 2.6
-wagon==0.6.0
+wagon==0.6.1
bottle>=0.12.0, <0.13
-setuptools>=35.0.0, <36.0.0
+setuptools>=36.0.0, <37.0.0
click>=6.0, < 7.0
colorama>=0.3.7, <=0.3.9
PrettyTable>=0.7,<0.8
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/ac88b0bc/requirements.txt
----------------------------------------------------------------------
diff --git a/requirements.txt b/requirements.txt
index 7ee1008..e71638a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -24,20 +24,18 @@ markupsafe==1.0 # via jinja2
msgpack-python==0.4.8 # via cachecontrol
networkx==1.9.1
ordereddict==1.1 ; python_version < "2.7"
-packaging==16.8 # via setuptools
prettytable==0.7.2
psutil==5.2.2
-pyparsing==2.2.0 # via packaging
requests==2.13.0
retrying==1.3.3
ruamel.ordereddict==0.4.9 # via ruamel.yaml
ruamel.yaml==0.11.15
shortuuid==0.5.0
-six==1.10.0 # via packaging, retrying, setuptools
+six==1.10.0 # via retrying
sqlalchemy==1.1.6
total-ordering==0.1.0 ; python_version < "2.7"
-wagon==0.6.0
-wheel==0.29.0 # via wagon
+wagon==0.6.1
+wheel==0.29.0 ; python_version < "2.7"
# The following packages are considered to be unsafe in a requirements file:
-setuptools==35.0.2
+setuptools==36.6.0