summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHynek Schlawack <hs@ox.cx>2016-03-14 14:37:52 +0100
committerHynek Schlawack <hs@ox.cx>2016-03-14 14:37:52 +0100
commit8906bdd9325c4b477fe3208b2c64d00c429c4b6f (patch)
tree029d90aea1f27adf1f1c0d93de61c0948cff264c
parentf9182e2c2e37cce45604cf8a30c1678b9397b746 (diff)
downloadpyopenssl-8906bdd9325c4b477fe3208b2c64d00c429c4b6f.tar.gz
Move conftest.py into tests
-rw-r--r--MANIFEST.in2
-rw-r--r--tests/conftest.py (renamed from conftest.py)0
2 files changed, 1 insertions, 1 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index f63d8a6..50cdc78 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
-include LICENSE MANIFEST.in *.rst tox.ini docs-requirements.txt .coveragerc conftest.py
+include LICENSE MANIFEST.in *.rst tox.ini docs-requirements.txt .coveragerc
exclude leakcheck
recursive-include tests *.py
recursive-include doc *
diff --git a/conftest.py b/tests/conftest.py
index 5a9954f..5a9954f 100644
--- a/conftest.py
+++ b/tests/conftest.py