diff options
| -rw-r--r-- | MANIFEST.in | 3 | ||||
| -rw-r--r-- | doc/conf.py | 2 | ||||
| -rw-r--r-- | tests/README | 8 | ||||
| -rw-r--r-- | tests/memdbg.py | 4 | ||||
| -rw-r--r-- | tox.ini | 6 |
5 files changed, 6 insertions, 17 deletions
diff --git a/MANIFEST.in b/MANIFEST.in index 71fbb40..66e3e33 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,6 @@ -include LICENSE ChangeLog MANIFEST.in *.rst tox.ini memdbg.py runtests.py OpenSSL/test/README docs-requirements.txt +include LICENSE ChangeLog MANIFEST.in *.rst tox.ini memdbg.py runtests.py OpenSSL/test/README docs-requirements.txt .coveragerc exclude leakcheck +recursive-include tests *.py recursive-include doc * recursive-include examples * recursive-include rpm * diff --git a/doc/conf.py b/doc/conf.py index 7d0fe9c..9eba065 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -78,7 +78,7 @@ copyright = u"2001-{0}, {1}".format(datetime.date.today().year, authors) # built documents. # # The short X.Y version. -version = find_version("../OpenSSL/version.py") +version = find_version("..", "src", "OpenSSL", "version.py") # The full version, including alpha/beta/rc tags. release = version diff --git a/tests/README b/tests/README deleted file mode 100644 index 8b3b3ff..0000000 --- a/tests/README +++ /dev/null @@ -1,8 +0,0 @@ -These tests are meant to be run using twisted's "trial" command. - -See http://twistedmatrix.com/trac/wiki/TwistedTrial - -For example... - -$ sudo python ./setup install -$ trial OpenSSL diff --git a/tests/memdbg.py b/tests/memdbg.py index 324d0fd..0deeb9e 100644 --- a/tests/memdbg.py +++ b/tests/memdbg.py @@ -18,7 +18,7 @@ _ffi.cdef( int backtrace(void **buffer, int size); char **backtrace_symbols(void *const *buffer, int size); void backtrace_symbols_fd(void *const *buffer, int size, int fd); - """) + """) # noqa _api = _ffi.verify( """ #include <openssl/crypto.h> @@ -29,10 +29,12 @@ C = _ffi.dlopen(None) verbose = False + def log(s): if verbose: print(s) + def _backtrace(): buf = _ffi.new("void*[]", 64) result = _api.backtrace(buf, len(buf)) @@ -25,12 +25,6 @@ deps = commands = flake8 src tests setup.py -[testenv:pyroma] -deps = - pyroma>=1.6 # <1.6 had bogus return values. -commands = - pyroma -d . - [testenv:pypi-readme] deps = readme |