From 5f26e2d07151f179c77ae5ab4044a60a215abf17 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Jul 31 2018 12:57:58 +0000
Subject: packaging: bcrypt and cryptography are not optional


Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>

---

diff --git a/files/pagure.spec b/files/pagure.spec
index ac4f617..a5e96bb 100644
--- a/files/pagure.spec
+++ b/files/pagure.spec
@@ -23,10 +23,6 @@ BuildRequires:      python%{python_pkgversion}-devel
 BuildRequires:      python%{python_pkgversion}-setuptools
 
 %if 0%{?rhel} && 0%{?rhel} <= 7
-# Needed only for local authentication and/or Pagure CI
-Requires:           python%{python_pkgversion}-cryptography
-# Required only for the `local` authentication backend
-Requires:           python%{python_pkgversion}-bcrypt
 # Required only for the `fas` and `openid` authentication backends
 Requires:           python%{python_pkgversion}-fedora
 # Required only for the `oidc` authentication backend
@@ -34,19 +30,19 @@ Requires:           python%{python_pkgversion}-fedora
 # Required only if `USE_FLASK_SESSION_EXT` is set to `True`
 # flask-session
 %else
-Recommends:         python%{python_pkgversion}-cryptography
-Recommends:         python%{python_pkgversion}-bcrypt
 Recommends:         python%{python_pkgversion}-fedora
 %endif
 
 %if %{undefined python_enable_dependency_generator}
 Requires:           python%{python_pkgversion}-alembic
 Requires:           python%{python_pkgversion}-arrow
+Requires:           python%{python_pkgversion}-bcrypt
 Requires:           python%{python_pkgversion}-binaryornot
 Requires:           python%{python_pkgversion}-bleach
 Requires:           python%{python_pkgversion}-blinker
 Requires:           python%{python_pkgversion}-celery
 Requires:           python%{python_pkgversion}-chardet
+Requires:           python%{python_pkgversion}-cryptography
 Requires:           python%{python_pkgversion}-docutils
 Requires:           python%{python_pkgversion}-enum34
 Requires:           python%{python_pkgversion}-flask
diff --git a/requirements.txt b/requirements.txt
index 8e434ca..87fc751 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,11 +2,13 @@
 # Use this file by running "$ pip install -r requirements.txt"
 alembic
 arrow
+bcrypt
 binaryornot
 bleach
 blinker
 celery
 chardet
+cryptography
 docutils
 enum34
 flask<1.0
@@ -31,9 +33,6 @@ sqlalchemy >= 0.8
 straight.plugin
 wtforms
 
-# Needed only for local authentication and/or Pagure CI
-# cryptography
-
 # Required only for the `oidc` authentication backend
 # flask-oidc
 
@@ -42,7 +41,3 @@ wtforms
 
 # Required only for the `fas` and `openid` authentication backends
 # python-fedora
-
-# Required only for the `local` authentication backend
-# bcrypt
-