Deactivate ldap
Fix setup for pypi
This commit is contained in:
parent
8bfcdffeb6
commit
d82289e303
|
@ -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)
|
||||
}
|
||||
|
||||
|
|
|
@ -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$'
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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)
|
||||
}
|
||||
|
||||
|
|
10
setup.cfg
10
setup.cfg
|
@ -31,14 +31,13 @@ keywords =
|
|||
calibre
|
||||
calibre-web
|
||||
library
|
||||
python_requires = >=2.6
|
||||
|
||||
[options.entry_points]
|
||||
console_scripts =
|
||||
cps = calibreweb:main
|
||||
[options]
|
||||
python_requires = >=2.6
|
||||
include_package_data = True
|
||||
zip_safe = False
|
||||
install_requires =
|
||||
Babel >= 1.3
|
||||
Flask-Babel >= 0.11.1
|
||||
|
@ -80,7 +79,8 @@ metadata =
|
|||
Wand >= 0.4.4
|
||||
comics=
|
||||
natsort>=2.2.0
|
||||
# https://github.com/wildthyme/comicapi/archive/cb279168f9c5cec742b5a05ac8326b9c168a8a91.zip#egg=comicapi
|
||||
# comicapi @ git+https://github.com/wildthyme/comicapi.git@cb279168f9c5cec742b5a05ac8326b9c168a8a91#egg=comicapi
|
||||
# find solution for this
|
||||
# find solution for this should belong to comics
|
||||
# comicapi @ git+https://github.com/decentral1se/comicapi.git@packaging-fix/remove-python-requires#egg=comicapi
|
||||
|
||||
|
||||
|
||||
|
|
2
setup.py
2
setup.py
|
@ -20,6 +20,7 @@
|
|||
# """Calibre-web distribution package setuptools installer."""
|
||||
|
||||
from setuptools import setup
|
||||
from setuptools import find_packages
|
||||
import os
|
||||
import re
|
||||
import codecs
|
||||
|
@ -39,6 +40,7 @@ def find_version(*file_paths):
|
|||
raise RuntimeError("Unable to find version string.")
|
||||
|
||||
setup(
|
||||
packages=find_packages("src"),
|
||||
package_dir = {'': 'src'},
|
||||
version=find_version("src", "calibreweb", "cps", "constants.py")
|
||||
)
|
||||
|
|
Loading…
Reference in New Issue
Block a user