[1/4] incubator-ariatosca git commit: ARIA-282 Make SSH capability opt-in [Forced Update!]

2017-06-22 Thread mxmrlv
Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-284-Cleanup-and-optimize-the-task-execution a86ba295e -> 
827230da2 (forced update)


ARIA-282 Make SSH capability opt-in

Since the Fabric library uses Paramiko, which is a library
using a license which is incompatible with Apache's,
ARIA's SSH capabilities are now opt-in and no longer part
of the default installation.

Instead, users who would like to use SSH operations
should install ARIA's extra "[ssh]", which would install
Fabric and allow to take advantage of the execution-plugin's
SSH capabilities.

Users who won't install this extra will still be able to use
ARIA as well as the execution plugin, only without SSH.

Additional changes:

 - A new tox environment has been created for running
   SSH tests. The remaining envs only install plain ARIA.

 - requirements.in commented lines were removed -
   the bug that used to exist regarding environment markers
   has been fixed, and there's no longer the need
   to copy these manually to requirements.txt.

 - Environment-marked dependencies are now installed
   via "install_requires" rather than "extra_requires".

 - Added requirements.in to the manifest file,
   as well as fixed a bug in setup.py, which caused
   source distribution to make aria get installed
   without any dependencies before this fix.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/105971f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/105971f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/105971f8

Branch: refs/heads/ARIA-284-Cleanup-and-optimize-the-task-execution
Commit: 105971f8ebc81de5ce5a98ce11a1d8580e671c21
Parents: 1fee85c
Author: Ran Ziv 
Authored: Wed Jun 21 15:39:34 2017 +0300
Committer: Ran Ziv 
Committed: Wed Jun 21 17:37:57 2017 +0300

--
 .travis.yml |  2 ++
 MANIFEST.in |  1 +
 Makefile|  5 +--
 .../orchestrator/execution_plugin/operations.py | 13 ++--
 requirements.in | 16 ++
 requirements.txt| 32 ---
 setup.py| 33 +---
 tox.ini | 18 ---
 8 files changed, 53 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/105971f8/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index b11ed62..de02d78 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,8 @@ env:
 - TOX_ENV=py26
 - TOX_ENV=py27e2e
 - TOX_ENV=py26e2e
+- TOX_ENV=py27ssh
+- TOX_ENV=py26ssh
 install:
   - pip install --upgrade pip
   - pip install --upgrade setuptools

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/105971f8/MANIFEST.in
--
diff --git a/MANIFEST.in b/MANIFEST.in
index 877a7dd..020b00e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include NOTICE
 include VERSION
 include CHANGELOG.rst
 include README.rst
+include requirements.in
 include requirements.txt
 recursive-include docs/html *
 recursive-include examples *

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/105971f8/Makefile
--
diff --git a/Makefile b/Makefile
index cb4b58f..f5f2e66 100644
--- a/Makefile
+++ b/Makefile
@@ -33,10 +33,10 @@ clean:
-find . -type d -name '*.egg-info' -exec rm -rf {} \; 2>/dev/null
 
 install:
-   pip install .
+   pip install .[ssh]
 
 install-virtual:
-   pip install --editable .
+   pip install --editable .[ssh]

# "pip install --editable" will not add our extensions to the path, so 
we will patch the virtualenv
EXTENSIONS_PATH="$$(head -n 1 "$(EASY_INSTALL_PTH)")/extensions" && \
@@ -55,6 +55,7 @@ test:
tox -e pylint_tests
tox -e py$(PYTHON_VERSION)
tox -e py$(PYTHON_VERSION)e2e
+   tox -e py$(PYTHON_VERSION)ssh
 
 dist: docs
python ./setup.py sdist bdist_wheel

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/105971f8/aria/orchestrator/execution_plugin/operations.py
--
diff --git a/aria/orchestrator/execution_plugin/operations.py 
b/aria/orchestrator/execution_plugin/operations.py
index 5effa8a..0bc8083 100644
--- a/aria/orchestrator/execution_plugin/operations.py
+++ b/aria/orchestrator/execution_plugin/operations.py
@@ -15,7 +15,6 @@
 
 from aria.orchestrator 

incubator-ariatosca git commit: ARIA-282 Make SSH capability opt-in [Forced Update!]

2017-06-21 Thread ran
Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-282-make-ssh-capability-opt-in f783b5323 -> 65a8e787e (forced 
update)


ARIA-282 Make SSH capability opt-in

Since the Fabric library uses Paramiko, which is a library
using a license which is incompatible with Apache's,
ARIA's SSH capabilities are now opt-in and no longer part
of the default installation.

Instead, users who would like to use SSH operations
should install ARIA's extra "[ssh]", which would install
Fabric and allow to take advantage of the execution-plugin's
SSH capabilities.

Users who won't install this extra will still be able to use
ARIA as well as the execution plugin, only without SSH.

Additional changes:

 - A new tox environment has been created for running
   SSH tests. The remaining envs only install plain ARIA.

 - requirements.in commented lines were removed -
   the bug that used to exist regarding environment markers
   has been fixed, and there's no longer the need
   to copy these manually to requirements.txt.

 - Environment-marked dependencies are now installed
   via "install_requires" rather than "extra_requires".

 - Added requirements.in to the manifest file,
   as well as fixed a bug in setup.py, which caused
   source distribution to make aria get installed
   without any dependencies before this fix.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/65a8e787
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/65a8e787
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/65a8e787

Branch: refs/heads/ARIA-282-make-ssh-capability-opt-in
Commit: 65a8e787eb66141caed8acc15c7913765459cc25
Parents: 9907520
Author: Ran Ziv 
Authored: Wed Jun 21 15:39:34 2017 +0300
Committer: Ran Ziv 
Committed: Wed Jun 21 17:16:13 2017 +0300

--
 .travis.yml |  2 ++
 MANIFEST.in |  1 +
 Makefile|  5 +--
 .../orchestrator/execution_plugin/operations.py | 13 ++--
 requirements.in | 16 ++
 requirements.txt| 32 ---
 setup.py| 33 +---
 tox.ini | 18 ---
 8 files changed, 53 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/65a8e787/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index b11ed62..de02d78 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,8 @@ env:
 - TOX_ENV=py26
 - TOX_ENV=py27e2e
 - TOX_ENV=py26e2e
+- TOX_ENV=py27ssh
+- TOX_ENV=py26ssh
 install:
   - pip install --upgrade pip
   - pip install --upgrade setuptools

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/65a8e787/MANIFEST.in
--
diff --git a/MANIFEST.in b/MANIFEST.in
index 877a7dd..020b00e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include NOTICE
 include VERSION
 include CHANGELOG.rst
 include README.rst
+include requirements.in
 include requirements.txt
 recursive-include docs/html *
 recursive-include examples *

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/65a8e787/Makefile
--
diff --git a/Makefile b/Makefile
index cb4b58f..f5f2e66 100644
--- a/Makefile
+++ b/Makefile
@@ -33,10 +33,10 @@ clean:
-find . -type d -name '*.egg-info' -exec rm -rf {} \; 2>/dev/null
 
 install:
-   pip install .
+   pip install .[ssh]
 
 install-virtual:
-   pip install --editable .
+   pip install --editable .[ssh]

# "pip install --editable" will not add our extensions to the path, so 
we will patch the virtualenv
EXTENSIONS_PATH="$$(head -n 1 "$(EASY_INSTALL_PTH)")/extensions" && \
@@ -55,6 +55,7 @@ test:
tox -e pylint_tests
tox -e py$(PYTHON_VERSION)
tox -e py$(PYTHON_VERSION)e2e
+   tox -e py$(PYTHON_VERSION)ssh
 
 dist: docs
python ./setup.py sdist bdist_wheel

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/65a8e787/aria/orchestrator/execution_plugin/operations.py
--
diff --git a/aria/orchestrator/execution_plugin/operations.py 
b/aria/orchestrator/execution_plugin/operations.py
index 5effa8a..0bc8083 100644
--- a/aria/orchestrator/execution_plugin/operations.py
+++ b/aria/orchestrator/execution_plugin/operations.py
@@ -15,7 +15,6 @@
 
 from aria.orchestrator import operation
 from .