Commit f1d128158561419d7659c271777f22b1c674371f
1 parent
96cd17cc
setup.py: avoid installing msoffcrypto-tool if platform is PyPy+Windows (fixes #473)
Showing
2 changed files
with
4 additions
and
2 deletions
requirements.txt
| @@ -2,5 +2,5 @@ pyparsing>=2.1.0,<3 | @@ -2,5 +2,5 @@ pyparsing>=2.1.0,<3 | ||
| 2 | olefile>=0.46 | 2 | olefile>=0.46 |
| 3 | easygui | 3 | easygui |
| 4 | colorclass | 4 | colorclass |
| 5 | -msoffcrypto-tool | 5 | +msoffcrypto-tool; platform_python_implementation!="PyPy" or platform_system!="Windows" |
| 6 | pcodedmp>=1.2.5 | 6 | pcodedmp>=1.2.5 |
| 7 | \ No newline at end of file | 7 | \ No newline at end of file |
setup.py
| @@ -321,7 +321,9 @@ def main(): | @@ -321,7 +321,9 @@ def main(): | ||
| 321 | "olefile>=0.46", | 321 | "olefile>=0.46", |
| 322 | "easygui", | 322 | "easygui", |
| 323 | 'colorclass', | 323 | 'colorclass', |
| 324 | - 'msoffcrypto-tool', | 324 | + # msoffcrypto-tool is not installable on PyPy+Windows (see issue #473), |
| 325 | + # so we only require it if the platform is not Windows or not PyPy: | ||
| 326 | + 'msoffcrypto-tool; platform_python_implementation!="PyPy" or platform_system!="Windows"', | ||
| 325 | 'pcodedmp>=1.2.5', | 327 | 'pcodedmp>=1.2.5', |
| 326 | ], | 328 | ], |
| 327 | ) | 329 | ) |