Merge pull request #2583 from alex/extras-bcrypt

Include an 'extra_requires' for bcrypt

2 files changed, 6 insertions, 3 deletions

diff --git a/docs/topics/auth/passwords.txt b/docs/topics/auth/passwords.txt
index 7ddbc63b9a..df070706f4 100644
--- a/docs/topics/auth/passwords.txt
+++ b/docs/topics/auth/passwords.txt
@@ -76,9 +76,9 @@ use it Django supports bcrypt with minimal effort.
 
 To use Bcrypt as your default storage algorithm, do the following:
 
-1. Install the `bcrypt library`_ (probably by running ``sudo pip install
-   bcrypt``, or downloading the library and installing it with ``python
-   setup.py install``).
+1. Install the `bcrypt library`_. This can be done by running ``pip install
+   django[bcrypt]``, or by downloading the library and installing it with
+   ``python setup.py install``.
 
 2. Modify :setting:`PASSWORD_HASHERS` to list ``BCryptSHA256PasswordHasher``
    first. That is, in your settings file, you'd put::
diff --git a/setup.py b/setup.py
index 85e154907c..83fd792ffa 100644
--- a/setup.py
+++ b/setup.py
@@ -47,6 +47,9 @@ setup(
     entry_points={'console_scripts': [
         'django-admin = django.core.management:execute_from_command_line',
     ]},
+    extras_require={
+        "bcrypt": ["bcrypt"],
+    },
     zip_safe=False,
     classifiers=[
         'Development Status :: 3 - Alpha',