CI & deps: add Python 3.11–3.13, support urllib3 <3 (incl. v2)

.github/workflows/publish.yml

@@ -5,23 +5,46 @@ on:
     types: [published]
 
 jobs:
-  deploy:
-    runs-on: ubuntu-20.04
+  build:
+    runs-on: ubuntu-22.04
     strategy:
-            matrix:
-                python: [3.7, 3.8, 3.9, '3.10']
+      matrix:
+        python: [3.7, 3.8, 3.9, '3.10', '3.11', '3.12']
+        urllib3-line: ["lt2", "ge2"]
+        exclude:
+          - python: "3.7"
+            urllib3-line: "ge2"
+          - python: "3.8"
+            urllib3-line: "ge2"
     steps:
-      - uses: actions/checkout@v1
-      - name: Set up Python
-        uses: actions/setup-python@v1
+      - uses: actions/checkout@v5
+      - name: Setup Python
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
+      - name: Install deps
+        run: |
+          pip install -r requirements/requirements.txt
+          if [ "${{ matrix.urllib3-line }}" = "lt2" ]; then
+            pip install "urllib3<2"
+          else
+            pip install "urllib3!=2.0.0,<3"
+          fi
+          pip install -e .
       - name: Install Tox and any other packages
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements/test.txt
       - name: Run Tox
         run: tox -e py
+  release:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v5
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.12
       - name: Install build dependencies
         run: |
           pip install setuptools wheel twine

.github/workflows/test.yml

@@ -4,18 +4,32 @@ on: [push, pull_request]
 
 jobs:
     build:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         strategy:
+            fail-fast: false
             matrix:
-                python: [3.7, 3.8, 3.9, '3.10']
+                python: [3.7, 3.8, 3.9, '3.10', '3.11', '3.12', '3.13']
+                urllib3-line: ["lt2", "ge2"]
+                exclude:
+                  - python: "3.7"
+                    urllib3-line: "ge2"
+                  - python: "3.8"
+                    urllib3-line: "ge2"
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v5
             - name: Setup Python
-              uses: actions/setup-python@v1
+              uses: actions/setup-python@v5
               with:
                   python-version: ${{ matrix.python }}
-            - name: Install Tox and any other packages
-              run: pip install -r requirements/test.txt
+            - name: Install deps
+              run: |
+                pip install -r requirements/test.txt
+                if [ "${{ matrix.urllib3-line }}" = "lt2" ]; then
+                  pip install "urllib3<2"
+                else
+                  pip install "urllib3!=2.0.0,<3"
+                fi
+                pip install -e .
             - name: Run Tox
               run: tox -e py
             - name: Upload Coverage to codecov

requirements/requirements.txt

@@ -1,3 +1,8 @@
-requests>=2.22.0
-requests_toolbelt==0.10.1
-urllib3==1.26.*
+requests_toolbelt>=1.0.0
+
+urllib3<3; python_version >= "3.9"
+urllib3!=2.0.0,<3; python_version < "3.9"
+
+requests>=2.32.2; python_version >= "3.9"
+requests>=2.22.0,<2.32; python_version >= "3.7" and python_version < "3.9"
+requests>=2.22.0,<2.28; python_version < "3.7"

requirements/test.txt

@@ -1,7 +1,23 @@
-requests>=2.22.0
-black==19.10b0
-coverage==4.5.4
-tox==3.14.2
-responses==0.17.0
-requests_toolbelt==0.10.1
-urllib3==1.26.*
+requests_toolbelt>=1.0.0
+urllib3<3; python_version >= "3.9"
+urllib3!=2.0.0,<3; python_version < "3.9"
+
+requests>=2.32.2; python_version >= "3.9"
+requests>=2.22.0,<2.32; python_version >= "3.7" and python_version < "3.9"
+requests>=2.22.0,<2.28; python_version < "3.7"
+
+coverage>=7.6.0; python_version >= "3.13"
+coverage>=7.5.0; python_version >= "3.9" and python_version < "3.13"
+coverage>=5.0,<7.0; python_version >= "3.7" and python_version < "3.9"
+coverage==4.5.4; python_version < "3.7"
+
+responses>=0.25.0; python_version >= "3.8"
+responses>=0.18.0,<0.25; python_version >= "3.7" and python_version < "3.8"
+responses<0.18.0; python_version < "3.7"
+
+black>=24.8.0; python_version >= "3.8"
+black==19.10b0; python_version < "3.8"
+
+tox>=4; python_version >= "3.13"
+tox==3.14.2; python_version < "3.13"
+

setup.py

@@ -8,7 +8,7 @@
 
 setuptools.setup(
     name="imagekitio",
-    version="4.1.0",
+    version="4.2.0",
     description="Python wrapper for the ImageKit API",
     long_description=long_description,
     long_description_content_type="text/markdown",

tests/test_custom_metadata_fields_ops.py

@@ -62,6 +62,7 @@ def test_get_custom_metadata_fields_succeeds(self):
         responses.add(
             responses.GET,
             url,
+            content_type="application/json",
             body="""[{
                         "id": "62a9d5f6db485107347bb7f2",
                         "name": "test10",
@@ -115,7 +116,7 @@ def test_get_custom_metadata_fields_succeeds(self):
             ],
             "httpStatusCode": 200,
             "headers": {
-                "Content-Type": "text/plain",
+                "Content-Type": "application/json",
                 "Accept-Encoding": "gzip, deflate",
                 "Authorization": "Basic ZmFrZTEyMjo=",
             },
@@ -303,7 +304,7 @@ def test_delete_custom_metadata_fields_succeeds(self):
         URL.API_BASE_URL = "http://test.com"
         url = "{}/v1/customMetadataFields/{}".format(URL.API_BASE_URL, self.field_id)
         headers = create_headers_for_test()
-        responses.add(responses.DELETE, url, status=204, headers=headers, body="{}")
+        responses.add(responses.DELETE, url, status=204, headers=headers)
         resp = self.client.delete_custom_metadata_field(self.field_id)
 
         mock_response_metadata = {
@@ -385,13 +386,14 @@ def test_create_custom_metadata_fields_succeeds_with_type_number(self):
         """
         URL.API_BASE_URL = "http://test.com"
         url = "{}/v1/customMetadataFields".format(URL.API_BASE_URL)
-        headers = {"Content-Type": "application/json"}
+        headers = {}
         headers.update(create_headers_for_test())
         responses.add(
             responses.POST,
             url,
             status=201,
             headers=headers,
+            content_type="application/json",
             body="""{
                 "id": "62dfc03b1b02a58936efca37",
                 "name": "test",
@@ -422,7 +424,7 @@ def test_create_custom_metadata_fields_succeeds_with_type_number(self):
             },
             "httpStatusCode": 201,
             "headers": {
-                "Content-Type": "text/plain, application/json",
+                "Content-Type": "application/json",
                 "Accept-Encoding": "gzip, deflate",
                 "Authorization": "Basic ZmFrZTEyMjo=",
             },
@@ -457,13 +459,14 @@ def test_create_custom_metadata_fields_succeeds_with_type_textarea(self):
         """
         URL.API_BASE_URL = "http://test.com"
         url = "{}/v1/customMetadataFields".format(URL.API_BASE_URL)
-        headers = {"Content-Type": "application/json"}
+        headers = {}
         headers.update(create_headers_for_test())
         responses.add(
             responses.POST,
             url,
             status=201,
             headers=headers,
+            content_type="application/json",
             body="""{
                 "id": "62e0d7ae1b02a589360dc1fd",
                 "name": "test",
@@ -493,7 +496,7 @@ def test_create_custom_metadata_fields_succeeds_with_type_textarea(self):
 
         mock_response_metadata = {
             "headers": {
-                "Content-Type": "text/plain, application/json",
+                "Content-Type": "application/json",
                 "Accept-Encoding": "gzip, deflate",
                 "Authorization": "Basic ZmFrZTEyMjo=",
             },
@@ -543,13 +546,14 @@ def test_create_custom_metadata_fields_succeeds_with_type_date(self):
         """
         URL.API_BASE_URL = "http://test.com"
         url = "{}/v1/customMetadataFields".format(URL.API_BASE_URL)
-        headers = {"Content-Type": "application/json"}
+        headers = {}
         headers.update(create_headers_for_test())
         responses.add(
             responses.POST,
             url,
             status=201,
             headers=headers,
+            content_type="application/json",
             body="""{
                 "id": "62dfc9f41b02a58936f0d284",
                 "name": "test-date",
@@ -575,7 +579,7 @@ def test_create_custom_metadata_fields_succeeds_with_type_date(self):
 
         mock_response_metadata = {
             "headers": {
-                "Content-Type": "text/plain, application/json",
+                "Content-Type": "application/json",
                 "Accept-Encoding": "gzip, deflate",
                 "Authorization": "Basic ZmFrZTEyMjo=",
             },
@@ -621,13 +625,14 @@ def test_create_custom_metadata_fields_succeeds_with_type_boolean(self):
         """
         URL.API_BASE_URL = "http://test.com"
         url = "{}/v1/customMetadataFields".format(URL.API_BASE_URL)
-        headers = {"Content-Type": "application/json"}
+        headers = {}
         headers.update(create_headers_for_test())
         responses.add(
             responses.POST,
             url,
             status=201,
             headers=headers,
+            content_type="application/json",
             body="""{
                 "id": "62dfcb801b02a58936f0fc39",
                 "name": "test-boolean",
@@ -653,7 +658,7 @@ def test_create_custom_metadata_fields_succeeds_with_type_boolean(self):
 
         mock_response_metadata = {
             "headers": {
-                "Content-Type": "text/plain, application/json",
+                "Content-Type": "application/json",
                 "Accept-Encoding": "gzip, deflate",
                 "Authorization": "Basic ZmFrZTEyMjo=",
             },
@@ -699,13 +704,14 @@ def test_create_custom_metadata_fields_succeeds_with_type_single_select(self):
         """
         URL.API_BASE_URL = "http://test.com"
         url = "{}/v1/customMetadataFields".format(URL.API_BASE_URL)
-        headers = {"Content-Type": "application/json"}
+        headers = {}
         headers.update(create_headers_for_test())
         responses.add(
             responses.POST,
             url,
             status=201,
             headers=headers,
+            content_type="application/json",
             body="""{
                 "id": "62dfcdb21b02a58936f14c97",
                 "name": "test",
@@ -729,7 +735,7 @@ def test_create_custom_metadata_fields_succeeds_with_type_single_select(self):
 
         mock_response_metadata = {
             "headers": {
-                "Content-Type": "text/plain, application/json",
+                "Content-Type": "application/json",
                 "Accept-Encoding": "gzip, deflate",
                 "Authorization": "Basic ZmFrZTEyMjo=",
             },
@@ -775,13 +781,14 @@ def test_create_custom_metadata_fields_succeeds_with_type_multi_select(self):
         """
         URL.API_BASE_URL = "http://test.com"
         url = "{}/v1/customMetadataFields".format(URL.API_BASE_URL)
-        headers = {"Content-Type": "application/json"}
+        headers = {}
         headers.update(create_headers_for_test())
         responses.add(
             responses.POST,
             url,
             status=201,
             headers=headers,
+            content_type="application/json",
             body="""{
                 "id": "62dfcf001b02a58936f17808",
                 "name": "test",
@@ -809,7 +816,7 @@ def test_create_custom_metadata_fields_succeeds_with_type_multi_select(self):
 
         mock_response_metadata = {
             "headers": {
-                "Content-Type": "text/plain, application/json",
+                "Content-Type": "application/json",
                 "Accept-Encoding": "gzip, deflate",
                 "Authorization": "Basic ZmFrZTEyMjo=",
             },
@@ -857,12 +864,13 @@ def test_update_custom_metadata_fields_succeeds(self):
         """
         URL.API_BASE_URL = "http://test.com"
         url = "{}/v1/customMetadataFields/{}".format(URL.API_BASE_URL, self.field_id)
-        headers = {"Content-Type": "application/json"}
+        headers = {}
         headers.update(create_headers_for_test())
         responses.add(
             responses.PATCH,
             url,
             headers=headers,
+            content_type="application/json",
             body="""{
                 "id": "62a9d5f6db485107347bb7f2",
                 "name": "test",
@@ -892,7 +900,7 @@ def test_update_custom_metadata_fields_succeeds(self):
             },
             "httpStatusCode": 200,
             "headers": {
-                "Content-Type": "text/plain, application/json",
+                "Content-Type": "application/json",
                 "Accept-Encoding": "gzip, deflate",
                 "Authorization": "Basic ZmFrZTEyMjo=",
             },