From f5b335e8e9c9befb139a6a4e7e07762eb0b8894a Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Sat, 1 Jun 2019 09:51:20 +0200 Subject: [PATCH] Update setup --- .gitignore | 2 ++ MANIFEST.in | 4 +--- readme.md => README.md | 4 ++-- __init__.py | 0 cps.py | 6 +++--- setup.cfg | 23 ++++++++++++++++------- 6 files changed, 24 insertions(+), 15 deletions(-) rename readme.md => README.md (96%) create mode 100644 __init__.py diff --git a/.gitignore b/.gitignore index 09bf3faa..981158fe 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,8 @@ __pycache__/ .Python env/ eggs/ +dist/ +build/ .eggs/ *.egg-info/ .installed.cfg diff --git a/MANIFEST.in b/MANIFEST.in index f4dcc845..d5f7c071 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1 @@ -include cps/static/* -include cps/templates/* -include cps/translations/* +graft src/cps diff --git a/readme.md b/README.md similarity index 96% rename from readme.md rename to README.md index 0f60be4b..d3f112d6 100644 --- a/readme.md +++ b/README.md @@ -4,7 +4,7 @@ Calibre-Web is a web app providing a clean interface for browsing, reading and d *This software is a fork of [library](https://github.com/mutschler/calibreserver) and licensed under the GPL v3 License.* -![Main screen](../../wiki/images/main_screen.png) +![Main screen](https://github.com/janeczku/calibre-web/wiki/images/main_screen.png) ## Features @@ -73,4 +73,4 @@ Pre-built Docker images based on Alpine Linux are available in these Docker Hub # Wiki -For further informations, How To's and FAQ please check the ![Wiki](../../wiki) +For further informations, How To's and FAQ please check the ![Wiki](https://github.com/janeczku/calibre-web/wiki) diff --git a/__init__.py b/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/cps.py b/cps.py index c36ed0fc..184bee0a 100755 --- a/cps.py +++ b/cps.py @@ -43,7 +43,7 @@ except ImportError: oauth_available = False -if __name__ == '__main__': +def main(): app = create_app() app.register_blueprint(web) app.register_blueprint(opds) @@ -58,5 +58,5 @@ if __name__ == '__main__': Server.startServer() - - +if __name__ == '__main__': + main() diff --git a/setup.cfg b/setup.cfg index 334f7338..7975d6ed 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,7 +3,7 @@ universal = 1 [metadata] name = calibre-web -version="0.6.3" +version= 0.6.4 Beta url = https://github.com/janeczku/calibre-web project_urls = Bug Tracker = https://github.com/janeczku/calibre-web/issues @@ -11,8 +11,10 @@ project_urls = Documentation = https://github.com/janeczku/calibre-web/wiki Source Code = https://github.com/janeczku/calibre-web description = Web app for browsing, reading and downloading eBooks stored in a Calibre database. -long_description = file: readme.md -author = @janeczku +long_description = file: README.md +long_description_content_type= text/markdown +author = @OzzieIsaacs +author_email = Ozzie.Fernandez.Isaacs@googlemail.com maintainer = @OzzieIsaacs license = GPLv3+ license_file = LICENSE @@ -25,14 +27,21 @@ classifiers = Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 + Operating System :: OS Independent keywords = calibre calibre-web library +[entry_points] +console_scripts = + calibre-web=src.cps:main + [options] python_requires = >=2.6 -packages = find: +package_dir= + =src +packages = cps include_package_data = True zip_safe = False install_requires = @@ -76,7 +85,7 @@ metadata = Wand >= 0.4.4 comics= natsort>=2.2.0 - comicapi @ git+https://github.com/wildthyme/comicapi.git@cb279168f9c5cec742b5a05ac8326b9c168a8a91#egg=comicapi + # https://github.com/wildthyme/comicapi/archive/cb279168f9c5cec742b5a05ac8326b9c168a8a91.zip#egg=comicapi + # find solution for this + -[options.packages.find] -where = .