Merge branch 'release-0.9.0'

* release-0.9.0: Bumping version to 0.9.0 Add back 3.7 lru_cache syntax (#297) Add changelog entry for Python 3.7 End of Support Deprecate Python 3.7 Support Run new pre-commit updates Update pre-commit versions
boto · Dec 13, 2023 · 4a42ad9 · 4a42ad9
2 parents 8a32c1f + 17ab09b
commit 4a42ad9
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 32 deletions.
diff --git a/.changes/0.9.0.json b/.changes/0.9.0.json
@@ -0,0 +1,7 @@
+[
+  {
+    "category": "Python",
+    "description": "End of support for Python 3.7",
+    "type": "feature"
+  }
+]
diff --git a/.github/workflows/run-crt-test.yml b/.github/workflows/run-crt-test.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
     - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
     - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,27 +1,27 @@
 exclude: ^(.changes/|CHANGELOG.rst|s3transfer/compat.py)
 repos:
   - repo: 'https://github.com/pre-commit/pre-commit-hooks'
-    rev: v4.2.0
+    rev: v4.5.0
     hooks:
       - id: check-yaml
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: 'https://github.com/asottile/pyupgrade'
-    rev: v2.32.1
+    rev: v3.15.0
     hooks:
       - id: pyupgrade
         args:
-          - '--py36-plus'
+          - '--py37-plus'
   - repo: 'https://github.com/PyCQA/isort'
     rev: 5.12.0
     hooks:
       - id: isort
   - repo: 'https://github.com/psf/black'
-    rev: 22.3.0
+    rev: 23.11.0
     hooks:
       - id: black
   - repo: 'https://github.com/pycqa/flake8'
-    rev: 4.0.1
+    rev: 6.1.0
     hooks:
       - id: flake8
   - repo: 'https://github.com/codespell-project/codespell'

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,12 @@
 CHANGELOG
 =========
 
+0.9.0
+=====
+
+* feature:Python: End of support for Python 3.7
+
+
 0.8.2
 =====
 

diff --git a/requirements-dev-lock.txt b/requirements-dev-lock.txt
@@ -1,6 +1,6 @@
 #
-# This file is autogenerated by pip-compile with python 3.7
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.8
+# by the following command:
 #
 #    pip-compile --allow-unsafe --generate-hashes --output-file=requirements-dev-lock.txt requirements-dev.txt
 #
@@ -79,12 +79,6 @@ exceptiongroup==1.1.3 \
     --hash=sha256:097acd85d473d75af5bb98e41b61ff7fe35efe6675e4f9370ec6ec5126d160e9 \
     --hash=sha256:343280667a4585d195ca1cf9cef84a4e178c4b6cf2274caef9859782b567d5e3
     # via pytest
-importlib-metadata==4.12.0 \
-    --hash=sha256:637245b8bab2b6502fcbc752cc4b7a6f6243bb02b31c5c26156ad103d3d45670 \
-    --hash=sha256:7401a975809ea1fdc658c3aa4f78cc2195a0e019c5cbc4c06122884e9ae80c23
-    # via
-    #   pluggy
-    #   pytest
 iniconfig==1.1.1 \
     --hash=sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3 \
     --hash=sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32
@@ -131,15 +125,7 @@ tomli==2.0.1 \
     # via
     #   coverage
     #   pytest
-typing-extensions==4.3.0 \
-    --hash=sha256:25642c956049920a5aa49edcdd6ab1e06d7e5d467fc00e0506c44ac86fbfca02 \
-    --hash=sha256:e6d2677a32f47fc7eb2795db1dd15c1f34eff616bcaf2cfb5e997f854fa1c4a6
-    # via importlib-metadata
 wheel==0.38.1 \
     --hash=sha256:7a95f9a8dc0924ef318bd55b616112c70903192f524d120acc614f59547a9e1f \
     --hash=sha256:ea041edf63f4ccba53ad6e035427997b3bb10ee88a4cd014ae82aeb9eea77bb9
     # via -r requirements-dev.txt
-zipp==3.8.0 \
-    --hash=sha256:56bf8aadb83c24db6c4b577e13de374ccfb67da2078beba1d037c17980bf43ad \
-    --hash=sha256:c4f6e5bbf48e74f7a38e7cc5b0480ff42b0ae5178957d564d18932525d5cf099
-    # via importlib-metadata
diff --git a/s3transfer/__init__.py b/s3transfer/__init__.py
@@ -144,7 +144,7 @@ def __call__(self, bytes_amount):
 from s3transfer.exceptions import RetriesExceededError, S3UploadFailedError
 
 __author__ = 'Amazon Web Services'
-__version__ = '0.8.2'
+__version__ = '0.9.0'
 
 
 class NullHandler(logging.Handler):
@@ -681,7 +681,6 @@ def __init__(
 
 
 class S3Transfer:
-
     ALLOWED_DOWNLOAD_ARGS = [
         'VersionId',
         'SSECustomerAlgorithm',

diff --git a/s3transfer/futures.py b/s3transfer/futures.py
@@ -505,6 +505,7 @@ def add_done_callback(self, fn):
             than concurrent.futures.Future.add_done_callback that requires
             a single argument for the future.
         """
+
         # The done callback for concurrent.futures.Future will always pass a
         # the future in as the only argument. So we need to create the
         # proper signature wrapper that will invoke the callback provided.

diff --git a/setup.py b/setup.py
@@ -33,7 +33,7 @@ def get_version():
         'crt': 'botocore[crt]>=1.33.2,<2.0a.0',
     },
     license="Apache License 2.0",
-    python_requires=">= 3.7",
+    python_requires=">= 3.8",
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Intended Audience :: Developers',
@@ -42,7 +42,6 @@ def get_version():
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3 :: Only',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',

diff --git a/tests/functional/test_copy.py b/tests/functional/test_copy.py
@@ -84,7 +84,6 @@ def add_successful_copy_responses(
         expected_create_mpu_params=None,
         expected_complete_mpu_params=None,
     ):
-
         # Add all responses needed to do the copy of the object.
         # Should account for both ranged and nonranged downloads.
         stubbed_responses = self.create_stubbed_responses()[1:]
@@ -497,7 +496,6 @@ def _get_expected_params(self):
     def _add_params_to_expected_params(
         self, add_copy_kwargs, operation_types, new_params
     ):
-
         expected_params_to_update = []
         for operation_type in operation_types:
             add_copy_kwargs_key = 'expected_' + operation_type + '_params'

diff --git a/tests/functional/test_delete.py b/tests/functional/test_delete.py
@@ -15,7 +15,6 @@
 
 
 class TestDeleteObject(BaseGeneralInterfaceTest):
-
     __test__ = True
 
     def setUp(self):

diff --git a/tests/unit/test_s3transfer.py b/tests/unit/test_s3transfer.py
@@ -377,7 +377,6 @@ def test_multipart_upload_is_aborted_on_error(self):
 
 
 class TestMultipartDownloader(unittest.TestCase):
-
     maxDiff = None
 
     def test_multipart_download_uses_correct_client_calls(self):

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py37,py38,py39,py310,py311,py312
+envlist = py38,py39,py310,py311,py312
 
 # Comment to build sdist and install into virtualenv
 # This is helpful to test installation but takes extra time