Merge pull request #312 from Backblaze/drop-3.5-3.6

ppolewicz · web-flow · commit 990f203c8aa6 · 2022-04-08T22:59:40.000+02:00
Drop support for Python 3.5 and Python 3.6
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -80,7 +80,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
-        python-version: ["3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "pypy-3.7", "pypy-3.8"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "pypy-3.7", "pypy-3.8"]
         exclude:
           - os: "macos-latest"
             python-version: "pypy-3.7"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Fix downloading files with unverified checksum
 * Fix decoding in filename and file info of `DownloadVersion`
 
+### Removed
+* Drop support for Python 3.5 and Python 3.6
+
 ## [1.14.1] - 2022-02-23
 
 ### Fixed
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -27,7 +27,7 @@ With `nox`, you can run different sessions (default are `lint` and `test`):
 
 * `format` -> Format the code.
 * `lint` -> Run linters.
-* `test` (`test-3.5`, `test-3.6`, `test-3.7`, `test-3.8`, `test-3.9`, `test-3.10`) -> Run test suite.
+* `test` (`test-3.7`, `test-3.8`, `test-3.9`, `test-3.10`) -> Run test suite.
 * `cover` -> Perform coverage analysis.
 * `build` -> Build the distribution.
 * `deploy` -> Deploy the distribution to the PyPi.
@@ -50,15 +50,15 @@ For example:
     nox > Running session format
     ...
 
-Sessions `test` ,`unit`, and `integration` can run on many Python versions, 3.5-3.10 by default.
+Sessions `test` ,`unit`, and `integration` can run on many Python versions, 3.7-3.10 by default.
 
 Sessions other than `test` use the last given Python version, 3.10 by default.
 
 You can change it:
 
-    export NOX_PYTHONS=3.6,3.7
+    export NOX_PYTHONS=3.7,3.8
 
-With the above setting, session `test` will run on Python 3.6 and 3.7, and all other sessions on Python 3.7.
+With the above setting, session `test` will run on Python 3.7 and 3.8, and all other sessions on Python 3.8.
 
 Given Python interpreters should be installed in the operating system or via [pyenv](https://github.com/pyenv/pyenv).
 
diff --git a/b2sdk/sync/scan_policies.py b/b2sdk/sync/scan_policies.py
@@ -18,11 +18,6 @@
 
 logger = logging.getLogger(__name__)
 
-try:  # python 3.5 and 3.6 compatibility
-    regex_class = re.Pattern
-except AttributeError:
-    regex_class = re._pattern_type
-
 
 class RegexSet:
     """
@@ -126,9 +121,9 @@ class ScanPoliciesManager:
 
     def __init__(
         self,
-        exclude_dir_regexes: Iterable[Union[str, regex_class]] = tuple(),
-        exclude_file_regexes: Iterable[Union[str, regex_class]] = tuple(),
-        include_file_regexes: Iterable[Union[str, regex_class]] = tuple(),
+        exclude_dir_regexes: Iterable[Union[str, re.Pattern]] = tuple(),
+        exclude_file_regexes: Iterable[Union[str, re.Pattern]] = tuple(),
+        include_file_regexes: Iterable[Union[str, re.Pattern]] = tuple(),
         exclude_all_symlinks: bool = False,
         exclude_modified_before: Optional[int] = None,
         exclude_modified_after: Optional[int] = None,
diff --git a/b2sdk/utils/__init__.py b/b2sdk/utils/__init__.py
@@ -128,10 +128,7 @@ def hex_sha1_of_unlimited_stream(input_stream, limit=None):
 
 
 def hex_sha1_of_file(path_):
-    with open(
-        str(path_), 'rb'
-    ) as file:  # TODO: remove str() after dropping python 3.5 support, it's here in
-        # case someone uses pathlib.Paths
+    with open(path_, 'rb') as file:
         return hex_sha1_of_unlimited_stream(file)
 
 
diff --git a/b2sdk/v1/sync/scan_policies.py b/b2sdk/v1/sync/scan_policies.py
@@ -17,11 +17,6 @@
 from b2sdk import v2
 from b2sdk.v2 import exception as v2_exception  # noqa
 
-try:  # python 3.5 and 3.6 compatibility
-    regex_class = re.Pattern
-except AttributeError:
-    regex_class = re._pattern_type
-
 
 # Override to retain old exceptions in __init__
 # and to provide interface for new should_exclude_* methods
@@ -41,9 +36,9 @@ class ScanPoliciesManager(v2.ScanPoliciesManager):
 
     def __init__(
         self,
-        exclude_dir_regexes: Iterable[Union[str, regex_class]] = tuple(),
-        exclude_file_regexes: Iterable[Union[str, regex_class]] = tuple(),
-        include_file_regexes: Iterable[Union[str, regex_class]] = tuple(),
+        exclude_dir_regexes: Iterable[Union[str, re.Pattern]] = tuple(),
+        exclude_file_regexes: Iterable[Union[str, re.Pattern]] = tuple(),
+        include_file_regexes: Iterable[Union[str, re.Pattern]] = tuple(),
         exclude_all_symlinks: bool = False,
         exclude_modified_before: Optional[int] = None,
         exclude_modified_after: Optional[int] = None,
diff --git a/b2sdk/version.py b/b2sdk/version.py
@@ -12,8 +12,8 @@
 
 try:
     from importlib.metadata import version
-except ImportError:  # ModuleNotFoundError is not available in Python 3.5
-    from importlib_metadata import version
+except ModuleNotFoundError:
+    from importlib_metadata import version  # for python 3.7
 
 VERSION = version('b2sdk')
 
diff --git a/doc/source/contributing.rst b/doc/source/contributing.rst
@@ -33,7 +33,7 @@ With ``nox``, you can run different sessions (default are ``lint`` and ``test``)
 
 * ``format`` -> Format the code.
 * ``lint`` -> Run linters.
-* ``test`` (``test-3.5``, ``test-3.6``, ``test-3.7``, ``test-3.8``, ``test-3.9``, ``test-3.10``) -> Run test suite.
+* ``test`` (``test-3.7``, ``test-3.8``, ``test-3.9``, ``test-3.10``) -> Run test suite.
 * ``cover`` -> Perform coverage analysis.
 * ``build`` -> Build the distribution.
 * ``deploy`` -> Deploy the distribution to the PyPi.
@@ -56,15 +56,15 @@ For example::
     nox > Running session format
     ...
 
-Sessions ``test``, ``unit``, and ``integration`` can run on many Python versions, 3.5-3.10 by default.
+Sessions ``test``, ``unit``, and ``integration`` can run on many Python versions, 3.7-3.10 by default.
 
 Sessions other than ``test`` use the last given Python version, 3.10 by default.
 
 You can change it::
 
-    export NOX_PYTHONS=3.6,3.7
+    export NOX_PYTHONS=3.7,3.8
 
-With the above setting, session ``test`` will run on Python 3.6 and 3.7, and all other sessions on Python 3.7.
+With the above setting, session ``test`` will run on Python 3.7 and 3.8, and all other sessions on Python 3.8.
 
 Given Python interpreters should be installed in the operating system or via `pyenv <https://github.com/pyenv/pyenv>`_.
 
diff --git a/noxfile.py b/noxfile.py
@@ -18,19 +18,18 @@
 NOX_PYTHONS = os.environ.get('NOX_PYTHONS')
 SKIP_COVERAGE = os.environ.get('SKIP_COVERAGE') == 'true'
 
-PYTHON_VERSIONS = ['3.5', '3.6', '3.7', '3.8', '3.9', '3.10'
-                  ] if NOX_PYTHONS is None else NOX_PYTHONS.split(',')
+PYTHON_VERSIONS = ['3.7', '3.8', '3.9', '3.10'] if NOX_PYTHONS is None else NOX_PYTHONS.split(',')
 PYTHON_DEFAULT_VERSION = PYTHON_VERSIONS[-1]
 
 PY_PATHS = ['b2sdk', 'test', 'noxfile.py', 'setup.py']
 
 REQUIREMENTS_FORMAT = ['yapf==0.27']
 REQUIREMENTS_LINT = ['yapf==0.27', 'pyflakes==2.4.0', 'pytest==6.2.5', 'liccheck==0.6.2']
 REQUIREMENTS_TEST = [
-    "pytest==6.2.5;python_version>'3.5'", "pytest==6.1.1;python_version=='3.5'",
-    "pytest-cov==3.0.0;python_version>'3.5'", "pytest-cov==2.10.1;python_version=='3.5'",
-    "pytest-mock==3.6.1;python_version>'3.5'", "pytest-mock==3.3.1;python_version=='3.5'",
-    'pytest-lazy-fixture==0.6.3'
+    "pytest==6.2.5",
+    "pytest-cov==3.0.0",
+    "pytest-mock==3.6.1",
+    'pytest-lazy-fixture==0.6.3',
 ]
 REQUIREMENTS_BUILD = ['setuptools>=20.2']
 
diff --git a/requirements-doc.txt b/requirements-doc.txt
@@ -1,6 +1,5 @@
 sadisplay
-sphinx<4.0; python_version <= '3.5'  # sphinx>=4.0 doesn't support Python 3.5
-sphinx<5.0; python_version > '3.5'
+sphinx<5.0
 sphinx-autobuild
 sphinx-rtd-theme
 sphinxcontrib-plantuml
diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,5 @@
-arrow>=0.8.0,<1.0.0; python_version <= '3.5'
-arrow>=1.0.2,<2.0.0; python_version >= '3.6'
-importlib-metadata>=2.1.1,<3.0.0; python_version <= '3.5'
-importlib-metadata>=3.3.0; python_version > '3.5' and python_version < '3.8'
+arrow>=1.0.2,<2.0.0
+importlib-metadata>=3.3.0; python_version < '3.8'
 logfury>=1.0.1,<2.0.0
 requests>=2.9.1,<3.0.0
 tqdm>=4.5.0,<5.0.0
diff --git a/setup.py b/setup.py
@@ -81,8 +81,6 @@ def read_requirements(extra=None):
 
         # Specify the Python versions you support here.
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
@@ -111,7 +109,7 @@ def read_requirements(extra=None):
     # for example:
     # $ pip install -e .[dev,test]
     extras_require={'doc': read_requirements('doc')},
-    setup_requires=['setuptools_scm<6.0'],  # setuptools_scm>=6.0 doesn't support Python 3.5
+    setup_requires=['setuptools_scm<6.0'],
     use_scm_version=True,
 
     # If there are data files included in your packages that need to be
diff --git a/test/integration/test_download.py b/test/integration/test_download.py
@@ -56,21 +56,17 @@ def _file_helper(self, bucket, sha1_sum=None):
         with TempDir() as temp_dir:
             temp_dir = pathlib.Path(temp_dir)
             source_large_file = pathlib.Path(temp_dir) / 'source_large_file'
-            with open(
-                str(source_large_file), 'wb'
-            ) as large_file:  # TODO: remove str() after dropping python 3.5 support
+            with open(source_large_file, 'wb') as large_file:
                 self.write_zeros(large_file, bytes_to_write)
             bucket.upload_local_file(
-                str(source_large_file),
+                source_large_file,
                 'large_file',
                 sha1_sum='do_not_verify',
-            )  # TODO: remove str() after dropping python 3.5 support
+            )
             target_large_file = pathlib.Path(temp_dir) / 'target_large_file'
 
             f = bucket.download_file_by_name('large_file')
-            f.save_to(
-                str(target_large_file)
-            )  # TODO: remove str() after dropping python 3.5 support
+            f.save_to(target_large_file)
             assert hex_sha1_of_file(source_large_file) == hex_sha1_of_file(target_large_file)
         return f
 
