Commit 6f8d1cdcd1a2cdf1e03482987bccc7d27121b4ce
1 parent
fc660e7e
setup.py: avoid installing msoffcrypto-tool if platform is PyPy except PyPy3 on Linux (fixes #473)
Showing
2 changed files
with
2 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; platform_python_implementation!="PyPy" or platform_system!="Windows" | 5 | +msoffcrypto-tool; platform_python_implementation!="PyPy" or (python_version>="3" and platform_system!="Windows" and platform_system!="Darwin") |
| 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
| @@ -323,7 +323,7 @@ def main(): | @@ -323,7 +323,7 @@ def main(): | ||
| 323 | 'colorclass', | 323 | 'colorclass', |
| 324 | # msoffcrypto-tool is not installable on PyPy+Windows (see issue #473), | 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: | 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"', | 326 | + 'msoffcrypto-tool; platform_python_implementation!="PyPy" or (python_version>="3" and platform_system!="Windows" and platform_system!="Darwin")', |
| 327 | 'pcodedmp>=1.2.5', | 327 | 'pcodedmp>=1.2.5', |
| 328 | ], | 328 | ], |
| 329 | ) | 329 | ) |