Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Require py3 for msoffcrypto #795

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Require py3 for msoffcrypto #795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
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 (python_version>="3" and platform_system!="Windows" and platform_system!="Darwin")
msoffcrypto-tool; python_version>="3" and (platform_python_implementation!="PyPy" or platform_system!="Windows" and platform_system!="Darwin")
pcodedmp>=1.2.5
6 changes: 4 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,8 +325,10 @@ def main():
"easygui",
'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 (python_version>="3" and platform_system!="Windows" and platform_system!="Darwin")',
# so we only require it if the platform is not Windows or not PyPy;
# Also, usage of cryptography (used by msoffcrypt-tool) is deprecated for py2
'msoffcrypto-tool; (python_version>="3" and platform_python_implementation!="PyPy") \
or (python_version>="3" and platform_system!="Windows" and platform_system!="Darwin")',
'pcodedmp>=1.2.5',
],
extras_require={
Expand Down