build fixes

Author: igorcoding

.ci/travis-before-install.sh

@@ -10,7 +10,7 @@ if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
     echo "deb https://packagecloud.io/tarantool/${TARANTOOL_VERSION}/ubuntu/ $release main" | sudo tee /etc/apt/sources.list.d/tarantool_${TARANTOOL_VERSION}.list
     echo "deb-src https://packagecloud.io/tarantool/${TARANTOOL_VERSION}/ubuntu/ $release main" | sudo tee -a /etc/apt/sources.list.d/tarantool_${TARANTOOL_VERSION}.list
     sudo apt-get -qq update
-    sudo apt-get -y install tarantool
+    sudo apt-get -y install tarantool tarantool-queue
     sudo tarantoolctl stop example || exit 0
     sudo apt-get install pandoc
 elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
@@ -19,4 +19,7 @@ elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
     else
         brew install tarantool
     fi
+
+    brew install [email protected]
+    luarocks-5.1 install https://raw.githubusercontent.com/tarantool/rocks/gh-pages/queue-scm-1.rockspec
 fi

.ci/travis-install.sh

@@ -17,8 +17,8 @@ elif [ "${TRAVIS_OS_NAME}" == "osx" ]; then
     pyenv rehash
 fi
 
-sudo pip install --upgrade pip wheel
-sudo pip install --upgrade setuptools
+pip install --upgrade pip wheel
+pip install --upgrade setuptools
 pip install -r requirements.txt
 pip install coveralls
 pip install -e .

.ci/travis-tests.sh

@@ -12,10 +12,10 @@ if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
 fi
 
 if [[ "${BUILD}" == *quicktests* ]]; then
-    make && make quicktest
+    make && make quicktest || exit 1
 else
-    make && make test
-    make clean && make debug && make test
+    make && make test || exit 1
+    make clean && make debug && make test || exit 1
 fi
 
 if [[ "${BUILD}" == *coverage* ]]; then

.travis.yml

@@ -71,9 +71,9 @@ deploy:
     api_key:
       secure: CJ6KqhcxNx9seTTk5bXyoEC4tyQu1stquP2E1DWn7F5rhRmuR5ApKuJfgVOZDcy3S59jTuAperW/He3CHghkHcm7JspB8270zh/rwxFx6Viw3hPXsJFAB4GbBKXSRxc6XTTa0Jh3cC3yIwNSfm2BbcJb6HiLnyeqOjoHs83fZYVK/eFeWQQc9VGSdsop7urOQC7iKLM0BXIivOVuuFGJPSCz2VvvDpx/CKbr1qJ3qHbkCJhze/D+IAudbvEmgO1IhFEQHe7oo+cBN1aTgrbZqFM55V5WH48s/CWlVb3SE+RISiPLN3fY9edbi4UKm1SFz43LQ6BNG77fttdN4sKXz7zy5/73mENt1oavhx0l0tnIMUgoEPCb3rUD4BgJaFcSAFdiX1Kv5TU5A5Yu/BsrRdaScwdDw+vpvdQCoucFBn2lXVotyOHT/fFKiEjQ6WRRxMnaukvQcIhoLn4N+jHEh2txFTyDE5iMeXDuqf730xTjwC34Bixru0NANzJsT+MJBZTND7rWA19M6TLxHcAeDgePYVdfgMZt+944eN/qeQcYgDSaKM5KGW3pibG8M4hhqfr1Zcm0LI8kZA9zVV9fahK2Gt6UIbMI/1PzzVLRYF7lFYfePsmToj6QoRWmn5+hQ8EfuJwsiF9nQ+cr1WzpcH5ccsB2KDfIzwWF6L2ThF4=
     file_glob: true
-    file: dist/asynctnt_queue*.tar.gz
+    file: dist/asynctnt-queue*.tar.gz
     on:
-      repo: igorcoding/asynctnt_queue
+      repo: igorcoding/asynctnt-queue
       tags: true
       condition: '"${BUILD}" == *release*'
 

README.md

@@ -1,3 +1,3 @@
-## asynctnt_queue
+## asynctnt-queue
 
 Tarantool Queue python/asyncio bindings

asynctnt_queue/queue.py

@@ -40,4 +40,6 @@ async def statistics(self, tube_name=None):
             args = (tube_name,)
 
         res = await self._conn.call('queue.statistics', args)
+        if self._conn.version < (1, 7):
+            return res.body[0][0]
         return res.body[0]

docs/index.rst

@@ -1,23 +1,23 @@
 ==============
-asynctnt_queue
+asynctnt-queue
 ==============
 
-.. image:: https://travis-ci.org/igorcoding/asynctnt_queue.svg?branch=master
-    :target: https://travis-ci.org/igorcoding/asynctnt_queue
+.. image:: https://travis-ci.org/igorcoding/asynctnt-queue.svg?branch=master
+    :target: https://travis-ci.org/igorcoding/asynctnt-queue
 
-.. image:: https://img.shields.io/pypi/v/asynctnt_queue.svg
-    :target: https://pypi.python.org/pypi/asynctnt_queue
+.. image:: https://img.shields.io/pypi/v/asynctnt-queue.svg
+    :target: https://pypi.python.org/pypi/asynctnt-queue
 
 
-asynctnt_queue is a bindings library for
+asynctnt-queue is a bindings library for
 `tarantool-queue <https://github.com/tarantool/queue>`__ package in
 `Tarantool Database <https://tarantool.org/>`__. It is integrated with
 `asynctnt <https://github.com/igorcoding/asynctnt/>`__ module
 
 
 License
 -------
-asynctnt_queue is developed and distributed under the Apache 2.0 license.
+asynctnt-queue is developed and distributed under the Apache 2.0 license.
 
 
 .. toctree::

docs/installation.rst

@@ -8,7 +8,7 @@ To install asynctnt through **pip** run:
 
 .. code-block:: bash
 
-    $ pip install asynctnt_queue
+    $ pip install asynctnt-queue
 
 
 Running tests

setup.py

@@ -25,13 +25,13 @@ def find_version():
 
 
 setup(
-    name="asynctnt_queue",
+    name="asynctnt-queue",
     packages=["asynctnt_queue"],
     include_package_data=True,
     version=find_version(),
     author="igorcoding",
     author_email="[email protected]",
-    url='https://github.com/igorcoding/asynctnt_queue',
+    url='https://github.com/igorcoding/asynctnt-queue',
     license='Apache Software License',
     classifiers=[
         "Programming Language :: Python :: 3 :: Only",

tests/files/app.lua

@@ -39,3 +39,4 @@ queue.create_tube('test_tube', 'fifottl', {temporary = true})
 function truncate()
     box.space.test_tube:truncate()
 end
+box.schema.func.create('truncate', {setuid=true})