mirror of
https://github.com/OpenMTC/OpenMTC.git
synced 2024-12-25 07:31:12 +00:00
changing python2 to python3 and some other test changes
This commit is contained in:
parent
f638e9a591
commit
e7ec483aba
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user