Merge pull request scrapinghub#379 from suzil/bump/py36

Bump to Python 3.6 + 3.7

Author: sibiryakov

.gitignore

@@ -53,3 +53,6 @@ docs/_build/
 
 # PyBuilder
 target/
+
+# Virtualenv
+.env/

.travis.yml

@@ -28,6 +28,20 @@ matrix:
         - mysql
         - postgresql
         - redis-server
+    - python: 3.6
+      env: TOXENV=py36
+      services:
+        - docker
+        - mysql
+        - postgresql
+        - redis-server
+    - python: 3.7
+      env: TOXENV=py37
+      services:
+        - docker
+        - mysql
+        - postgresql
+        - redis-server
 
 install:
   - pip install -U tox wheel codecov

README.md

@@ -43,5 +43,3 @@ $ pip install frontera
 
 Join our Google group at https://groups.google.com/a/scrapinghub.com/forum/#!forum/frontera or check GitHub issues and 
 pull requests.
-
-

frontera/contrib/backends/hbase/utils.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 from happybase import Batch
 
-from thriftpy.transport import TTransportException
+from thriftpy2.transport import TTransportException
 import logging
 
 
@@ -19,4 +19,4 @@ def send(self):
             self.logger.exception("Exception happened during batch persistence")
             self.logger.warning("Cleaning up the batch")
             self._reset_mutations()
-            pass
+            pass

requirements/tests.txt

@@ -1,3 +1,4 @@
+flaky
 pytest>=2.6.4
 PyMySQL>=0.6.3
 psycopg2>=2.5.4

setup.py

@@ -34,6 +34,8 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Software Development :: Libraries :: Application Frameworks',
         'Topic :: Software Development :: Libraries :: Python Modules',
@@ -61,7 +63,8 @@
             'tldextract>=1.5.1',
         ],
         'hbase': [
-            'happybase>=1.0.0'
+            'happybase>=1.0.0',
+            'thriftpy2'
         ],
         'zeromq': [
             'pyzmq',
@@ -91,6 +94,7 @@
         "psycopg2>=2.5.4",
         "scrapy>=0.24",
         "tldextract>=1.5.1",
+        'thriftpy2',
         "SQLAlchemy>=1.0.0",
         "cachetools",
         "mock",

tests/test_message_bus.py

@@ -4,6 +4,7 @@
 from frontera.contrib.messagebus.zeromq import MessageBus as ZeroMQMessageBus
 from frontera.contrib.messagebus.kafkabus import MessageBus as KafkaMessageBus
 from frontera.utils.fingerprint import sha1
+from flaky import flaky
 from kafka import KafkaClient
 from random import randint
 from time import sleep
@@ -234,6 +235,7 @@ def __init__(self):
         super(IPv6MessageBusTester, self).__init__(settings)
 
 
+@flaky
 def test_zmq_message_bus():
     """
     Test MessageBus with default settings, IPv6 and Star as ZMQ_ADDRESS