Skip to content
This repository has been archived by the owner on Feb 24, 2020. It is now read-only.

Commit

Permalink
Fix tox.ini deprecated arguments and setup.py pycrypto dep
Browse files Browse the repository at this point in the history
In tox.ini, pip used deprecated arguments,
see https://pip.pypa.io/en/stable/news/#b1-2018-03-31

In setup.py, non-PyPy installations did not require pycrypto,
but the import of Crypto.* fails if pycrypto is not installed.
  • Loading branch information
bitkeks committed May 26, 2018
1 parent 7c66c0d commit 3f028c9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -25,7 +25,7 @@
if platform.python_implementation() == 'PyPy':
requirements += ['pycrypto']
else:
requirements += ['cryptography>=1.1']
requirements += ['cryptography>=1.1', 'pycrypto']


class CustomInstallCommand(install):
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Expand Up @@ -2,7 +2,7 @@
envlist = py27,py35,py36

[testenv]
install_command = pip install --process-dependency-links --allow-external --allow-unverified {opts} {packages}
install_command = pip install --process-dependency-links {opts} {packages}
commands =
coverage run --source profanity_omemo_plugin,prof_omemo_plugin setup.py test
coverage report -m
Expand All @@ -11,4 +11,4 @@ deps =
pytest-cov
pytest
mock
coverage
coverage

0 comments on commit 3f028c9

Please sign in to comment.