diff options
author | Terry Chia <terrycwk1994@gmail.com> | 2014-12-14 15:32:16 +0800 |
---|---|---|
committer | Terry Chia <terrycwk1994@gmail.com> | 2014-12-14 15:32:16 +0800 |
commit | 36b35b1d613b54205d7fb041c4960c0c1f9d34f9 (patch) | |
tree | 5b630b451618777cc7c718dcd0353a4ccf58852e | |
parent | c5e9ce030ba279973f2970d7efe16048a0d09b3a (diff) | |
download | cryptography-36b35b1d613b54205d7fb041c4960c0c1f9d34f9.tar.gz cryptography-36b35b1d613b54205d7fb041c4960c0c1f9d34f9.tar.bz2 cryptography-36b35b1d613b54205d7fb041c4960c0c1f9d34f9.zip |
Move config in pytest.ini to tox.ini.
-rw-r--r-- | pytest.ini | 5 | ||||
-rw-r--r-- | tox.ini | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pytest.ini b/pytest.ini deleted file mode 100644 index 0567f800..00000000 --- a/pytest.ini +++ /dev/null @@ -1,5 +0,0 @@ -[pytest] -addopts = -r s -markers = - requires_backend_interface: this test requires a specific backend interface - supported: parametrized test requiring only_if and skip_message @@ -76,3 +76,9 @@ application-import-names = cryptography,cryptography_vectors,tests [doc8] extensions = rst + +[pytest] +addopts = -r s +markers = + requires_backend_interface: this test requires a specific backend interface + supported: parametrized test requiring only_if and skip_message |