diff --git a/requirements-minimal.txt b/requirements-minimal.txt index 4f3b639..53fa50c 100644 --- a/requirements-minimal.txt +++ b/requirements-minimal.txt @@ -1,2 +1,2 @@ -numpy>=1.8.0 -pytest>=2.5.0 \ No newline at end of file +numpy>=1.24.0 +pytest>=2.5.0 diff --git a/requirements.txt b/requirements.txt index e54f4a6..1c3f0d2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ pytest>=2.5.0 -numpy>=1.8.0 +numpy>=1.24.0 pandas>=0.14.0 cython>=0.20 twisted>=13.2.0 -mock>=1.0.1 \ No newline at end of file +mock>=1.0.1 diff --git a/tests/pandas_test.py b/tests/pandas_test.py index baacd92..fd7536c 100644 --- a/tests/pandas_test.py +++ b/tests/pandas_test.py @@ -52,7 +52,7 @@ (b'(0b;1b;0b)', {'data': pandas.Series(numpy.array([False, True, False], dtype = bool)), 'meta': MetaData(qtype = QBOOL_LIST) }), - (b'(0x01;0x02;0xff)', {'data': pandas.Series(numpy.array([1, 2, 0xff], dtype = numpy.int8)), + (b'(0x01;0x02;0xff)', {'data': pandas.Series(numpy.array([1, 2, 0xff]).astype(numpy.int8)), 'meta': MetaData(qtype = QBYTE_LIST) }), (b'(1h;2h;3h)', {'data': pandas.Series(numpy.array([1, 2, 3], dtype = numpy.int16)), 'meta': MetaData(qtype = QSHORT_LIST) }), diff --git a/tests/qreader_test.py b/tests/qreader_test.py index bf1027e..20561fc 100644 --- a/tests/qreader_test.py +++ b/tests/qreader_test.py @@ -196,7 +196,7 @@ def test_reading_one(query, value): test_reading_one(b'0Ng', qnull(QGUID)) test_reading_one(b'()', []), test_reading_one(b'(0b;1b;0b)', qlist(numpy.array([False, True, False], dtype=numpy.bool_), qtype=QBOOL_LIST)) - test_reading_one(b'(0x01;0x02;0xff)', qlist(numpy.array([0x01, 0x02, 0xff], dtype=numpy.byte), qtype=QBYTE_LIST)) + test_reading_one(b'(0x01;0x02;0xff)', qlist(numpy.array([0x01, 0x02, 0xff]).astype(numpy.byte), qtype=QBYTE_LIST)) test_reading_one(b'(1h;2h;3h)', qlist(numpy.array([1, 2, 3], dtype=numpy.int16), qtype=QSHORT_LIST)) test_reading_one(b'(1h;0Nh;3h)', qlist(numpy.array([1, qnull(QSHORT), 3], dtype=numpy.int16), qtype=QSHORT_LIST)) test_reading_one(b'1 2 3', qlist(numpy.array([1, 2, 3], dtype=numpy.int64), qtype=QLONG_LIST)) diff --git a/tests/qwriter_test.py b/tests/qwriter_test.py index 24f974e..94dee9e 100644 --- a/tests/qwriter_test.py +++ b/tests/qwriter_test.py @@ -186,8 +186,8 @@ def test_writing_one(query, value): test_writing_one(b'(0b;1b;0b)', (numpy.array([False, True, False], dtype=numpy.bool_), qlist(numpy.array([False, True, False]), qtype = QBOOL_LIST), qlist([False, True, False], qtype = QBOOL_LIST))) - test_writing_one(b'(0x01;0x02;0xff)', (numpy.array([0x01, 0x02, 0xff], dtype=numpy.byte), - qlist(numpy.array([0x01, 0x02, 0xff], dtype=numpy.byte), qtype = QBYTE_LIST), + test_writing_one(b'(0x01;0x02;0xff)', (numpy.array([0x01, 0x02, 0xff]).astype(numpy.byte), + qlist(numpy.array([0x01, 0x02, 0xff]).astype(numpy.byte), qtype = QBYTE_LIST), qlist(numpy.array([0x01, 0x02, 0xff]), qtype = QBYTE_LIST), qlist([0x01, 0x02, 0xff], qtype = QBYTE_LIST))) test_writing_one(b'(1h;2h;3h)', (numpy.array([1, 2, 3], dtype=numpy.int16),