diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2017-10-11 21:36:30 -0400 |
---|---|---|
committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-10-12 09:36:30 +0800 |
commit | a87daea52b698a59664d852ecad567a742576265 (patch) | |
tree | d18b07e79df0b9bfc95ecfeb96e04a1d1f377e63 | |
parent | 4cf6e785ca5608cffd8d92ad1e1a5073108a2a20 (diff) | |
download | cryptography-a87daea52b698a59664d852ecad567a742576265.tar.gz cryptography-a87daea52b698a59664d852ecad567a742576265.tar.bz2 cryptography-a87daea52b698a59664d852ecad567a742576265.zip |
Debian sid is python3.6 now (#3968)
* Debian sid is python3.6 now
* Workaround because apparently measuring coverage correctly isn't a legitimate use case
-rw-r--r-- | Jenkinsfile | 2 | ||||
-rw-r--r-- | tests/utils.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 0e4c60ce..60195a68 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -51,7 +51,7 @@ def configs = [ [ label: 'docker', imageName: 'pyca/cryptography-runner-sid', - toxenvs: ['py27', 'py35'], + toxenvs: ['py27', 'py36'], ], [ label: 'docker', diff --git a/tests/utils.py b/tests/utils.py index 2d3cb6df..74b1513d 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -248,6 +248,9 @@ def load_pkcs1_vectors(vector_data): attr = None if private_key_vector is None or public_key_vector is None: + # Random garbage to defeat CPython's peephole optimizer so that + # coverage records correctly: https://bugs.python.org/issue2506 + 1 + 1 continue if line.startswith("# Private key"): |