Changeset: ccf07922520a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ccf07922520a Modified Files: clients/iotapi/requirements.txt clients/iotapi/src/Settings/mapiconnection.py clients/iotclient/requirements.txt clients/iotclient/src/Settings/mapiconnection.py clients/iotclient/src/Streams/datatypes.py clients/iotclient/src/Streams/jsonschemas.py clients/iotclient/tests/main.py Branch: iot Log Message:
Fixed imports, changed mapi driver diffs (105 lines): diff --git a/clients/iotapi/requirements.txt b/clients/iotapi/requirements.txt --- a/clients/iotapi/requirements.txt +++ b/clients/iotapi/requirements.txt @@ -1,10 +1,10 @@ git+https://github.com/dpallot/simple-websocket-server.git IPy==0.83 jsonschema==2.5.1 -pymonetdb==0.1.1 python-dateutil==2.5.3 +python-monetdb==11.24.0 pytz==2016.4 -Sphinx==1.4.3 +Sphinx==1.4.4 sphinx-rtd-theme==0.1.9 tzlocal==1.2.2 watchdog==0.8.3 diff --git a/clients/iotapi/src/Settings/mapiconnection.py b/clients/iotapi/src/Settings/mapiconnection.py --- a/clients/iotapi/src/Settings/mapiconnection.py +++ b/clients/iotapi/src/Settings/mapiconnection.py @@ -1,6 +1,6 @@ import sys -from pymonetdb import connect +from monetdb.sql import connect from ..Settings.iotlogger import add_log Connection = None diff --git a/clients/iotclient/requirements.txt b/clients/iotclient/requirements.txt --- a/clients/iotclient/requirements.txt +++ b/clients/iotclient/requirements.txt @@ -3,11 +3,11 @@ Flask-RESTful==0.3.5 IPy==0.83 iso8601==0.1.11 jsonschema==2.5.1 -pymonetdb==0.1.1 python-dateutil==2.5.3 +python-monetdb==11.24.0 pytz==2016.4 rfc3987==1.3.6 -Sphinx==1.4.3 +Sphinx==1.4.4 sphinx-rtd-theme==0.1.9 strict-rfc3339==0.7 tzlocal==1.2.2 diff --git a/clients/iotclient/src/Settings/mapiconnection.py b/clients/iotclient/src/Settings/mapiconnection.py --- a/clients/iotclient/src/Settings/mapiconnection.py +++ b/clients/iotclient/src/Settings/mapiconnection.py @@ -1,4 +1,4 @@ -from pymonetdb import connect +from monetdb.sql import connect from Settings.iotlogger import add_log diff --git a/clients/iotclient/src/Streams/datatypes.py b/clients/iotclient/src/Streams/datatypes.py --- a/clients/iotclient/src/Streams/datatypes.py +++ b/clients/iotclient/src/Streams/datatypes.py @@ -9,7 +9,7 @@ from itertools import chain from json import dumps from math import ceil, log10 from re import compile, split -from .jsonschemas import UUID_REGEX, MAC_ADDRESS_REGEX, TIME_REGEX, IPV4_REGEX +from jsonschemas import UUID_REGEX, MAC_ADDRESS_REGEX, TIME_REGEX, IPV4_REGEX # The null constants might change from system to system due to different CPU's limits LITTLE_ENDIAN_ALIGNMENT = '<' # for now it is little-endian diff --git a/clients/iotclient/src/Streams/jsonschemas.py b/clients/iotclient/src/Streams/jsonschemas.py --- a/clients/iotclient/src/Streams/jsonschemas.py +++ b/clients/iotclient/src/Streams/jsonschemas.py @@ -1,7 +1,7 @@ UUID_REGEX = "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" IPV4_REGEX = "^(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}(?:\/[0-2]\d|\/3[0-2])?$" MAC_ADDRESS_REGEX = "^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$" -TIME_REGEX = "^([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])\.\d{3}[\+-]([01]\d|2[0-3]):[0-5]\d$" +TIME_REGEX = "^([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])\.\d{3}([\+-]([01]\d|2[0-3]):[0-5]\d)?$" TIMED_FLUSH_IDENTIFIER = "time" TUPLE_FLUSH_IDENTIFIER = "tuple" diff --git a/clients/iotclient/tests/main.py b/clients/iotclient/tests/main.py --- a/clients/iotclient/tests/main.py +++ b/clients/iotclient/tests/main.py @@ -1,11 +1,11 @@ import argparse import getpass import os -import pymonetdb import sys import unittest -from .datatypesinsertstests import TextTest, URLTest, INetTest, UUIDTest, BooleanTest, TinyIntegerTest,\ +from monetdb.sql import connect +from datatypesinsertstests import TextTest, URLTest, INetTest, UUIDTest, BooleanTest, TinyIntegerTest,\ SmallIntegerTest, IntegerTest, BigIntegerTest, HugeIntegerTest, RealPointTest, FloatPointTest, DecimalTest,\ DateTest, TimeWithoutTimezoneTest, TimeWithTimezoneTest, TimestampWithoutTimezoneTest, TimestampWithTimezoneTest,\ NullableTextTest, NullableURLTest, NullableINetTest, NullableUUIDTest, NullableBooleanTest,\ @@ -54,8 +54,8 @@ def main(): try: con_password = getpass.getpass(prompt='Insert password for user ' + args['user'] + ':') - mapi_connection = pymonetdb.connect(hostname=args['host'], port=args['port'], username=args['user'], - password=con_password, database=args['database'], autocommit=True) + mapi_connection = connect(hostname=args['host'], port=args['port'], username=args['user'], + password=con_password, database=args['database'], autocommit=True) except BaseException as ex: print ex sys.exit(1) _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
