Skip to content

Commit

Permalink
setup.py: avoid installing msoffcrypto-tool if platform is PyPy excep…
Browse files Browse the repository at this point in the history
…t PyPy3 on Linux (fixes #473)
  • Loading branch information
decalage2 committed Mar 6, 2021
1 parent fc660e7 commit 6f8d1cd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ pyparsing>=2.1.0,<3
olefile>=0.46
easygui
colorclass
msoffcrypto-tool; platform_python_implementation!="PyPy" or platform_system!="Windows"
msoffcrypto-tool; platform_python_implementation!="PyPy" or (python_version>="3" and platform_system!="Windows" and platform_system!="Darwin")
pcodedmp>=1.2.5
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ def main():
'colorclass',
# msoffcrypto-tool is not installable on PyPy+Windows (see issue #473),
# so we only require it if the platform is not Windows or not PyPy:
'msoffcrypto-tool; platform_python_implementation!="PyPy" or platform_system!="Windows"',
'msoffcrypto-tool; platform_python_implementation!="PyPy" or (python_version>="3" and platform_system!="Windows" and platform_system!="Darwin")',
'pcodedmp>=1.2.5',
],
)
Expand Down

0 comments on commit 6f8d1cd

Please sign in to comment.