diff --git a/poetry.lock b/poetry.lock index 2c05a983..1d6d2775 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1278,26 +1278,6 @@ python-versions = ">=3.6" cryptography = ">=2.0" jeepney = ">=0.6" -[[package]] -name = "semantic-version" -version = "2.8.5" -description = "A library implementing the 'SemVer' scheme." -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" - -[[package]] -name = "setuptools-rust" -version = "0.12.1" -description = "Setuptools Rust extension plugin" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -semantic-version = ">=2.6.0" -toml = ">=0.9.0" - [[package]] name = "shellingham" version = "1.4.0" @@ -1589,7 +1569,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytes [metadata] lock-version = "1.1" python-versions = "^3.6.1" -content-hash = "9cd6168123aadae57c2030da0a03c904d490c60cf2fa83e864d7c0eec22c36a6" +content-hash = "367d479010c5996c3642e718f9a8bd6ffa577412bf68b2979bbaddf5a4058630" [metadata.files] aniso8601 = [ @@ -2377,14 +2357,6 @@ secretstorage = [ {file = "SecretStorage-3.3.1-py3-none-any.whl", hash = "sha256:422d82c36172d88d6a0ed5afdec956514b189ddbfb72fefab0c8a1cee4eaf71f"}, {file = "SecretStorage-3.3.1.tar.gz", hash = "sha256:fd666c51a6bf200643495a04abb261f83229dcb6fd8472ec393df7ffc8b6f195"}, ] -semantic-version = [ - {file = "semantic_version-2.8.5-py2.py3-none-any.whl", hash = "sha256:45e4b32ee9d6d70ba5f440ec8cc5221074c7f4b0e8918bdab748cc37912440a9"}, - {file = "semantic_version-2.8.5.tar.gz", hash = "sha256:d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54"}, -] -setuptools-rust = [ - {file = "setuptools-rust-0.12.1.tar.gz", hash = "sha256:647009e924f0ae439c7f3e0141a184a69ad247ecb9044c511dabde232d3d570e"}, - {file = "setuptools_rust-0.12.1-py3-none-any.whl", hash = "sha256:60c9bf1423a725e472c4a2a6274598251f959f3ed5ffe7698526e78bb431b9b7"}, -] shellingham = [ {file = "shellingham-1.4.0-py2.py3-none-any.whl", hash = "sha256:536b67a0697f2e4af32ab176c00a50ac2899c5a05e0d8e2dadac8e58888283f9"}, {file = "shellingham-1.4.0.tar.gz", hash = "sha256:4855c2458d6904829bd34c299f11fdeed7cfefbf8a2c522e4caea6cd76b3171e"}, diff --git a/pyproject.toml b/pyproject.toml index f3092831..2ab48d8f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "redis-benchmarks-specification" -version = "0.1.14" +version = "0.1.15" description = "The Redis benchmarks specification describes the cross-language/tools requirements and expectations to foster performance and observability standards around redis related technologies. Members from both industry and academia, including organizations and individuals are encouraged to contribute." authors = ["filipecosta90 ","Redis Performance Group "] readme = "Readme.md" @@ -21,6 +21,7 @@ psutil = "^5.8.0" tox-docker = "^3.0.0" PyGithub = "^1.55" GitPython = "^3.1.20" +redistimeseries = "1.4.3" [tool.poetry.dev-dependencies] black = "20.8b1" diff --git a/redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py b/redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py index 1505cf69..84b7c8fd 100644 --- a/redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py +++ b/redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py @@ -11,7 +11,7 @@ import redis import os from pathlib import Path -import redistimeseries +from redistimeseries.client import Client from docker.models.containers import Container from redisbench_admin.run.common import ( @@ -127,7 +127,7 @@ def main(): ) ) try: - rts = redistimeseries.client.Client( + rts = Client( host=args.datasink_redistimeseries_host, port=args.datasink_redistimeseries_port, decode_responses=True, diff --git a/utils/tests/test_api.py b/utils/tests/test_api.py index 5ad1fcbb..45921100 100644 --- a/utils/tests/test_api.py +++ b/utils/tests/test_api.py @@ -15,12 +15,6 @@ GH_TOKEN, ) -import pytest - -import pytest - -# First party modules - def test_commit_schema_to_stream(): result, reply_fields, error_msg = commit_schema_to_stream( diff --git a/utils/tests/test_data/dump.rdb b/utils/tests/test_data/dump.rdb index f0e68699..91045826 100644 Binary files a/utils/tests/test_data/dump.rdb and b/utils/tests/test_data/dump.rdb differ diff --git a/utils/tests/test_self_contained_coordinator.py b/utils/tests/test_self_contained_coordinator.py index d8ef6dcc..516414ca 100644 --- a/utils/tests/test_self_contained_coordinator.py +++ b/utils/tests/test_self_contained_coordinator.py @@ -9,15 +9,7 @@ from redisbench_admin.utils.remote import get_overall_dashboard_keynames from redisbench_admin.utils.utils import get_ts_metric_name -from redis_benchmarks_specification.__common__.builder_schema import ( - commit_schema_to_stream, -) -from redis_benchmarks_specification.__builder__.builder import ( - builder_consumer_group_create, - builder_process_stream, -) from redis_benchmarks_specification.__common__.env import ( - STREAM_KEYNAME_GH_EVENTS_COMMIT, STREAM_KEYNAME_NEW_BUILD_EVENTS, ) from redis_benchmarks_specification.__common__.spec import (