From e7ec483aba1e7b905d98e45276a88efc3152491f Mon Sep 17 00:00:00 2001
From: aor-fokus <alexander.ortlieb@fokus.fraunhofer.de>
Date: Mon, 14 Jan 2019 02:53:52 +0100
Subject: [PATCH] changing python2 to python3 and some other test changes

---
 create-binary-dist   | 4 ++--
 docker/backend-amd64 | 2 +-
 docker/backend-arm   | 2 +-
 docker/gateway-amd64 | 2 +-
 docker/gateway-arm   | 2 +-
 setup-gevent-all.py  | 8 ++++----
 setup-sdk.py         | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/create-binary-dist b/create-binary-dist
index 87f4ff2..e345645 100755
--- a/create-binary-dist
+++ b/create-binary-dist
@@ -68,7 +68,7 @@ get_target_from_setup_file ()
 local module_name=${setup_file%.py}
 
 cd ${working_dir}
-python - << END_OF_PYTHON
+python3 - << END_OF_PYTHON
 from importlib import import_module
 setup = import_module('${module_name}', '${module_name}')
 print("%s-%s" % (setup.SETUP_NAME, setup.SETUP_VERSION))
@@ -92,7 +92,7 @@ rm -rf ${working_dir}/build
 
 # build
 cd ${working_dir}
-python ${setup_file} bdist --plat-name docker >/dev/null 2>${log_file}
+python3 ${setup_file} bdist --plat-name docker >/dev/null 2>${log_file}
 
 # clean up after
 rm -rf ${working_dir}/build
diff --git a/docker/backend-amd64 b/docker/backend-amd64
index c52da10..d4085d2 100644
--- a/docker/backend-amd64
+++ b/docker/backend-amd64
@@ -12,7 +12,7 @@ MAINTAINER rst/tgu
 
 # install openmtc dependencies
 COPY tmp/$MOD_NAME-dependencies.txt /tmp/requirements.txt
-RUN pip install --upgrade --requirement /tmp/requirements.txt
+RUN pip3 install --upgrade --requirement /tmp/requirements.txt
 
 # install openmtc-all
 COPY tmp/openmtc-$MOD_NAME.tar.gz /tmp/openmtc-$MOD_NAME.tar.gz
diff --git a/docker/backend-arm b/docker/backend-arm
index 0c0a905..620ad2b 100644
--- a/docker/backend-arm
+++ b/docker/backend-arm
@@ -12,7 +12,7 @@ MAINTAINER rst/tgu
 
 # install openmtc dependencies
 COPY tmp/$MOD_NAME-dependencies.txt /tmp/requirements.txt
-RUN pip install --upgrade --requirement /tmp/requirements.txt
+RUN pip3 install --upgrade --requirement /tmp/requirements.txt
 
 # install openmtc-all
 COPY tmp/openmtc-$MOD_NAME.tar.gz /tmp/openmtc-$MOD_NAME.tar.gz
diff --git a/docker/gateway-amd64 b/docker/gateway-amd64
index f1f8044..e53810a 100644
--- a/docker/gateway-amd64
+++ b/docker/gateway-amd64
@@ -12,7 +12,7 @@ MAINTAINER rst/tgu
 
 # install openmtc dependencies
 COPY tmp/$MOD_NAME-dependencies.txt /tmp/requirements.txt
-RUN pip install --upgrade --requirement /tmp/requirements.txt
+RUN pip3 install --upgrade --requirement /tmp/requirements.txt
 
 # install openmtc-all
 COPY tmp/openmtc-$MOD_NAME.tar.gz /tmp/openmtc-$MOD_NAME.tar.gz
diff --git a/docker/gateway-arm b/docker/gateway-arm
index 9a7495b..5041d73 100644
--- a/docker/gateway-arm
+++ b/docker/gateway-arm
@@ -12,7 +12,7 @@ MAINTAINER rst/tgu
 
 # install openmtc dependencies
 COPY tmp/$MOD_NAME-dependencies.txt /tmp/requirements.txt
-RUN pip install --upgrade --requirement /tmp/requirements.txt
+RUN pip3 install --upgrade --requirement /tmp/requirements.txt
 
 # install openmtc-all
 COPY tmp/openmtc-$MOD_NAME.tar.gz /tmp/openmtc-$MOD_NAME.tar.gz
diff --git a/setup-gevent-all.py b/setup-gevent-all.py
index 0ed19a8..b06fee8 100755
--- a/setup-gevent-all.py
+++ b/setup-gevent-all.py
@@ -26,18 +26,18 @@ SETUP_LICENSE = "Fraunhofer FOKUS proprietary"
 SETUP_REQUIRES = [
     "urllib3", "gevent (>=1.0)", "iso8601 (>=0.1.5)", "werkzeug (>=0.9)",
     "blist", "simplejson", "ujson", "python_socketio", "gevent_websocket",
-    "flask", "pyxb (==1.2.3)", "enum34", "dtls", "geventhttpclient",
+    "flask", "enum34", "geventhttpclient",
     # server only
     "funcy", "netifaces", "decorator", "mimeparse", "coapthon", "rdflib",
-    "fyzz", "yapps", "paho_mqtt"
+     "yapps", "paho_mqtt"
 ]
 SETUP_INSTALL_REQUIRES = [
     "urllib3", "gevent >= 1.0", "iso8601 >= 0.1.5", "werkzeug >= 0.9",
     "blist", "simplejson", "ujson", "python_socketio", "gevent_websocket",
-    "flask", "pyxb == 1.2.3", "enum34", "dtls", "geventhttpclient",
+    "flask", "enum34", "geventhttpclient",
     # server only
     "funcy", "netifaces", "decorator", "mimeparse", "coapthon", "rdflib",
-    "fyzz", "yapps", "paho_mqtt"
+     "yapps", "paho_mqtt"
 ]
 
 # packages
diff --git a/setup-sdk.py b/setup-sdk.py
index db31913..3b2e80b 100755
--- a/setup-sdk.py
+++ b/setup-sdk.py
@@ -20,12 +20,12 @@ SETUP_LICENSE = "Fraunhofer FOKUS proprietary"
 SETUP_REQUIRES = [
     "urllib3", "gevent (>=1.0)", "iso8601 (>=0.1.5)", "werkzeug (>=0.9)",
     "blist", "simplejson", "ujson", "python_socketio", "gevent_websocket",
-    "flask", "pyxb (==1.2.3)", "enum34", "dtls", "geventhttpclient"
+    "flask", "enum34", "geventhttpclient"
 ]
 SETUP_INSTALL_REQUIRES = [
     "urllib3", "gevent >= 1.0", "iso8601 >= 0.1.5", "werkzeug >= 0.9",
     "blist", "simplejson", "ujson", "python_socketio", "gevent_websocket",
-    "flask", "pyxb == 1.2.3", "enum34", "dtls", "geventhttpclient"
+    "flask", "enum34", "geventhttpclient"
 ]
 
 # packages