diff options
author | Calum Lind <calumlind@gmail.com> | 2018-11-11 14:56:49 +0000 |
---|---|---|
committer | Calum Lind <calumlind@gmail.com> | 2018-11-12 10:10:41 +0000 |
commit | 3b8f71613b65a1f23c5b5429b17daa8241cb032a (patch) | |
tree | c9fec3d3fadb9c48dfed1406ef2dcc33478b0ea7 | |
parent | 10fcbecc0413733f50590890fb54d4b3fd710d13 (diff) | |
download | deluge-3b8f71613b65a1f23c5b5429b17daa8241cb032a.tar.gz deluge-3b8f71613b65a1f23c5b5429b17daa8241cb032a.tar.bz2 deluge-3b8f71613b65a1f23c5b5429b17daa8241cb032a.zip |
[Packaging] Fix deps for win32
- Fixed trying to install py2-ipaddress breaking on Python3.
- Add wheel universal option so Py2 and Py3 wheel built.
-rw-r--r-- | requirements.txt | 6 | ||||
-rw-r--r-- | setup.cfg | 3 | ||||
-rwxr-xr-x | setup.py | 6 |
3 files changed, 9 insertions, 6 deletions
diff --git a/requirements.txt b/requirements.txt index 909810590..17458a189 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ mako chardet six setproctitle -pywin32; sys.platform == 'win32' -py2-ipaddress; sys.platform == 'win32' -certifi; sys.platform == 'win32' +pywin32; sys_platform == 'win32' +py2-ipaddress; sys_platform == 'win32' and python_version == '2' +certifi; sys_platform == 'win32' zope.interface>=4.4.2 @@ -1,3 +1,6 @@ +[bdist_wheel] +universal = 1 + [build_docs] source-dir = docs/source build-dir = docs/build @@ -547,9 +547,9 @@ install_requires = [ 'chardet', 'six', 'setproctitle', - "pywin32; sys.platform == 'win32'", - "py2-ipaddress; sys.platform == 'win32'", - "certifi; sys.platform == 'win32'", + "pywin32; sys_platform == 'win32'", + "py2-ipaddress; sys_platform == 'win32' and python_version == '2'", + "certifi; sys_platform == 'win32'", 'zope.interface', ] tests_require = ['pytest', 'pytest-twisted'] |