diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bffc0061..aa2a4cb2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,9 +4,6 @@ repos: hooks: - id: check-added-large-files - id: check-yaml - # Helm templates aren't true YAML and so fail this checker - exclude: benchmark/kubernetes/perf_test/templates - - id: check-merge-conflict - repo: local diff --git a/benchmark/Dockerfile b/benchmark/Dockerfile index 04829df9..4f8fa29b 100644 --- a/benchmark/Dockerfile +++ b/benchmark/Dockerfile @@ -1,7 +1,7 @@ # This file contains the images for the performance test -# perf_client contains the Python client code that connects to the Coniql +# perf_client contains the Python client code that connects to the Coniql # server via websockets FROM python:3.10 as perf_client @@ -18,7 +18,7 @@ COPY ./coniql_performance_test.py . # to be flushed to stdout as they occur, rather than being buffered ENTRYPOINT [ "python", "-u", "./coniql_performance_test.py" ] -# ioc generates a configurable sized DB, then runs an IOC +# ioc generates a configurable sized DB, then runs an IOC FROM ghcr.io/epics-containers/epics-base-linux-runtime:23.6.1 as ioc COPY ./generate_db.sh . diff --git a/benchmark/build_and_run_ioc.sh b/benchmark/build_and_run_ioc.sh index d8542fb5..6fb47da8 100755 --- a/benchmark/build_and_run_ioc.sh +++ b/benchmark/build_and_run_ioc.sh @@ -1,9 +1,9 @@ #!/bin/bash # Generate an EPICS database and then run a softIOC using it -# Requires: +# Requires: # EPICS installed and available -# Usage: -# ./build_and_run_ioc.sh +# Usage: +# ./build_and_run_ioc.sh # where: # = the number of records the database will contain diff --git a/benchmark/generate_db.sh b/benchmark/generate_db.sh index c2f6fe0c..41dae955 100755 --- a/benchmark/generate_db.sh +++ b/benchmark/generate_db.sh @@ -1,20 +1,20 @@ #!/bin/bash -# Generate an EPICS record database of a specified size in a +# Generate an EPICS record database of a specified size in a # specified location # Usage: # ./generate_db.sh # where: # = directory in which the database file will be created -# = the number of records the database will contain. - +# = the number of records the database will contain. + SUB_DIR=$1 N_PVS=$2 DATABASE_FILE=$SUB_DIR/coniqlPerformanceTestDb.db -# Setup: create db file for EPICS +# Setup: create db file for EPICS echo "-> Creating EPICS db with $N_PVS PVs at $DATABASE_FILE" for ((i=0;i<$N_PVS;i++)) do diff --git a/pyproject.toml b/pyproject.toml index a837f012..10110b84 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -51,11 +51,9 @@ dev = [ "sphinx-rtd-theme-github-versions", "tox-direct", "types-mock", - "types-requests", # Required for benchmarking tests "psutil", # Required for benchmarking tests "pytest-asyncio>0.17", "pytest-aiohttp", - "requests", # Required for benchmarking tests "websockets", # Required for benchmarking tests ]