diff options
author | Calum Lind <calumlind+deluge@gmail.com> | 2016-05-19 17:18:34 +0100 |
---|---|---|
committer | Calum Lind <calumlind+deluge@gmail.com> | 2016-05-19 17:21:19 +0100 |
commit | 6971e08b0d64fcdff8557ca164322a1314833c52 (patch) | |
tree | 4746d84547ecd8f2dfba63967ec53646663a6379 /packaging | |
parent | cea50f319d51900cc555289c6f50e2f069116b2f (diff) | |
download | deluge-6971e08b0d64fcdff8557ca164322a1314833c52.tar.gz deluge-6971e08b0d64fcdff8557ca164322a1314833c52.tar.bz2 deluge-6971e08b0d64fcdff8557ca164322a1314833c52.zip |
[#2828] [Packaging] Fix ImportError with setuptools version > 18.8
Diffstat (limited to 'packaging')
-rw-r--r-- | packaging/win32/deluge-bbfreeze.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/packaging/win32/deluge-bbfreeze.py b/packaging/win32/deluge-bbfreeze.py index d3ecaa917..4807e5269 100644 --- a/packaging/win32/deluge-bbfreeze.py +++ b/packaging/win32/deluge-bbfreeze.py @@ -81,6 +81,10 @@ def recipe_gtk_override(mf): return True bbfreeze.recipes.recipe_gtk_and_friends = recipe_gtk_override +# Workaround for "ImportError: The 'packaging' package is required" with setuptools > 18.8. +# (https://github.com/pypa/setuptools/issues/517) +bbfreeze.recipes.recipe_pkg_resources = bbfreeze.recipes.include_whole_package("pkg_resources") + fzr = bbfreeze.Freezer(build_dir, includes=includes, excludes=excludes) fzr.include_py = False fzr.setIcon(os.path.join(os.path.dirname(deluge.common.__file__), "ui", "data", "pixmaps", "deluge.ico")) |