Running on tox on PR in gh

Author: fcostaoliveira

.github/workflows/tox.yml

@@ -0,0 +1,48 @@
+name: Run Tests using tox
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - main
+
+jobs:
+  pytest:
+    strategy:
+      matrix:
+        python-version: [ '3.10', '3.11', '3.12' ]
+      fail-fast: false
+    env:
+      ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+      USING_COVERAGE: "3.10"
+      USING_COVERAGE_OS: "ubuntu-latest"
+
+    runs-on: "ubuntu-latest"
+    name: os ${{ matrix.os }} python ${{ matrix.python-version }} Linting, testing, and compliance
+    steps:
+    - uses: actions/checkout@master
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v1
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Install Poetry
+      run: |
+        curl -sSL https://install.python-poetry.org | python3 -
+
+    - name: Install Dev requirements
+      run: |
+        pip install -U setuptools wheel
+        pip install -r dev_requirements.txt
+
+    - name: Run tox
+      run: |
+        tox
+
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v2
+      if: contains(env.USING_COVERAGE, matrix.python-version)
+      with:
+        token: ${{secrets.CODECOV_TOKEN}}
+        fail_ci_if_error: true

dev_requirements.txt

@@ -1,17 +1,18 @@
-click==8.0.4
-black==22.3.0
-flake8==4.0.1
+click==8.1.7
+black==24.4.2
+flake8==7.1.0
 flynt~=0.69.0
 isort==5.10.1
 mock==4.0.3
 packaging>=20.4
-pytest==7.2.0
-pytest-timeout==2.0.1
-pytest-asyncio>=0.16.0
-tox==3.24.4
-tox-docker==4.0.0a2
-invoke==1.6.0
-pytest-cov>=3.0.0
+pytest==8.2.2
+pytest-timeout==2.3.1
+pytest-asyncio>=0.23.7
+tox>=4.16.0
+tox-docker>=5.0.0
+invoke==2.2.0
+pytest-cov>=5.0.0
 vulture>=2.3.0
 ujson>=4.2.0
-wheel>=0.30.0
+wheel>=0.43.0
+docker>=7.1.0

poetry.lock

@@ -25,18 +25,27 @@ typed-ast = "^1.5.0"
 oyaml = "^1.0"
 pandas = "^2.1.2"
 numpy = "^2.0.0"
-
 jsonpath-ng = "^1.6.1"
-[tool.poetry.dev-dependencies]
-pytest = "^7.2.0"
-pytest-cov = "^4.0.0"
-black = "22.10.0"
-flake8 = "^6.0.0"
-tox-poetry-installer = {extras = ["poetry"], version = "^0.10.3"}
 
-[tool.poetry.group.dev.dependencies]
-tox-poetry-installer = {extras = ["poetry"], version = "^0.10.3"}
-docker = "^7.1.0"
+[tool.poetry.dev-dependencies]
+click = "8.1.7"
+black = "24.4.2"
+flake8 = "7.1.0"
+flynt = "~0.69.0"
+isort = "5.10.1"
+mock = "4.0.3"
+packaging = ">=20.4"
+pytest = "8.2.2"
+pytest-timeout = "2.3.1"
+pytest-asyncio = ">=0.23.7"
+tox = ">=4.16.0"
+tox-docker = ">=5.0.0"
+invoke = "2.2.0"
+pytest-cov = ">=5.0.0"
+vulture = ">=2.3.0"
+ujson = ">=4.2.0"
+wheel = ">=0.43.0"
+docker = ">=7.1.0"
 
 [build-system]
 requires = ["poetry_core>=1.0.0"]

pyproject.toml

@@ -465,9 +465,9 @@ def builder_process_stream(
                     assert bin_artifact_len > 0
                     conn.set(bin_key, bytes(bin_artifact), ex=REDIS_BINS_EXPIRE_SECS)
                     build_stream_fields[artifact] = bin_key
-                    build_stream_fields[
-                        "{}_len_bytes".format(artifact)
-                    ] = bin_artifact_len
+                    build_stream_fields["{}_len_bytes".format(artifact)] = (
+                        bin_artifact_len
+                    )
                 result = True
                 if b"platform" in testDetails:
                     build_stream_fields["platform"] = testDetails[b"platform"]

redis_benchmarks_specification/__builder__/builder.py

@@ -348,7 +348,11 @@ def trigger_tests_cli_command_logic(args, project_name, project_version):
             if result is True:
                 stream_id = "n/a"
                 if args.dry_run is False:
-                    (result, reply_fields, error_msg,) = request_build_from_commit_info(
+                    (
+                        result,
+                        reply_fields,
+                        error_msg,
+                    ) = request_build_from_commit_info(
                         conn,
                         commit_dict,
                         {},

redis_benchmarks_specification/__cli__/cli.py

@@ -174,7 +174,11 @@ def exporter_datasink_common(
         git_hash,
     )
     logging.info("Collecting memory metrics")
-    (_, _, overall_end_time_metrics,) = collect_redis_metrics(
+    (
+        _,
+        _,
+        overall_end_time_metrics,
+    ) = collect_redis_metrics(
         redis_conns,
         ["memory"],
         {

redis_benchmarks_specification/__common__/runner.py

@@ -334,9 +334,9 @@ def from_metric_kv_to_timeserie(
 
         target_table_dict[target_name] = target_value
 
-        target_table_dict[
-            "{}:percent {}".format(target_name, comparison_type)
-        ] = target_value_pct_str
+        target_table_dict["{}:percent {}".format(target_name, comparison_type)] = (
+            target_value_pct_str
+        )
     return target_table_keyname, target_table_dict
 
 
@@ -416,7 +416,10 @@ def extract_perversion_timeseries_from_results(
 ):
     break_by_key = "version"
     break_by_str = "by.{}".format(break_by_key)
-    (branch_time_series_dict, target_tables,) = common_timeseries_extraction(
+    (
+        branch_time_series_dict,
+        target_tables,
+    ) = common_timeseries_extraction(
         break_by_key,
         break_by_str,
         datapoints_timestamp,
@@ -719,7 +722,10 @@ def common_exporter_logic(
     if (git_hash is not None) and (git_hash != ""):
         break_by_key = "hash"
         break_by_str = "by.{}".format(break_by_key)
-        (per_hash_time_series_dict, hash_target_tables,) = common_timeseries_extraction(
+        (
+            per_hash_time_series_dict,
+            hash_target_tables,
+        ) = common_timeseries_extraction(
             break_by_key,
             break_by_str,
             datapoints_timestamp,

redis_benchmarks_specification/__common__/timeseries.py

@@ -758,7 +758,10 @@ def delete_temporary_files(
                     profiler_frequency = 99
 
                     # start the profile
-                    (profiler_name, profilers_map,) = profilers_start_if_required(
+                    (
+                        profiler_name,
+                        profilers_map,
+                    ) = profilers_start_if_required(
                         profilers_enabled,
                         profilers_list,
                         redis_pids,
@@ -823,7 +826,10 @@ def delete_temporary_files(
                             benchmark_end_time, benchmark_start_time
                         )
                     )
-                    (_, overall_tabular_data_map,) = profilers_stop_if_required(
+                    (
+                        _,
+                        overall_tabular_data_map,
+                    ) = profilers_stop_if_required(
                         datasink_push_results_redistimeseries,
                         benchmark_duration_seconds,
                         collection_summary_str,
@@ -1069,7 +1075,10 @@ def print_results_table_stdout(
     cpu_usage=None,
 ):
     # check which metrics to extract
-    (_, metrics,) = merge_default_and_config_metrics(
+    (
+        _,
+        metrics,
+    ) = merge_default_and_config_metrics(
         benchmark_config,
         default_metrics,
         None,
@@ -1094,7 +1103,10 @@ def prepare_overall_total_test_results(
     benchmark_config, default_metrics, results_dict, test_name, overall_results_matrix
 ):
     # check which metrics to extract
-    (_, metrics,) = merge_default_and_config_metrics(
+    (
+        _,
+        metrics,
+    ) = merge_default_and_config_metrics(
         benchmark_config,
         default_metrics,
         None,

redis_benchmarks_specification/__runner__/runner.py

@@ -43,7 +43,10 @@ def data_prepopulation_step(
     full_benchmark_path = "/usr/local/bin/{}".format(preload_tool)
     client_mnt_point = "/mnt/client/"
     if "memtier_benchmark" in preload_tool:
-        (_, preload_command_str,) = prepare_memtier_benchmark_parameters(
+        (
+            _,
+            preload_command_str,
+        ) = prepare_memtier_benchmark_parameters(
             benchmark_config["dbconfig"]["preload_tool"],
             full_benchmark_path,
             port,