Deactivate ldap
Fix setup for pypi
This commit is contained in:
+1
-1
@@ -49,7 +49,7 @@ from .gdriveutils import is_gdrive_ready, gdrive_support
|
||||
from .web import admin_required, render_title_template, before_request, unconfigured, login_required_if_no_ano
|
||||
|
||||
feature_support = {
|
||||
'ldap': bool(services.ldap),
|
||||
'ldap': False, # bool(services.ldap),
|
||||
'goodreads': bool(services.goodreads)
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -125,7 +125,7 @@ def selected_roles(dictionary):
|
||||
BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
|
||||
'series_id, languages')
|
||||
|
||||
STABLE_VERSION = {'version': '0.6.4 Beta'}
|
||||
STABLE_VERSION = {'version': '0.6.5 Beta'}
|
||||
|
||||
NIGHTLY_VERSION = {}
|
||||
NIGHTLY_VERSION[0] = '$Format:%H$'
|
||||
|
||||
+3
-5
@@ -34,11 +34,9 @@ try:
|
||||
from pydrive.drive import GoogleDrive
|
||||
from pydrive.auth import RefreshError
|
||||
from apiclient import errors
|
||||
feature_support['gdrive'] = True
|
||||
# gdrive_support = True
|
||||
gdrive_support = True
|
||||
except ImportError:
|
||||
feature_support['gdrive'] = True
|
||||
#gdrive_support = False
|
||||
gdrive_support = False
|
||||
|
||||
from . import logger, cli, config
|
||||
from .constants import CONFIG_DIR as _CONFIG_DIR
|
||||
@@ -576,7 +574,7 @@ def update_settings(client_id, client_secret, redirect_uri):
|
||||
|
||||
|
||||
def get_error_text(client_secrets=None):
|
||||
if not feature_support['gdrive']:
|
||||
if not gdrive_support:
|
||||
return 'Import of optional Google Drive requirements missing'
|
||||
|
||||
if not os.path.isfile(CLIENT_SECRETS):
|
||||
|
||||
+1
-1
@@ -52,7 +52,7 @@ from .pagination import Pagination
|
||||
from .redirect import redirect_back
|
||||
|
||||
feature_support = {
|
||||
'ldap': bool(services.ldap),
|
||||
'ldap': False, # bool(services.ldap),
|
||||
'goodreads': bool(services.goodreads)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user