remove Python 2.7, 3.5, 3.6 support

Author: maxtepkeev

Diff for: .travis.yml

@@ -2,14 +2,11 @@ os: linux
 dist: xenial
 language: python
 python:
-  - 2.7
-  - 3.5
-  - 3.6
   - 3.7
   - 3.8
   - 3.9
-  - pypy2.7-6.0
-  - pypy3.5-6.0
+  - pypy3.7-7.3.9
+  - pypy3.8-7.3.9
 install:
   - pip install -r tests/requirements.txt
   - pip install coveralls

Diff for: CHANGELOG.rst

@@ -1,9 +1,21 @@
 Changelog
 ---------
 
+X.X.X (XXXX-XX-XX)
+++++++++++++++++++
+
+**Deprecations**:
+
+- Removed Python 2.7, 3.5, 3.6 support as it's not supported by Requests anymore
+
 2.3.0 (2020-05-21)
 ++++++++++++++++++
 
+**Deprecations**:
+
+- Requests version required >= 2.23.0
+- Removed Python 3.4 support as it's not supported by Requests anymore
+
 **Improvements**:
 
 - Support custom filename in ``redmine.upload()``
@@ -20,11 +32,6 @@ Changelog
   and speed up the create/update/delete operation in case response body isn't needed (see
   `docs <https://python-redmine.com/advanced/request_engines.html#session>`__ for details)
 
-**Changes**:
-
-- *Backwards Incompatible:* Requests version required >= 2.23.0
-- *Backwards Incompatible:* Removed Python 3.4 support as it's not supported by Requests anymore
-
 **Bugfixes**:
 
 - User's ``send_information`` field wasn't sent correctly to Redmine so account information emails were
@@ -52,17 +59,17 @@ Changelog
 2.2.0 (2019-01-13)
 ++++++++++++++++++
 
+**Deprecations**:
+
+- Removed vendored Requests package and make it an external dependency as Requests did
+  the same with it's own dependencies
+- Removed Python 2.6 and 3.3 support as they're not supported by Requests anymore
+
 **Improvements**:
 
 - ``PerformanceWarning`` will be issued when Python-Redmine does some unnecessary work under the hood to fix the
   clients code problems
 
-**Changes**:
-
-- *Backwards Incompatible:* Removed vendored Requests package and make it an external dependency as Requests did
-  the same with it's own dependencies
-- *Backwards Incompatible:* Removed Python 2.6 and 3.3 support as they're not supported by Requests anymore
-
 **Bugfixes**:
 
 - ``Redmine.upload()`` fails under certain circumstances when used with a file-like object and it contains unicode

Diff for: MANIFEST.in

@@ -1,2 +1,2 @@
 recursive-include tests *.py
-include .coveragerc README.rst CHANGELOG.rst LICENSE NOTICE
+include .coveragerc README.rst CHANGELOG.rst LICENSE

Diff for: NOTICE

@@ -54,7 +54,7 @@ Features
 
 * Supports 100% of Redmine API
 * Supports external Redmine plugins API
-* Supports Python 2.7, 3.5 - 3.9, PyPy and PyPy3
+* Supports Python 3.7 - 3.9 and PyPy3
 * Supports different request engines
 * Extendable via custom resources and custom request engines
 * Extensively documented

Diff for: README.rst

@@ -54,7 +54,7 @@ Features
 
 * Supports 100% of Redmine API
 * Supports external Redmine plugins API
-* Supports Python 2.7, 3.5 - 3.9, PyPy and PyPy3
+* Supports Python 3.7 - 3.9 and PyPy3
 * Supports different request engines
 * Extendable via custom resources and custom request engines
 * Extensively documented

Diff for: docs/index.rst

@@ -4,7 +4,6 @@
 
 import os
 import io
-import sys
 import inspect
 import warnings
 import contextlib
@@ -15,7 +14,7 @@
 from .version import __version__
 
 
-class Redmine(object):
+class Redmine:
     """
     Entry point for all requests.
     """
@@ -97,7 +96,7 @@ def upload(self, f, filename=None):
         if self.ver is not None and LooseVersion(str(self.ver)) < LooseVersion('1.4.0'):
             raise exceptions.VersionMismatchError('File uploading')
 
-        url = '{0}/uploads.json'.format(self.url)
+        url = f'{self.url}/uploads.json'
         headers = {'Content-Type': 'application/octet-stream'}
         params = {'filename': filename or ''}
 
@@ -114,7 +113,7 @@ def upload(self, f, filename=None):
 
             # We need to send bytes over the socket, so in case a file-like object contains a unicode
             # object underneath, we need to convert it to bytes, otherwise we'll get an exception
-            if isinstance(c, str if sys.version_info[0] >= 3 else unicode):
+            if isinstance(c, str):
                 warnings.warn("File-like object contains unicode, hence an additional step is performed to convert "
                               "it's content to bytes, please consider switching to bytes to eliminate this warning",
                               exceptions.PerformanceWarning)
@@ -154,10 +153,7 @@ def download(self, url, savepath=None, filename=None, params=None):
         if savepath is None:
             return response
 
-        try:
-            from urlparse import urlsplit
-        except ImportError:
-            from urllib.parse import urlsplit
+        from urllib.parse import urlsplit
 
         if filename is None:
             filename = urlsplit(url)[2].split('/')[-1]
@@ -205,7 +201,7 @@ def search(self, query, **options):
 
                 manager_map[container] = getattr(self, name)
 
-        raw_resources, _ = self.engine.bulk_request('get', '{0}/search.json'.format(self.url), 'results', **options)
+        raw_resources, _ = self.engine.bulk_request('get', f'{self.url}/search.json', 'results', **options)
 
         for resource in raw_resources:
             if resource['type'] in container_map:

Diff for: redminelib/__init__.py

@@ -7,7 +7,7 @@
 from .. import exceptions
 
 
-class BaseEngine(object):
+class BaseEngine:
     chunk = 100
 
     def __init__(self, **options):