Merge branch 'master' into msbt-sitemap-update

.pre-commit-config.yaml

@@ -7,11 +7,11 @@ repos:
     hooks:
       - id: trailing-whitespace
   - repo: https://github.com/psf/black
-    rev: 23.9.1
+    rev: 24.1.1
     hooks:
       - id: black
   - repo: https://github.com/PyCQA/flake8
-    rev: "3.7.9"
+    rev: "7.0.0"
     hooks:
       - id: flake8
   - repo: https://github.com/timothycrosley/isort

croud/subscriptions/commands.py

@@ -28,7 +28,7 @@
 def subscriptions_create(args: Namespace) -> None:
     body = {"type": args.type, "organization_id": args.org_id}
     client = Client.from_args(args)
-    data, errors = client.post(f"/api/v2/subscriptions/", body=body)
+    data, errors = client.post("/api/v2/subscriptions/", body=body)
     print_response(
         data=data,
         errors=errors,

setup.py

@@ -61,8 +61,8 @@
             "pytest-freezegun==0.4.2",
         ],
         "development": [
-            "black==23.9.1",
-            "flake8==3.8.4",
+            "black==24.1.1",
+            "flake8==7.0.0",
             "isort==5.12.0",
             "mypy==0.812",
         ],

test-requirements.txt

@@ -1,3 +1,3 @@
-pytest==7.4.4
+pytest==8.0.0
 pytest-random-order==1.1.1
 pytest-freezegun==0.4.2

tests/commands/test_api_keys.py

@@ -12,7 +12,7 @@ def test_api_keys_list(mock_request):
     assert_rest(
         mock_request,
         RequestMethod.GET,
-        f"/api/v2/users/me/api-keys/",
+        "/api/v2/users/me/api-keys/",
         params=None,
     )
 
@@ -23,7 +23,7 @@ def test_api_keys_create(mock_request):
     assert_rest(
         mock_request,
         RequestMethod.POST,
-        f"/api/v2/users/me/api-keys/",
+        "/api/v2/users/me/api-keys/",
         params=None,
     )
 
@@ -34,7 +34,7 @@ def test_api_keys_delete(mock_request):
     assert_rest(
         mock_request,
         RequestMethod.DELETE,
-        f"/api/v2/users/me/api-keys/key-to-be-deleted/",
+        "/api/v2/users/me/api-keys/key-to-be-deleted/",
         params=None,
     )
 
@@ -54,6 +54,6 @@ def test_api_keys_edit(mock_request, target_status):
     assert_rest(
         mock_request,
         RequestMethod.PATCH,
-        f"/api/v2/users/me/api-keys/target-key/",
+        "/api/v2/users/me/api-keys/target-key/",
         body={"active": target_status},
     )

tests/commands/test_clusters_scheduled_jobs.py

@@ -118,7 +118,7 @@ def mock_call(*args, **kwargs):
     assert_rest(
         mock_request,
         RequestMethod.GET,
-        f"/api/scheduled-jobs/",
+        "/api/scheduled-jobs/",
         any_times=True,
     )