Merge pull request #174 from James1345/develop

Develop
jazzband · Mar 27, 2019 · 3bb72cb · 3bb72cb
2 parents 828c709 + efa7911
commit 3bb72cb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/setup.py b/setup.py
@@ -67,7 +67,7 @@
     # your project is installed. For an analysis of "install_requires" vs pip's
     # requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
-    install_requires=['django', 'djangorestframework', 'pyOpenSSL'],
+    install_requires=['django', 'djangorestframework', 'cryptography'],
 
     # List additional groups of dependencies here (e.g. development
     # dependencies). You can install these using the following syntax,

diff --git a/tox.ini b/tox.ini
@@ -37,7 +37,7 @@ deps =
     djangorestframework
     freezegun
     mkdocs
-    pyOpenSSL
+    cryptography
     pytest-django
     setuptools
     twine