From d82289e3039f1b2477545ea7d622848f6f7ec592 Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Sun, 14 Jul 2019 18:37:44 +0200 Subject: [PATCH] Deactivate ldap Fix setup for pypi --- cps/admin.py | 2 +- cps/constants.py | 2 +- cps/gdriveutils.py | 8 +++----- cps/web.py | 2 +- setup.cfg | 10 +++++----- setup.py | 2 ++ 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cps/admin.py b/cps/admin.py index 69aee9d5..c7645da0 100644 --- a/cps/admin.py +++ b/cps/admin.py @@ -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) } diff --git a/cps/constants.py b/cps/constants.py index b5fa8ba2..79f01c6f 100644 --- a/cps/constants.py +++ b/cps/constants.py @@ -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$' diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py index 6b25959e..4ebbb0c7 100644 --- a/cps/gdriveutils.py +++ b/cps/gdriveutils.py @@ -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): diff --git a/cps/web.py b/cps/web.py index d35c2d28..e169c6af 100644 --- a/cps/web.py +++ b/cps/web.py @@ -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) } diff --git a/setup.cfg b/setup.cfg index a07ce469..b8c65581 100644 --- a/setup.cfg +++ b/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 + + diff --git a/setup.py b/setup.py index 05dd947c..6bde2211 100644 --- a/setup.py +++ b/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") )