1
0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-24 18:47:23 +00:00
Commit Graph

14 Commits

Author SHA1 Message Date
OzzieIsaacs
0e0e72fb71 Fixes for gevent/gdrive 2017-03-19 17:14:16 +01:00
Jack Darlington
4efea9546a Update to pip 2017-03-07 22:51:02 +00:00
Jack Darlington
cf1ca21bbc Merge branch 'master' into develop
# Conflicts:
#	cps/db.py
#	cps/ub.py
#	cps/web.py
#	readme.md
#	requirements.txt
2017-03-07 22:03:10 +00:00
OzzieIsaacs
80f1276624 Merge remote-tracking branch 'gitignore/fix/syntax-python3-20170305'
# Conflicts:
#	cps/db.py
#	cps/web.py
#	requirements.txt
2017-03-07 20:22:28 +01:00
OzzieIsaacs
6feb1f8894 Downgraded required tornado version to 4.1 2017-03-07 19:50:03 +01:00
OzzieIsaacs
acac0570e5 Merge remote-tracking branch 'use_pip/use-pip'
# Conflicts:
#	cps.py
#	readme.md
#	vendor/wand/api.py
#	vendor/wand/drawing.py
#	vendor/wand/exceptions.py
#	vendor/wand/image.py
#	vendor/wand/version.py
2017-03-07 19:46:23 +01:00
林檎
197f396e16 validate need include in vendor
PyPi version doesn’t support Python3
2017-03-06 14:35:28 +08:00
林檎
547f3c3456 double requirement fix 2017-03-06 14:31:13 +08:00
林檎
d45ecfafcc Missing site for File validate module 2017-03-05 23:15:43 +08:00
林檎
80bcf131ee add requirement.txt 2017-03-05 22:53:59 +08:00
林檎
b70191ca2a Least change to adapt with python3
change some syntax
- except clause
- unicode -> bulitins.str
- sqllite uri
- fix import local path
- 01 to 1  (0 is meaningless)

add module
- future
- builtins (from future)
- imp (python3 )
- past (from future)
- sqlalchemy (update one)

refer to
http://python-future.org/compatible_idioms.html
2017-03-05 17:40:39 +08:00
Jack Darlington
78abf81b2f Fix for editing metadata and uploading for GDrive 2017-03-01 22:38:03 +00:00
Akhyar Amarullah
98041c6710
Trim down requirements.txt 2017-01-07 21:28:09 +07:00
Akhyar Amarullah
6698952ed0
Add requirements.txt 2017-01-07 20:33:07 +07:00