Prepare for release 2017_03_27

Azure · Mar 27, 2017 · 6f050d1 · 6f050d1
1 parent 4047191
commit 6f050d1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 15 deletions.
diff --git a/build_all/windows/build_client.cmd b/build_all/windows/build_client.cmd
@@ -31,7 +31,6 @@ REM target may be set to 64 bit build if a Python x64 detected
 set build-config=Release
 set wheel=0
 set platname=win32
-set use-websockets=OFF
 
 goto :args-loop
 
@@ -44,7 +43,6 @@ exit /b 1
 if "%1" equ "" goto args-done
 if "%1" equ "--config" goto arg-build-config
 if "%1" equ "--wheel" goto arg-build-wheel
-if "%1" equ "--use-websockets" goto arg-use-websockets
 if "%1" equ "--platform" goto arg-build-platform
 call :usage && exit /b 1
 
@@ -58,10 +56,6 @@ goto args-continue
 set wheel=1
 goto args-continue
 
-:arg-use-websockets
-set use-websockets=ON
-goto args-continue
-
 :arg-build-platform
 shift
 if "%1" equ "" call :usage && exit /b 1
@@ -83,11 +77,7 @@ set cmake-output=cmake_%build-platform%
 REM -- C --
 cd %build-root%..\..\c\build_all\windows
 
-if %use-websockets% == ON (
-    call build_client.cmd --platform %build-platform% --buildpython %build-python% --config %build-config% --use-websockets
-) else (
-    call build_client.cmd --platform %build-platform% --buildpython %build-python% --config %build-config%
-)
+call build_client.cmd --platform %build-platform% --buildpython %build-python% --config %build-config%
 
 if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
 cd %build-root%
@@ -201,5 +191,4 @@ echo  --config ^<value^>         [Debug] build configuration (e.g. Debug, Releas
 echo  --platform ^<value^>       [Win32] build platform (e.g. Win32, x64, ...)
 echo  --buildpython ^<value^>    [2.7]   build python extension (e.g. 2.7, 3.4, ...)
 echo  --no-logging               Disable logging
-echo  --use-websockets           Enable websocket support for AMQP and MQTT
 goto :eof
diff --git a/c b/c
diff --git a/device/samples/iothub_client_sample.py b/device/samples/iothub_client_sample.py
@@ -137,7 +137,7 @@ def iothub_client_init():
         client.set_option("logtrace", 0)
     client.set_message_callback(
         receive_message_callback, RECEIVE_CONTEXT)
-    if client.protocol == IoTHubTransportProvider.MQTT:
+    if client.protocol == IoTHubTransportProvider.MQTT or client.protocol == IoTHubTransportProvider.MQTT_WS:
         client.set_device_twin_callback(
             device_twin_callback, TWIN_CONTEXT)
         client.set_device_method_callback(

diff --git a/service/src/iothub_service_client_python.cpp b/service/src/iothub_service_client_python.cpp
@@ -33,7 +33,7 @@
 #define IMPORT_NAME iothub_service_client
 #endif
 
-#define IOTHUB_PYTHON_SERVICE_SDK_VERSION "3"
+#define IOTHUB_PYTHON_SERVICE_SDK_VERSION "4"
 #define VERSION_STRING IOTHUB_SERVICE_CLIENT_VERSION "." IOTHUB_PYTHON_SERVICE_SDK_VERSION
 
 #if PY_MAJOR_VERSION >= 3