[Packaging] Fix deps for win32

- Fixed trying to install py2-ipaddress breaking on Python3.
- Add wheel universal option so Py2 and Py3 wheel built.
This commit is contained in:
Calum Lind 2018-11-11 14:56:49 +00:00
parent 10fcbecc04
commit 3b8f71613b
3 changed files with 9 additions and 6 deletions

View File

@ -7,7 +7,7 @@ mako
chardet chardet
six six
setproctitle setproctitle
pywin32; sys.platform == 'win32' pywin32; sys_platform == 'win32'
py2-ipaddress; sys.platform == 'win32' py2-ipaddress; sys_platform == 'win32' and python_version == '2'
certifi; sys.platform == 'win32' certifi; sys_platform == 'win32'
zope.interface>=4.4.2 zope.interface>=4.4.2

View File

@ -1,3 +1,6 @@
[bdist_wheel]
universal = 1
[build_docs] [build_docs]
source-dir = docs/source source-dir = docs/source
build-dir = docs/build build-dir = docs/build

View File

@ -547,9 +547,9 @@ install_requires = [
'chardet', 'chardet',
'six', 'six',
'setproctitle', 'setproctitle',
"pywin32; sys.platform == 'win32'", "pywin32; sys_platform == 'win32'",
"py2-ipaddress; sys.platform == 'win32'", "py2-ipaddress; sys_platform == 'win32' and python_version == '2'",
"certifi; sys.platform == 'win32'", "certifi; sys_platform == 'win32'",
'zope.interface', 'zope.interface',
] ]
tests_require = ['pytest', 'pytest-twisted'] tests_require = ['pytest', 'pytest-twisted']