From 0164db9daa3f06a618e3012b6ca7413bc8d1e13c Mon Sep 17 00:00:00 2001
From: Stephen Brown II <Stephen.Brown2@gmail.com>
Date: Wed, 18 Mar 2020 07:05:47 -0600
Subject: [PATCH] Fix typo breaking pydantic-only benchmarks when TestCAttrs
 not available (#1282)

* Fix typo breaking pydantic-only benchmarks when TestCAttrs not available

* Add Pydantic-only benchmarks to CI


Remove requirements for pydantic-only benchmarks and update python ver

* Benchmarks output tweaks

- Left pad by only 4 more than the longest benchmark
- Add run number/total to each run
- Summarize what is being tested at beginning
---
 .travis.yml       |  9 ++++++++-
 benchmarks/run.py | 12 +++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2d977ec..e407779 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -102,7 +102,7 @@ jobs:
     after_success: skip
 
   - stage: test
-    python: 3.7
+    python: 3.8
     name: 'Benchmarks'
     script:
     - pip install -r benchmarks/requirements.txt
@@ -110,6 +110,13 @@ jobs:
     - BENCHMARK_REPEATS=1 make benchmark-all
     after_success: skip
 
+  - stage: test
+    python: 3.8
+    name: 'Pydantic-Only Benchmarks'
+    script:
+    - BENCHMARK_REPEATS=1 make benchmark-pydantic
+    after_success: skip
+
   - stage: build
     name: 'PyPI Build and Upload'
     python: 3.7
diff --git a/benchmarks/run.py b/benchmarks/run.py
index 622365a..0799e30 100644
--- a/benchmarks/run.py
+++ b/benchmarks/run.py
@@ -39,7 +39,7 @@ except Exception:
 try:
     from test_cattrs import TestCAttrs
 except Exception:
-    TestCAttr = None
+    TestCAttrs = None
 
 try:
     from test_cerberus import TestCerberus
@@ -168,7 +168,9 @@ def main():
     if 'pydantic-only' not in sys.argv:
         tests += other_tests
 
+    lpad = max([len(t.package) for t in tests]) + 4
     repeats = int(os.getenv('BENCHMARK_REPEATS', '5'))
+    print(f'testing {", ".join([t.package for t in tests])}, {repeats} times each')
     results = []
     csv_results = []
     for test_class in tests:
@@ -178,20 +180,20 @@ def main():
             count, pass_count = 0, 0
             start = datetime.now()
             test = test_class(True)
-            for i in range(3):
+            for j in range(3):
                 for case in cases:
                     passed, result = test.validate(case)
                     count += 1
                     pass_count += passed
             time = (datetime.now() - start).total_seconds()
             success = pass_count / count * 100
-            print(f'{p:>40} time={time:0.3f}s, success={success:0.2f}%')
+            print(f'{p:>{lpad}} ({i+1:>{len(str(repeats))}}/{repeats}) time={time:0.3f}s, success={success:0.2f}%')
             times.append(time)
-        print(f'{p:>40} best={min(times):0.3f}s, avg={mean(times):0.3f}s, stdev={stdev(times):0.3f}s')
+        print(f'{p:>{lpad}} best={min(times):0.3f}s, avg={mean(times):0.3f}s, stdev={stdev(times):0.3f}s')
         model_count = 3 * len(cases)
         avg = mean(times) / model_count * 1e6
         sd = stdev(times) / model_count * 1e6
-        results.append(f'{p:>40} best={min(times) / model_count * 1e6:0.3f}μs/iter '
+        results.append(f'{p:>{lpad}} best={min(times) / model_count * 1e6:0.3f}μs/iter '
                        f'avg={avg:0.3f}μs/iter stdev={sd:0.3f}μs/iter version={test_class.version}')
         csv_results.append([p, test_class.version, avg])
         print()