Merge branch 'master' into feature/transport_http

.travis.yml

@@ -10,7 +10,6 @@ language: python
 cache: pip
 
 python:
-  - "2.7"
   - "3.6"
   - "3.7"
   - "3.8"

docs/about.rst

@@ -92,6 +92,20 @@ License
 ChangeLog
 ---------
 
+2.0.0 (Aug 16 2020)
++++++++++++++++++++
+
+  * Require Python >= 3.5.
+
+
+1.6.7 (Aug 16 2020)
++++++++++++++++++++
+
+  * Set `python_requires` to Python >=2.7 or Python >= 3.5 for
+    smooth upgrade to upcoming Python3 only.
+    This way Python2 only users will stay at this release.
+
+
 1.6.6 (Jun 08 2020)
 +++++++++++++++++++
 

logstash_async/__init__.py

@@ -3,7 +3,7 @@
 # This software may be modified and distributed under the terms
 # of the MIT license.  See the LICENSE file for details.
 
-__version__ = '1.6.6'
+__version__ = '2.0.0'
 
 # When using an in-memory only cache, this persists the cache through
 # thread failures, shutdowns, and restarts.

setup.py

@@ -9,7 +9,7 @@
 import sys
 
 NAME = 'python-logstash-async'
-VERSION = '1.6.6'
+VERSION = '2.0.0'
 
 here = path.abspath(path.dirname(__file__))
 with open(path.join(here, 'README.rst'), 'rb') as f:
@@ -30,6 +30,7 @@
     version=VERSION,
     description='Asynchronous Python logging handler for Logstash.',
     long_description=LONG_DESCRIPTION,
+    long_description_content_type='text/x-rst',
     license='MIT',
     author='Enrico Tröger',
     author_email='[email protected]',
@@ -41,14 +42,14 @@
     },
     keywords='logging logstash asynchronous',
     install_requires=['limits', 'pylogbeat', 'six', 'requests'],
+    python_requires='>3.5',
     include_package_data=True,
     classifiers=[
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 3',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Software Development :: Libraries :: Python Modules',

tox.ini

@@ -6,7 +6,7 @@
 [tox]
 skip_missing_interpreters = true
 envlist =
-    docs,py27,py36,py37,py38,pypy3
+    docs,py36,py37,py38,pypy3
 
 logstash_async_modules = logstash_async tests
 
@@ -23,21 +23,8 @@ commands =
     # unit tests
     {envbindir}/python -m unittest discover --start-directory tests --pattern '*_test.py'
 
-[testenv:py27]
-# same as above except for skipping PyLint on Python 2.7 as there are different,
-# probably false-positive errors and tricky requirement of old PyLint version
-# for Python 2.7.
-deps =
-    flake8
-    isort<5
-commands =
-    # linting and code analysis
-    {envbindir}/flake8 {[tox]logstash_async_modules}
-    {envbindir}/isort --check-only --diff --recursive {[tox]logstash_async_modules}
-    # unit tests
-    {envbindir}/python -m unittest discover --start-directory tests --pattern '*_test.py'
-
 [testenv:docs]
+basepython = python3
 deps =
     sphinx
     sphinx_rtd_theme