Insert new workflow jobs; Fix yml line-breaks; amend gitignore.

.circleci/config.yml

@@ -6,22 +6,25 @@ workflows:
     jobs:
       - bundle_dependencies-36
       - bundle_dependencies-35
-      - mypy_type_check-36:
-          requires:
-            - bundle_dependencies-35
-            - bundle_dependencies-36
       - run_tests-36:
           requires:
             - bundle_dependencies-36
       - run_tests-35:
           requires:
             - bundle_dependencies-35
+      - mypy_type_check-36:
+          requires:
+            - run_tests-35
+            - run_tests-36
+      - doctests-36:
+          requires:
+            - run_tests-35
+            - run_tests-36
       - reencryption_memory_profile-36:
           requires:
             - run_tests-35
             - run_tests-36
-
-      - doctests-36:
+      - reencryption_benchmark-36:
           requires:
             - run_tests-35
             - run_tests-36
@@ -93,25 +96,6 @@ jobs:
       - store_artifacts:
           path: ./htmlcov
 
-  reencryption_memory_profile-36:
-    <<: *python_36_base
-    steps:
-      - checkout
-      - restore_cache:
-          key: v1-deps-{{ .Environment.CIRCLE_WORKFLOW_ID }}-{{ checksum "Pipfile" }}-py36
-      - run:
-          name: Install Profiling Tools
-          command: |
-              sudo apt-get update
-              sudo apt install -y valgrind
-              sudo apt install -y massif-visualizer
-      - run:
-          name: Profile Re-Encryption Memory Usage
-          command: |
-              pipenv run valgrind --tool=massif --massif-out-file=./reencryption_memory_profile.massif.out python3 ./tests/metrics/reencryption_firehose.py
-      - store_artifacts:
-          path: ./reencryption_memory_profile.massif.out
-
   mypy_type_check-36:
     <<: *python_36_base
     steps:
@@ -143,10 +127,27 @@ jobs:
       - store_artifacts:
           path: ./docs/build/doctest/output.txt
 
+  reencryption_memory_profile-36:
+    <<: *python_36_base
+    steps:
+      - checkout
+      - restore_cache:
+          key: v1-deps-{{ .Environment.CIRCLE_WORKFLOW_ID }}-{{ checksum "Pipfile" }}-py36
+      - run:
+          name: Install Profiling Tools
+          command: |
+              sudo apt-get update
+              sudo apt install -y valgrind
+              sudo apt install -y massif-visualizer
+      - run:
+          name: Profile Re-Encryption Memory Usage
+          command: |
+              pipenv run valgrind --tool=massif --massif-out-file=./reencryption_memory_profile.massif.out python3 ./tests/metrics/reencryption_firehose.py
+      - store_artifacts:
+          path: ./reencryption_memory_profile.massif.out
+
   reencryption_benchmark-36:
-    working_directory: ~/pyUmbral-36/
-    docker:
-      - image: circleci/python:3.6
+    <<: *python_36_base
     steps:
       - checkout
       - restore_cache:
@@ -154,19 +155,13 @@ jobs:
             - v1-deps-{{ .Environment.CIRCLE_WORKFLOW_ID }}-{{ checksum "Pipfile" }}-py36
             - v1-benchmarks-py36
       - run:
-          name: Run Documentation Tests
+          name: Benchmark Key Splitting and Reencryption
           command: |
-              cd test/metrics
               pipenv install -e . --skip-lock
-              pipenv run pytest -v tests/metrics/reencryption_benchmark.py \
-              --benchmark-verbose \
-              --benchmark-compare \
-              --benchmark-histogram=./histograms/histogram \
-              --benchmark-autosave \
-              --junitxml=./reports/pytest/python36-results.xml \
+              pipenv run pytest -v ./tests/metrics/reencryption_benchmark.py --junitxml=./reports/pytest/python36-results.xml --benchmark-verbose --benchmark-autosave --benchmark-histogram=./histograms/histogram
       - save_cache:
           paths:
-            - "./tests/metrics/.benchmarks"
+            - "./.benchmarks"
           key: v1-benchmarks-py36
       - store_artifacts:
           path: ./tests/metrics/histograms

.gitignore

@@ -245,13 +245,7 @@ pip-selfcheck.json
 
 .idea
 /mypy_report/
-/tests/metrics/.benchmarks/
-.circleci/execute_build.sh
 pytest.ini
-tests/metrics/.benchmarks/Linux-CPython-3.6-64bit/0001_060d9fd1f397bc6a55992b0d95dd8ed31c4f3f3c_20180706_012048_uncommited-changes.json
-tests/metrics/.benchmarks/Linux-CPython-3.6-64bit/0002_060d9fd1f397bc6a55992b0d95dd8ed31c4f3f3c_20180706_012504_uncommited-changes.json
-tests/metrics/.benchmarks/Linux-CPython-3.6-64bit/0003_060d9fd1f397bc6a55992b0d95dd8ed31c4f3f3c_20180706_012940_uncommited-changes.json
-tests/metrics/.benchmarks/Linux-CPython-3.6-64bit/0004_060d9fd1f397bc6a55992b0d95dd8ed31c4f3f3c_20180706_013515_uncommited-changes.json
-tests/metrics/.benchmarks/Linux-CPython-3.6-64bit/0005_060d9fd1f397bc6a55992b0d95dd8ed31c4f3f3c_20180706_013954_uncommited-changes.json
-tests/metrics/.benchmarks/Linux-CPython-3.6-64bit/0006_060d9fd1f397bc6a55992b0d95dd8ed31c4f3f3c_20180706_014433_uncommited-changes.json
+/tests/metrics/.benchmarks/
 tests/metrics/histograms/
+.circleci/execute_build.sh

tests/metrics/reencryption_firehose.py

@@ -46,3 +46,7 @@ def firehose() -> None:
     failure_message = "A Reencryption failed. {} of {} succeeded".format(successful_rencryptions, REENCRYPTIONS)
     assert successful_rencryptions == REENCRYPTIONS, failure_message
     print("Successfully performed {} reencryptions".format(successful_rencryptions), end='\n')
+
+
+if __name__ == "__main__":
+    firehose()  # do