Merge pull request #277 from cloudify-cosmo/3.8.7-build

update requirements

Author: EarthmanT

.gitignore

@@ -67,3 +67,7 @@ azurecloudify/tests/test_conf.py
 
 cover
 azure/*
+fusion-agent
+fusion-common
+fusion-manager
+cloudify-utilities-plugins-sdk

CHANGELOG.txt

@@ -1,3 +1,4 @@
+3.8.7: Update requirements.txt.
 3.8.6: wagon_311 & new circleci context.
 3.8.5: Add DSL 1.5 YAML.
 3.8.4: Setup Plugin YAMLs.

Makefile

@@ -0,0 +1,13 @@
+download:
+ifeq (,$(wildcard ./fusion-agent))
+	git clone https://${GH_USER}:${GITHUB_PASSWORD}@eos2git.cec.lab.emc.com/ISG-Edge/fusion-agent.git && cd './fusion-agent' && git checkout rel/magicp1-2.0.0 && cd ..
+endif
+ifeq (,$(wildcard ./fusion-common))
+	git clone https://${GH_USER}:${GITHUB_PASSWORD}@eos2git.cec.lab.emc.com/ISG-Edge/fusion-common.git && cd './fusion-common' && git checkout rel/magicp1-2.0.0 && cd ..
+endif
+ifeq (,$(wildcard ./fusion-manager))
+	git clone https://${GH_USER}:${GITHUB_PASSWORD}@eos2git.cec.lab.emc.com/ISG-Edge/fusion-manager.git && cd './fusion-manager' && git checkout rel/magicp1-2.0.0 && cd ..
+endif
+ifeq (,$(wildcard ./cloudify-utilities-plugins-sdk))
+	git clone https://github.com/cloudify-incubator/cloudify-utilities-plugins-sdk.git && cd './cloudify-utilities-plugins-sdk' && git checkout fusion && cd ..
+endif

cloudify_azure/__version__.py

@@ -1 +1 @@
-version = '3.8.6'
+version = '3.8.7'

cloudify_azure/utils.py

@@ -18,8 +18,7 @@
     Microsoft Azure plugin for Cloudify helper utilities
 """
 import re
-
-from collections import Mapping
+import sys
 
 from cloudify import ctx
 from cloudify import exceptions as cfy_exc
@@ -28,6 +27,11 @@
 from msrestazure.azure_exceptions import CloudError
 from azure.core.exceptions import ResourceNotFoundError
 
+if sys.version_info.major == 3 and sys.version_info.minor > 7:
+    from collections.abc import Mapping
+else:
+    from collections import Mapping
+
 
 def dict_update(orig, updates):
     """Recursively merges two objects"""

constraints.txt

@@ -11,5 +11,4 @@ EOF
     cat <<EOF > ./webbrowser/__init__.py
 pass
 EOF
-    git apply python311.patch
 fi

dev-requirements.txt

@@ -2,7 +2,7 @@ plugins:
   azure:
     executor: central_deployment_agent
     package_name: cloudify-azure-plugin
-    package_version: 3.8.6
+    package_version: 3.8.7
 data_types:
   cloudify.datatypes.azure.Config:
     properties:

extra-packaging-instructions.sh

@@ -2,7 +2,7 @@ plugins:
   azure:
     executor: central_deployment_agent
     package_name: cloudify-azure-plugin
-    package_version: 3.8.6
+    package_version: 3.8.7
 
 data_types:
   cloudify.datatypes.azure.Config: