chore: bump rison to 2.0.0 (#39529)

This commit is contained in:
Beto Dealmeida
2026-04-24 15:52:42 -04:00
committed by GitHub
parent 78950fc18e
commit edf4d03218
51 changed files with 389 additions and 343 deletions

View File

@@ -18,7 +18,7 @@
"""Unit tests for Superset"""
import pytest
import prison
import rison
from sqlalchemy.sql import func
import tests.integration_tests.test_app # noqa: F401
@@ -90,7 +90,7 @@ class TestAnnotationLayerApi(SupersetTestCase):
"""
self.login(ADMIN_USERNAME)
params = {"keys": ["permissions"]}
uri = f"api/v1/annotation_layer/_info?q={prison.dumps(params)}"
uri = f"api/v1/annotation_layer/_info?q={rison.dumps(params)}"
rv = self.get_assert_metric(uri, "info")
data = json.loads(rv.data.decode("utf-8"))
assert rv.status_code == 200
@@ -153,7 +153,7 @@ class TestAnnotationLayerApi(SupersetTestCase):
for order_column in order_columns:
arguments = {"order_column": order_column, "order_direction": "asc"}
uri = f"api/v1/annotation_layer/?q={prison.dumps(arguments)}"
uri = f"api/v1/annotation_layer/?q={rison.dumps(arguments)}"
rv = self.get_assert_metric(uri, "get_list")
assert rv.status_code == 200
@@ -169,7 +169,7 @@ class TestAnnotationLayerApi(SupersetTestCase):
{"col": "name", "opr": "annotation_layer_all_text", "value": "2"}
],
}
uri = f"api/v1/annotation_layer/?q={prison.dumps(arguments)}"
uri = f"api/v1/annotation_layer/?q={rison.dumps(arguments)}"
rv = self.get_assert_metric(uri, "get_list")
expected_result = {
@@ -187,7 +187,7 @@ class TestAnnotationLayerApi(SupersetTestCase):
{"col": "name", "opr": "annotation_layer_all_text", "value": "descr3"}
],
}
uri = f"api/v1/annotation_layer/?q={prison.dumps(arguments)}"
uri = f"api/v1/annotation_layer/?q={rison.dumps(arguments)}"
rv = self.get_assert_metric(uri, "get_list")
expected_result = {
@@ -357,7 +357,7 @@ class TestAnnotationLayerApi(SupersetTestCase):
annotation_layer.id for annotation_layer in no_child_layers
]
self.login(ADMIN_USERNAME)
uri = f"api/v1/annotation_layer/?q={prison.dumps(no_child_layers_ids)}"
uri = f"api/v1/annotation_layer/?q={rison.dumps(no_child_layers_ids)}"
rv = self.client.delete(uri)
assert rv.status_code == 200
deleted_annotation_layers = query_no_child_layers.all()
@@ -384,7 +384,7 @@ class TestAnnotationLayerApi(SupersetTestCase):
max_id = db.session.query(func.max(AnnotationLayer.id)).scalar()
all_annotation_layers_ids.append(max_id + 1)
self.login(ADMIN_USERNAME)
uri = f"api/v1/annotation_layer/?q={prison.dumps(all_annotation_layers_ids)}"
uri = f"api/v1/annotation_layer/?q={rison.dumps(all_annotation_layers_ids)}"
rv = self.client.delete(uri)
assert rv.status_code == 404
@@ -474,7 +474,7 @@ class TestAnnotationLayerApi(SupersetTestCase):
]
for order_column in order_columns:
arguments = {"order_column": order_column, "order_direction": "asc"}
uri = f"api/v1/annotation_layer/{layer.id}/annotation/?q={prison.dumps(arguments)}" # noqa: E501
uri = f"api/v1/annotation_layer/{layer.id}/annotation/?q={rison.dumps(arguments)}" # noqa: E501
rv = self.get_assert_metric(uri, "get_list")
assert rv.status_code == 200
@@ -490,7 +490,9 @@ class TestAnnotationLayerApi(SupersetTestCase):
{"col": "short_descr", "opr": "annotation_all_text", "value": "2"}
]
}
uri = f"api/v1/annotation_layer/{layer.id}/annotation/?q={prison.dumps(arguments)}" # noqa: E501
uri = (
f"api/v1/annotation_layer/{layer.id}/annotation/?q={rison.dumps(arguments)}" # noqa: E501
)
rv = self.get_assert_metric(uri, "get_list")
assert rv.status_code == 200
@@ -502,7 +504,9 @@ class TestAnnotationLayerApi(SupersetTestCase):
{"col": "short_descr", "opr": "annotation_all_text", "value": "descr3"}
]
}
uri = f"api/v1/annotation_layer/{layer.id}/annotation/?q={prison.dumps(arguments)}" # noqa: E501
uri = (
f"api/v1/annotation_layer/{layer.id}/annotation/?q={rison.dumps(arguments)}" # noqa: E501
)
rv = self.get_assert_metric(uri, "get_list")
assert rv.status_code == 200
@@ -719,7 +723,7 @@ class TestAnnotationLayerApi(SupersetTestCase):
annotations = query_annotations.all()
annotations_ids = [annotation.id for annotation in annotations]
self.login(ADMIN_USERNAME)
uri = f"api/v1/annotation_layer/{layer.id}/annotation/?q={prison.dumps(annotations_ids)}" # noqa: E501
uri = f"api/v1/annotation_layer/{layer.id}/annotation/?q={rison.dumps(annotations_ids)}" # noqa: E501
rv = self.client.delete(uri)
assert rv.status_code == 200
deleted_annotations = query_annotations.all()
@@ -745,6 +749,6 @@ class TestAnnotationLayerApi(SupersetTestCase):
annotations_ids.append(max_id + 1)
self.login(ADMIN_USERNAME)
uri = f"api/v1/annotation_layer/{layer.id}/annotation/?q={prison.dumps(annotations_ids)}" # noqa: E501
uri = f"api/v1/annotation_layer/{layer.id}/annotation/?q={rison.dumps(annotations_ids)}" # noqa: E501
rv = self.client.delete(uri)
assert rv.status_code == 404