Skip to content

Commit 969681a

Browse files
LinuxJedidanielinux
authored andcommitted
Fix issues causing tox not to run
1 parent 7482e9d commit 969681a

File tree

4 files changed

+7
-13
lines changed

4 files changed

+7
-13
lines changed

MANIFEST.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,5 @@ include README.rst
33

44
recursive-include tests *
55
recursive-include requirements *
6-
recursive-exclude * __pycache__
7-
recursive-exclude * *.py[co]
86

97
recursive-include docs *.rst conf.py Makefile

setup.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@
2323

2424
import os
2525
import sys
26-
from setuptools import setup
27-
from setuptools.command.build_ext import build_ext
26+
from setuptools import setup, find_packages
27+
28+
os.chdir(os.path.dirname(sys.argv[0]) or ".")
2829

2930
import re
3031
VERSIONFILE = "wolfcrypt/_version.py"
@@ -61,11 +62,7 @@
6162
url="https://github.com/wolfssl/wolfcrypt-py",
6263
license="GPLv2 or Commercial License",
6364

64-
packages=["wolfcrypt"],
65-
66-
zip_safe=False,
67-
cffi_modules=["./wolfcrypt/_build_ffi.py:ffibuilder"],
68-
65+
packages=find_packages(),
6966
keywords="wolfssl, wolfcrypt, security, cryptography",
7067
classifiers=[
7168
u"License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
@@ -80,6 +77,7 @@
8077
u"Topic :: Software Development"
8178
],
8279

83-
setup_requires=["cffi"],
84-
install_requires=["cffi"]
80+
setup_requires=["cffi>=1.0.0"],
81+
install_requires=["cffi>=1.0.0"],
82+
cffi_modules=["./wolfcrypt/_build_ffi.py:ffibuilder"]
8583
)

tests/__init__.py

Whitespace-only changes.

tox.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ envlist = py3
33

44
[testenv]
55
wheel = true
6-
setenv =
7-
PYTHONPATH = {toxinidir}:{toxinidir}/wolfcrypt-py
86

97
deps = -rrequirements/test.txt
108
commands = py.test tests/

0 commit comments

Comments
 (0)