Merge pull request QualiSystems#83 from QualiSystems/develop

alexazarh · web-flow · commit 7b3522441db5 · 2017-10-31T11:50:33.000+02:00
Merging dev to master to get the fixed version
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ drivers/ansible_shellPackage/Resource Drivers - Python/*.zip
 .eggs/
 cloudshell_cm_ansible.egg-info/
 package/cloudshell_cm_ansible.egg-info/
+drivers/ansible_shell.zip
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ python:
     - "2.7"
 
 install:
-  - pip install -r package/test_requirements.txt --extra-index-url https://pypi.python.org/simple
+  - pip install -r external_requirements.txt --extra-index-url https://pypi.python.org/simple
   - pip install -r test_requirements.txt --extra-index-url https://pypi.python.org/simple
   - pip install "cloudshell-shell-core>=2.2.0,<2.3.0" --extra-index-url https://testpypi.python.org/simple
   - pip install "cloudshell-automation-api>=8.0.0.0,<8.1.0.0" --extra-index-url https://testpypi.python.org/simple
diff --git a/drivers/ansible_shell/drivermetadata.xml b/drivers/ansible_shell/drivermetadata.xml
@@ -1,4 +1,4 @@
-<Driver Description="" MainClass="driver.AnsibleShellDriver" Name="Ansible Shell Driver" Version="1.0.0">
+<Driver Description="" MainClass="driver.AnsibleShellDriver" Name="Ansible Shell Driver" Version="1.2.0">
     <Layout>
         <Category Name="General">
             <Command Description="" DisplayName="Execute Playbook" EnableCancellation="true" Name="execute_playbook" Tags="allow_unreserved" />
diff --git a/drivers/ansible_shell/requirements.txt b/drivers/ansible_shell/requirements.txt
@@ -1,2 +1,2 @@
 cloudshell-shell-core>=2.2.0,<2.3.0
-cloudshell-cm-ansible>=1.1.0,<1.2.0
+cloudshell-cm-ansible>=1.2.0,<1.3.0
diff --git a/drivers/version.txt b/drivers/version.txt
@@ -1 +1 @@
-1.1.0
+1.2.0
diff --git a/external_requirements.txt b/external_requirements.txt
@@ -0,0 +1,3 @@
+requests
+pywinrm==0.2.2
+paramiko==2.1.2
diff --git a/package/version.txt b/package/version.txt
@@ -1 +1 @@
-1.1.0
+1.2.0
diff --git a/test_requirements.txt b/test_requirements.txt
@@ -1,4 +1,7 @@
 coverage
 teamcity-messages
 nose-exclude
-coveralls
+coveralls
+nose
+mock
+unittest2
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.1.0
+1.2.0

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Driver Description="" MainClass="driver.AnsibleShellDriver" Name="Ansible Shell Driver" Version="1.0.0">`
	`1`	`+<Driver Description="" MainClass="driver.AnsibleShellDriver" Name="Ansible Shell Driver" Version="1.2.0">`
`2`	`2`	`<Layout>`
`3`	`3`	`<Category Name="General">`
`4`	`4`	`<Command Description="" DisplayName="Execute Playbook" EnableCancellation="true" Name="execute_playbook" Tags="allow_unreserved" />`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`cloudshell-shell-core>=2.2.0,<2.3.0`
`2`		`-cloudshell-cm-ansible>=1.1.0,<1.2.0`
	`2`	`+cloudshell-cm-ansible>=1.2.0,<1.3.0`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+requests`
	`2`	`+pywinrm==0.2.2`
	`3`	`+paramiko==2.1.2`