diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2019-05-31 19:08:54 -0400 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2019-05-31 19:08:54 -0400 |
commit | d2f29ff47151dd300054c584728b576fe5425c62 (patch) | |
tree | 9d948a9719f452cc01e34b6c9727b066724a85f8 | |
parent | a2b4c008862ce52715517922a49da7bb073fe179 (diff) | |
parent | 489a3f76a2bc605374483fcdc835e77d92eda216 (diff) |
Merge branch '2.4'
-rw-r--r-- | .travis.yml | 11 | ||||
-rw-r--r-- | setup.py | 1 |
2 files changed, 8 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index d63d001d..324c5f3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +dist: xenial language: python sudo: false cache: @@ -8,17 +9,19 @@ python: - "3.4" - "3.5" - "3.6" - - "3.7-dev" - - "pypy-5.6.0" + - "3.7" + - "3.8-dev" + - "pypy" + - "pypy3" matrix: allow_failures: - - python: "3.7-dev" + - python: "3.8-dev" # Explicitly test against our oldest supported cryptography.io, in addition # to whatever the latest default is. include: - python: 2.7 env: "OLDEST_CRYPTO=1.5" - - python: 3.6 + - python: 3.7 env: "OLDEST_CRYPTO=1.5" install: # Ensure modern pip/etc to avoid some issues w/ older worker environs @@ -71,6 +71,7 @@ setup( "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", ], install_requires=["bcrypt>=3.1.3", "cryptography>=1.5", "pynacl>=1.0.1"], ) |