Merge pull request #48 from maciejlach/py3x

#46 Python 3.x compatibility change - drop 3.3, add 3.5

.travis.yml

@@ -4,14 +4,14 @@ sudo: false
 
 python:
   - "2.7"
-  - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
 
 # command to install dependencies
 install: pip install -r requirements.txt -U
 
 # command to run tests
-script:  
+script:
   - python setup.py build_ext --inplace
-  - env PYTHONPATH=. py.test
+  - env PYTHONPATH=. py.test

CHANGELOG.txt

@@ -1,3 +1,9 @@
+------------------------------------------------------------------------------
+  qPython 1.3.0 [2017.03.xx]
+------------------------------------------------------------------------------
+
+  - Add support for Python 3.5 and 3.6. Drop support for Python 3.3.
+
 ------------------------------------------------------------------------------
   qPython 1.2.2 [2016.09.21]
 ------------------------------------------------------------------------------

README.rst

@@ -8,8 +8,8 @@ qPython is a Python library providing support for interprocess communication bet
 - Support for kdb+ protocol and types: v3.0, v2.6, v<=2.5
 - Uncompression of the IPC data stream
 - Internal representation of data via numpy arrays (lists, complex types) and numpy data types (atoms)
-- Supported on Python 2.7/3.3/3.4 and numpy 1.8
- 
+- Supported on Python 2.7/3.4/3.5/3.6 and numpy 1.8+
+
 For more details please refer to the `documentation`_.
 
 
@@ -30,7 +30,7 @@ Documentation
 ~~~~~~~~~~~~~
 
 qPython documentation is generated with help of `Sphinx`_ document generator.
-In order to build the documentation, including the API docs, execute: 
+In order to build the documentation, including the API docs, execute:
 ``make html`` from the doc directory.
 
 Documentation is built into the: ``doc/build/html/`` directory.
@@ -41,15 +41,15 @@ Compile Cython extensions
 
 qPython utilizes `Cython`_ to tune performance critical parts of the code.
 
-Instructions: 
+Instructions:
 
 - Execute: ``python setup.py build_ext --inplace``
 
 
 Build binary distribution
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Instructions: 
+Instructions:
 
 - Execute: ``python setup.py bdist``
 
@@ -79,7 +79,7 @@ Optional requirements have to be met to provide additional features:
 - support serialization/deserialization of ``pandas.Series`` and ``pandas.DataFrame``
 
   - pandas 0.14.0
-  
+
 - run Twisted sample:
 
   - Twisted 13.2.0
@@ -91,10 +91,10 @@ Optional requirements have to be met to provide additional features:
 
 Required libraries can be installed using `pip`_.
 
-To install all the required dependencies, execute: 
+To install all the required dependencies, execute:
 ``pip install -r requirements.txt``
 
-Minimal set of required dependencies can be installed by executing: 
+Minimal set of required dependencies can be installed by executing:
 ``pip install -r requirements-minimal.txt``
 
 .. _Cython: http://cython.org/

setup.py

@@ -74,8 +74,9 @@ def read(fname):
           'Programming Language :: Python :: 2',
           'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.3',
           'Programming Language :: Python :: 3.4',
+          'Programming Language :: Python :: 3.5',
+          'Programming Language :: Python :: 3.6',
           'Topic :: Database :: Front-Ends',
           'Topic :: Scientific/Engineering',
           'Topic :: Software Development',

tests/qtypes_test.py

@@ -1,18 +1,18 @@
-# 
+#
 #  Copyright (c) 2011-2014 Exxeleron GmbH
-# 
+#
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
 #  You may obtain a copy of the License at
-# 
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 #  Unless required by applicable law or agreed to in writing, software
 #  distributed under the License is distributed on an "AS IS" BASIS,
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-# 
+#
 
 import pytest
 import sys
@@ -41,7 +41,7 @@ def test_is_null():
 
     assert is_null(qnull(QBOOL), QBOOL)
     assert is_null(numpy.bool_(False), QBOOL)
-    assert not is_null(numpy.bool_(True), QBOOL)     
+    assert not is_null(numpy.bool_(True), QBOOL)
 
     for t in QNULLMAP.keys():
         assert is_null(qnull(t), t)
@@ -109,8 +109,8 @@ def test_qtable():
                name=QSYMBOL, iq=QLONG)
 
     assert len(t) == 3
-    assert t[t['name'] == 'Dent']['name'] == b'Dent'
-    assert t[t['name'] == 'Dent']['iq'] == long(98)
+    assert t[t['name'] == b'Dent']['name'] == b'Dent'
+    assert t[t['name'] == b'Dent']['iq'] == long(98)