Merge pull request #570 from QualiSystems/bug_fix/fix_msrestazure_for…

…_1_6_X fixed dependencies (msrestazure), bumped version
QualiSystems · Jan 9, 2019 · 4d1b463 · 4d1b463
2 parents 7e928e4 + b4f9ae2
commit 4d1b463
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,9 +8,6 @@ install:
   - bash ./install_dependencies.sh
 
 script:
-    - pushd package
-    - python setup.py develop
-    - popd
     - python runtests.py --with-coverage  --cover-package=package --exclude setup.py
 
 after_success:

diff --git a/drivers/azure_shell/drivermetadata.xml b/drivers/azure_shell/drivermetadata.xml
@@ -1,4 +1,4 @@
-<Driver Description="This driver orchestrate all the command that will be executed on Azure" MainClass="driver.AzureShellDriver" Name="Azure Shell Driver" Version="1.6.4">
+<Driver Description="This driver orchestrate all the command that will be executed on Azure" MainClass="driver.AzureShellDriver" Name="Azure Shell Driver" Version="1.6.5">
     <Layout>
         <Category Name="Deployment">
             <Command Description="" DisplayName="Deploy VM" EnableCancellation="true" Name="deploy_vm" Tags="allow_unreserved" />

diff --git a/drivers/version.txt b/drivers/version.txt
@@ -1 +1 @@
-1.6.4
+1.6.5
diff --git a/external_requirements.txt b/external_requirements.txt
@@ -8,3 +8,10 @@ azure-mgmt-network~=0.30.0
 azure-mgmt-storage~=0.30.0
 azure-storage==0.33.0
 pycrypto==2.6.1
+msrestazure==0.6.0
+msrest<0.5.0,>=0.4.0
+retrying==1.3.3
+pycrypto==2.6.1
+enum==0.4.6
+httplib2==0.9.2
+netaddr==0.7.19
diff --git a/package/requirements.txt b/package/requirements.txt
@@ -1,6 +1,6 @@
 python-dateutil==2.6.1
 requests==2.14.2
-msrest==0.4.29
+msrest<0.5.0,>=0.4.0
 azure-mgmt-resource~=0.31.0
 azure-mgmt-compute~=0.33.0
 azure-mgmt-network~=0.30.0
@@ -13,6 +13,6 @@ jsonpickle==0.9.3
 enum==0.4.6
 retrying==1.3.3
 pycrypto==2.6.1
-msrestazure>=0.4.0,<0.5.0
+msrestazure==0.6.0
 httplib2==0.9.2
 netaddr==0.7.19
diff --git a/package/version.txt b/package/version.txt
@@ -1 +1 @@
-1.6.4
+1.6.5
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.6.4
+1.6.5