Skip to content

Commit

Permalink
Require py3 for msoffcrypto
Browse files Browse the repository at this point in the history
Quoting the deprecation warning for encryption, which is needed for
msoffcrypto:

Python 2 is no longer supported by the Python core team. Support for it is
now deprecated in cryptography, and will be removed in the next release.
  • Loading branch information
christian-intra2net committed Nov 28, 2022
1 parent a4f2d82 commit 0b4a8cc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 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 (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
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

0 comments on commit 0b4a8cc

Please sign in to comment.