fix tests in ci tox

Author: RitvikKapila

codebuild/py311/performance_tests_mpl.yml

@@ -0,0 +1,38 @@
+# Runs the performance tests for the MPL in an environment with the MPL installed
+version: 0.2
+
+env:
+  variables:
+    # No TOXENV. This runs multiple environments.
+    REGION: "us-west-2"
+    AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID: >-
+      arn:aws:kms:us-west-2:658956600833:key/b3537ef1-d8dc-4780-9f5a-55776cbb2f7f
+    AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID_2: >-
+      arn:aws:kms:eu-central-1:658956600833:key/75414c93-5285-4b57-99c9-30c1cf0a22c2
+    AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_MRK_KEY_ID_1: >-
+      arn:aws:kms:us-west-2:658956600833:key/mrk-80bd8ecdcd4342aebd84b7dc9da498a7
+    AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_MRK_KEY_ID_2: >-
+      arn:aws:kms:us-east-1:658956600833:key/mrk-80bd8ecdcd4342aebd84b7dc9da498a7
+
+phases:
+  install:
+    runtime-versions:
+      python: 3.11
+  build:
+    commands:
+      - cd /root/.pyenv/plugins/python-build/../.. && git pull && cd -
+      - pyenv install --skip-existing 3.11.0
+      - pyenv local 3.11.0
+      - pip install --upgrade pip
+      - pip install setuptools
+      - pip install "tox < 4.0"
+      # Assume special role to access keystore
+      - TMP_ROLE=$(aws sts assume-role --role-arn "arn:aws:iam::370957321024:role/GitHub-CI-Public-ESDK-Python-Role-us-west-2" --role-session-name "CB-Py312ExamplesMpl")
+      - export TMP_ROLE
+      - export AWS_ACCESS_KEY_ID=$(echo "${TMP_ROLE}" | jq -r '.Credentials.AccessKeyId')
+      - export AWS_SECRET_ACCESS_KEY=$(echo "${TMP_ROLE}" | jq -r '.Credentials.SecretAccessKey')
+      - export AWS_SESSION_TOKEN=$(echo "${TMP_ROLE}" | jq -r '.Credentials.SessionToken')
+      - aws sts get-caller-identity
+      # Run MPL-specific tests with special role
+      - cd performance_tests/
+      - tox

codebuild/py312/performance_tests_mpl.yml

@@ -34,4 +34,5 @@ phases:
       - export AWS_SESSION_TOKEN=$(echo "${TMP_ROLE}" | jq -r '.Credentials.SessionToken')
       - aws sts get-caller-identity
       # Run MPL-specific tests with special role
-      - tox -e py312-mplperformancetests-mpl
+      - cd performance_tests/
+      - tox

performance_tests/README.md renamed to performance_tests/README.rst

@@ -0,0 +1,193 @@
+[tox]
+envlist =
+    # The performance tests only work for python 3.11 and 3.12
+    py{311,312}-performance_tests-mpl
+    bandit, readme
+    # TODO: Activate doc8 after finalizing README.rst
+    ; bandit, doc8, readme
+
+# Additional test environments:
+#
+# linters :: Runs all linters over all source code.
+# linters-tests :: Runs all linters over all tests.
+
+# Autoformatter helper environments:
+#
+# autoformat : Apply all autoformatters
+#
+# black-check : Check for "black" issues
+# blacken : Fix all "black" issues
+#
+# isort-seed : Generate a known_third_party list for isort.
+#   NOTE: make the "known_third_party = " line in setup.cfg before running this
+#   NOTE: currently it incorrectly identifies this library too; make sure you remove it
+# isort-check : Check for isort issues
+# isort : Fix isort issues
+
+# Operational helper environments:
+#
+# build :: Builds source and wheel dist files.
+# test-release :: Builds dist files and uploads to testpypi pypirc profile.
+# release :: Builds dist files and uploads to pypi pypirc profile.
+
+[testenv:base-command]
+commands = pytest test/
+deps = 
+    click
+
+
+[testenv]
+passenv =
+    # Pass through AWS credentials
+    AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_SESSION_TOKEN \
+    # AWS Role access in CodeBuild is via the contaner URI
+    AWS_CONTAINER_CREDENTIALS_RELATIVE_URI \
+    # Pass through AWS profile name (useful for local testing)
+    AWS_PROFILE
+sitepackages = False
+deps =
+    -rrequirements.txt
+    # Install the MPL requirements if the `-mpl` suffix is present
+    mpl: -rrequirements_mpl.txt
+    ..
+commands = 
+    # awses_local: {[testenv:base-command]commands}
+    performance_tests: {[testenv:base-command]commands}
+
+# mypy
+[testenv:mypy-coverage]
+commands =
+    # Make mypy linecoverage report readable by coverage
+    python -c \
+        "t = open('.coverage', 'w');\
+        c = open('build/coverage.json').read();\
+        t.write('!coverage.py: This is a private format, don\'t read it directly!\n');\
+        t.write(c);\
+        t.close()"
+    coverage report -m
+
+[testenv:mypy-common]
+basepython = python3
+deps =
+    coverage
+    mypy>=0.600
+    mypy_extensions
+    typing>=3.6.2
+
+[testenv:mypy-py3]
+basepython = {[testenv:mypy-common]basepython}
+deps = {[testenv:mypy-common]deps}
+commands =
+    python -m mypy \
+        --linecoverage-report build \
+        src/aws_encryption_sdk_performance_tests/ \
+        {posargs}
+    {[testenv:mypy-coverage]commands}
+
+[testenv:blacken-src]
+basepython = python3
+deps = -r../dev_requirements/linter-requirements.txt
+commands =
+    black --line-length 120 \
+        src/aws_encryption_sdk_performance_tests/ \
+        setup.py \
+        test/ \
+        {posargs}
+
+
+[testenv:blacken]
+basepython = python3
+deps =
+    {[testenv:blacken-src]deps}
+commands =
+    {[testenv:blacken-src]commands}
+
+[testenv:black-check]
+basepython = python3
+deps =
+    {[testenv:blacken]deps}
+commands =
+    {[testenv:blacken-src]commands} --diff
+
+[testenv:isort-seed]
+basepython = python3
+deps = -r../dev_requirements/linter-requirements.txt
+commands = seed-isort-config
+
+[testenv:isort]
+basepython = python3
+deps = -r../dev_requirements/linter-requirements.txt
+commands = isort -rc \
+    src \
+    test \
+    setup.py \
+    {posargs}
+
+[testenv:isort-check]
+basepython = python3
+deps = {[testenv:isort]deps}
+commands = {[testenv:isort]commands} -c
+
+[testenv:autoformat]
+basepython = python3
+deps =
+    {[testenv:blacken]deps}
+    {[testenv:isort]deps}
+    ..
+commands =
+    {[testenv:blacken]commands}
+    {[testenv:isort]commands}
+
+[testenv:doc8]
+basepython = python3
+deps = -r../dev_requirements/linter-requirements.txt
+commands = doc8 README.rst
+
+[testenv:bandit]
+basepython = python3
+deps = -r../dev_requirements/linter-requirements.txt
+commands = bandit -r src/aws_encryption_sdk_performance_tests/
+
+[testenv:linters]
+basepython = python3
+deps =
+    {[testenv:doc8]deps}
+    {[testenv:bandit]deps}
+commands =
+    {[testenv:doc8]commands}
+    {[testenv:bandit]commands}
+
+# Release tooling
+[testenv:park]
+basepython = python3
+skip_install = true
+deps = -r../dev_requirements/release-requirements.txt
+commands = python setup.py park
+
+[testenv:build]
+basepython = python3
+skip_install = true
+deps =
+    -r../dev_requirements/release-requirements.txt
+commands =
+    python setup.py sdist bdist_wheel
+
+[testenv:test-release]
+basepython = python3
+skip_install = true
+deps =
+    {[testenv:build]deps}
+    twine
+commands =
+    {[testenv:build]commands}
+    twine upload --skip-existing --repository testpypi dist/*
+
+[testenv:release]
+basepython = python3
+skip_install = true
+deps =
+    {[testenv:build]deps}
+    twine
+commands =
+    {[testenv:build]commands}
+    twine upload --skip-existing --repository pypi dist/*

performance_tests/tox.ini

@@ -1,7 +1,7 @@
 [tox]
 envlist =
     # <3.11: run all non-MPL tests
-    py{37,38,39,310}-{local,integ,accept,examples},
+    py{38,39,310}-{local,integ,accept,examples},
     # >=3.11: run all tests with MPL installed and without MPL installed
     # The `-mpl` suffix tells tox to install the MPL.
     # In the case where the suffix IS NOT appended,
@@ -17,10 +17,10 @@ envlist =
     # The `mpl` prefix specifies a separate target,
     # i.e. `mpllocal` instead of `local`.
     # `mplXXX` contains tests using MPL components.
-    py{311,312}-mpl{local,examples,performancetests}-mpl
+    py{311,312}-mpl{local,examples}-mpl
     nocmk,
     bandit, doc8, readme, docs,
-    {flake8,pylint}{,-tests,-examples,-performancetests},
+    {flake8,pylint}{,-tests,-examples},
     isort-check, black-check,
     # prone to false positives
     vulture
@@ -92,7 +92,6 @@ commands =
     examples: {[testenv:base-command]commands} examples/test/legacy/ -m examples
     # MPL keyring examples require a special IAM role; run these separately under a separate set of permissions
     mplexamples: {[testenv:base-command]commands} examples/test/ -m examples --ignore examples/test/legacy/
-    performancetests: {[testenv:base-command]commands} performance_tests/test/ -m examples
     all: {[testenv:base-command]commands} test/ examples/test/legacy/ --ignore test/mpl/
     mplall: {[testenv:base-command]commands} test/ examples/test/
     manual: {[testenv:base-command]commands}
@@ -176,18 +175,6 @@ commands =
         --ignore D103,E203,W503 \
         examples/test/
 
-[testenv:flake8-performancetests]
-basepython = {[testenv:flake8]basepython}
-deps = {[testenv:flake8]deps}
-commands =
-    flake8 performance_tests/src/
-    flake8 \
-        # Ingore D103 missing docstring errors in tests (test names should be self-documenting)
-        # E203 is not PEP8 compliant https://github.com/ambv/black#slices
-        # W503 is not PEP8 compliant https://github.com/ambv/black#line-breaks--binary-operators
-        --ignore D103,E203,W503 \
-        performance_tests/test/
-
 [testenv:pylint]
 basepython = python3
 deps =
@@ -208,13 +195,6 @@ commands =
     pylint --rcfile=examples/src/pylintrc examples/src/
     pylint --rcfile=examples/test/pylintrc --disable R0801 examples/test/
 
-[testenv:pylint-performancetests]
-basepython = {[testenv:pylint]basepython}
-deps = {[testenv:pylint]deps}
-commands =
-    pylint --rcfile=performance_tests/pylintrc performance_tests/src/
-    pylint --rcfile=performance_tests/pylintrc --disable R0801 performance_tests/test/
-
 [testenv:pylint-tests]
 basepython = {[testenv:pylint]basepython}
 deps = {[testenv:pylint]deps}
@@ -235,7 +215,6 @@ commands =
         doc/conf.py \
         test/ \
         examples/ \
-        performance_tests/ \
         {posargs}
 
 
@@ -340,15 +319,6 @@ commands =
     {[testenv:flake8-examples]commands}
     {[testenv:pylint-examples]commands}
 
-[testenv:linters-performance-tests]
-basepython = python3
-deps =
-    {[testenv:flake8-performancetests]deps}
-    {[testenv:pylint-performancetests]deps}
-commands =
-    {[testenv:flake8-performancetests]commands}
-    {[testenv:pylint-performancetests]commands}
-
 # Documentation
 [testenv:docs]
 basepython = python3