From f13cb4a4c4083801e980e6aa2d0d5e152877840e Mon Sep 17 00:00:00 2001 From: mattsb42-aws Date: Mon, 31 Aug 2020 09:53:29 -0700 Subject: [PATCH 1/4] chore: remove AppVeyor config --- appveyor.yml | 61 ---------------------------------------------------- 1 file changed, 61 deletions(-) delete mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index dd98dfb0..00000000 --- a/appveyor.yml +++ /dev/null @@ -1,61 +0,0 @@ -# https://packaging.python.org/guides/supporting-windows-using-appveyor/ - -environment: - - matrix: - # The only test we perform on Windows are our actual code tests. All linting, static - # analysis, etc are only run on Linux (via Travis CI). - - # Python 2.7 - - PYTHON: "C:\\Python27" - TOXENV: "py27-local-slow" - - PYTHON: "C:\\Python27" - TOXENV: "py27-integ-slow" - - PYTHON: "C:\\Python27-x64" - TOXENV: "py27-local-slow" - - PYTHON: "C:\\Python27-x64" - TOXENV: "py27-integ-slow" - - # Python 3.4 - - PYTHON: "C:\\Python34" - TOXENV: "py34-local-slow" - - PYTHON: "C:\\Python34" - TOXENV: "py34-integ-slow" - - PYTHON: "C:\\Python34-x64" - DISTUTILS_USE_SDK: "1" - TOXENV: "py34-local-slow" - - PYTHON: "C:\\Python34-x64" - DISTUTILS_USE_SDK: "1" - TOXENV: "py34-integ-slow" - - # Python 3.5 - - PYTHON: "C:\\Python35" - TOXENV: "py35-local-slow" - - PYTHON: "C:\\Python35" - TOXENV: "py35-integ-slow" - - PYTHON: "C:\\Python35-x64" - TOXENV: "py35-local-slow" - - PYTHON: "C:\\Python35-x64" - TOXENV: "py35-integ-slow" - - # Python 3.6 - - PYTHON: "C:\\Python36" - TOXENV: "py36-local-slow" - - PYTHON: "C:\\Python36" - TOXENV: "py36-integ-slow" - - PYTHON: "C:\\Python36-x64" - TOXENV: "py36-local-slow" - - PYTHON: "C:\\Python36-x64" - TOXENV: "py36-integ-slow" - -install: - # Prepend newly installed Python to the PATH of this build - - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" - # Check the Python version to verify the correct version was installed - - "python --version" - - "python -m pip install --upgrade setuptools wheel tox" - -build: off - -test_script: - - "tox -- -vv" From c4b4a9f2a9c583a1e90725c6df3775d8c00d986e Mon Sep 17 00:00:00 2001 From: mattsb42-aws Date: Mon, 31 Aug 2020 09:53:54 -0700 Subject: [PATCH 2/4] chore: remove non-integ test environments from Travis config --- .travis.yml | 66 ----------------------------------------------------- 1 file changed, 66 deletions(-) diff --git a/.travis.yml b/.travis.yml index df8e4800..958ac878 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,88 +2,22 @@ sudo: false language: python matrix: include: - # Hypothesis no longer supports Python 2 and - # there is a bug that appears with our slow tests - # only on Python 2. - # Until we also drop Python 2 support, - # the workaround is just that we don't run the slow tests - # on Python 2. # CPython 2.7 - - python: 2.7 - env: TOXENV=py27-travis-local-fast - python: 2.7 env: TOXENV=py27-travis-integ-slow # CPython 3.5 - - python: 3.5 - env: TOXENV=py35-travis-local-slow - python: 3.5 env: TOXENV=py35-travis-integ-slow - - python: 3.5 - env: TOXENV=py35-travis-isolation # CPython 3.6 - - python: 3.6 - env: TOXENV=py36-travis-local-slow - python: 3.6 env: TOXENV=py36-travis-integ-slow - - python: 3.6 - env: TOXENV=py36-travis-isolation # CPython 3.7 # xenial + sudo are currently needed to get 3.7 # https://github.com/travis-ci/travis-ci/issues/9815 - - python: 3.7 - env: TOXENV=py37-travis-local-slow - dist: xenial - sudo: true - python: 3.7 env: TOXENV=py37-travis-integ-slow dist: xenial sudo: true - - python: 3.7 - env: TOXENV=py37-travis-isolation - dist: xenial - sudo: true - # Upstream tests - - python: 2.7 - env: TOXENV=test-upstream-requirements-py27 - # xenial + sudo are currently needed to get 3.7 - # https://github.com/travis-ci/travis-ci/issues/9815 - - python: 3.7 - env: TOXENV=test-upstream-requirements-py37 - dist: xenial - sudo: true - # MyPy - # Disabled pending completion of integration - # https://github.com/aws/aws-dynamodb-encryption-python/issues/66 -# - python: 3.6 -# env: TOXENV=mypy-py2 -# - python: 3.6 -# env: TOXENV=mypy-py3 - # Security - - python: 3.6 - env: TOXENV=bandit - # Linting - - python: 3.6 - env: TOXENV=doc8 - - python: 3.6 - env: TOXENV=readme - - python: 3.6 - env: TOXENV=docs - # Disabled pending completion of cleanup - # https://github.com/aws/aws-dynamodb-encryption-python/issues/67 -# - python: 3.6 -# env: TOXENV=flake8 -# - python: 3.6 -# env: TOXENV=pylint -# - python: 3.6 -# env: TOXENV=flake8-tests -# - python: 3.6 -# env: TOXENV=pylint-tests - - python: 3.7 - dist: xenial - env: TOXENV=flake8-examples - - python: 3.7 - dist: xenial - env: TOXENV=pylint-examples install: # Clean up because Travis doesn't # https://github.com/travis-ci/travis-ci/issues/7940 From 04f501a7e6e20bf56edb649111b914603810eec9 Mon Sep 17 00:00:00 2001 From: mattsb42-aws Date: Mon, 31 Aug 2020 09:54:22 -0700 Subject: [PATCH 3/4] chore: update readme CI badges - remove AppVeyor - add GitHub Actions --- README.rst | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index fc71a793..d81d2d9f 100644 --- a/README.rst +++ b/README.rst @@ -21,8 +21,13 @@ Amazon DynamoDB Encryption Client for Python .. image:: https://travis-ci.org/aws/aws-dynamodb-encryption-python.svg?branch=master :target: https://travis-ci.org/aws/aws-dynamodb-encryption-python -.. image:: https://ci.appveyor.com/api/projects/status/6mh2v0nusujldu72/branch/master?svg=true - :target: https://ci.appveyor.com/project/mattsb42-aws/aws-dynamodb-encryption-python-v5ycc +.. image:: https://github.com/aws/aws-dynamodb-encryption-python/workflows/tests/badge.svg + :target: https://github.com/aws/aws-dynamodb-encryption-python/actions?query=workflow%3Atests + :alt: tests + +.. image:: https://github.com/aws/aws-dynamodb-encryption-python/workflows/static%20analysis/badge.svg + :target: https://github.com/aws/aws-dynamodb-encryption-python/actions?query=workflow%3A%22static+analysis%22 + :alt: static analysis The `Amazon DynamoDB Encryption Client for Python`_ provides client-side encryption of `Amazon DynamoDB`_ items to help you to protect your table data before you send it to DynamoDB. It From 312a2dd9f7c070234cd96ff73a8120e30c7dc8e3 Mon Sep 17 00:00:00 2001 From: mattsb42-aws Date: Mon, 31 Aug 2020 10:42:29 -0700 Subject: [PATCH 4/4] chore: fix link to Travis build image --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index d81d2d9f..a01cc377 100644 --- a/README.rst +++ b/README.rst @@ -19,7 +19,7 @@ Amazon DynamoDB Encryption Client for Python :alt: Documentation Status .. image:: https://travis-ci.org/aws/aws-dynamodb-encryption-python.svg?branch=master - :target: https://travis-ci.org/aws/aws-dynamodb-encryption-python + :target: https://travis-ci.org/aws/aws-dynamodb-encryption-python.svg?branch=master .. image:: https://github.com/aws/aws-dynamodb-encryption-python/workflows/tests/badge.svg :target: https://github.com/aws/aws-dynamodb-encryption-python/actions?query=workflow%3Atests