diff options
| author | Paweł Jastrzębski <pawelj@iosphe.re> | 2018-03-10 08:36:34 +0100 |
|---|---|---|
| committer | Paweł Jastrzębski <pawelj@iosphe.re> | 2018-03-10 08:41:12 +0100 |
| commit | 968b083fb20fa06f118ad94d92fd39c124851eb8 (patch) | |
| tree | 4161504c0ef5c977a0764281cc7102a51307597d | |
| parent | Merge branch 'master' of https://github.com/ciromattia/kcc (diff) | |
| download | kcc-968b083fb20fa06f118ad94d92fd39c124851eb8.tar.gz kcc-968b083fb20fa06f118ad94d92fd39c124851eb8.tar.bz2 kcc-968b083fb20fa06f118ad94d92fd39c124851eb8.zip | |
Updated build enviroment
| -rw-r--r-- | .travis.yml | 29 | ||||
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | kcc.iss | 2 | ||||
| -rw-r--r-- | kindlecomicconverter/__init__.py | 2 | ||||
| -rw-r--r-- | kindlecomicconverter/cbxarchive.py | 2 | ||||
| -rwxr-xr-x | kindlecomicconverter/image.py | 2 | ||||
| -rw-r--r-- | kindlecomicconverter/pdfjpgextract.py | 2 | ||||
| -rw-r--r-- | kindlecomicconverter/shared.py | 2 | ||||
| -rw-r--r-- | other/osx/Info.plist | 6 | ||||
| -rwxr-xr-x | setup.py | 3 |
11 files changed, 29 insertions, 26 deletions
diff --git a/.travis.yml b/.travis.yml index aacaa77..977b0df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,31 +1,22 @@ matrix: include: - - os: linux - language: python - python: 3.6 - dist: trusty - sudo: required - os: osx language: generic osx_image: xcode6.4 before_install: -- if [ "$TRAVIS_OS_NAME" == "linux" ] ; then sudo apt-get -y install ruby ruby-dev ; fi -- if [ "$TRAVIS_OS_NAME" == "linux" ] ; then pip install --upgrade pip setuptools wheel ; fi -- if [ "$TRAVIS_OS_NAME" == "linux" ] ; then openssl aes-256-cbc -K $encrypted_a95564d8ff0d_key -iv $encrypted_a95564d8ff0d_iv -in other/linux/sentry.py.enc -out kindlecomicconverter/sentry.py -d ; fi -- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then brew update ; fi -- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then brew install python3 ; fi -- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then travis_wait 30 brew upgrade node ; fi -- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then pip3 install --upgrade pip setuptools wheel ; fi -- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then openssl aes-256-cbc -K $encrypted_a95564d8ff0d_key -iv $encrypted_a95564d8ff0d_iv -in other/osx/sentry.py.enc -out kindlecomicconverter/sentry.py -d ; fi +- brew update +- brew install python3 +- brew uninstall node +- travis_wait 30 brew install node@6 +- brew link node@6 --force --overwrite +- pip3 install --upgrade pip setuptools wheel +- openssl aes-256-cbc -K $encrypted_a95564d8ff0d_key -iv $encrypted_a95564d8ff0d_iv -in other/osx/sentry.py.enc -out kindlecomicconverter/sentry.py -d install: -- if [ "$TRAVIS_OS_NAME" == "linux" ] ; then pip install -r requirements.txt ; fi -- if [ "$TRAVIS_OS_NAME" == "linux" ] ; then pip install certifi PyInstaller ; fi -- if [ "$TRAVIS_OS_NAME" == "linux" ] ; then gem install fpm ; fi -- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then pip3 install -r requirements.txt ; fi -- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then pip3 install certifi PyInstaller ; fi -- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then npm install -g appdmg ; fi +- pip3 install -r requirements.txt +- pip3 install certifi https://github.com/bjones1/pyinstaller/archive/pyqt5_fix.zip +- npm install -g appdmg script: python3 setup.py build_binary diff --git a/CHANGELOG.md b/CHANGELOG.md index e1b992d..0ce0bfe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ # CHANGELOG +#### 5.4.5: +* Fixed EPUB output for non-Kindle devices + #### 5.4.4: * Minor bug fixes diff --git a/appveyor.yml b/appveyor.yml index 44cd72b..2eb446c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,7 +5,7 @@ install: - set PATH="%PYTHON%\\Scripts";"C:\\Program Files (x86)\\Inno Setup 5";%PATH% - "%PYTHON%\\python.exe -m pip install --upgrade pip setuptools wheel" - "%PYTHON%\\python.exe -m pip install -r requirements.txt" - - "%PYTHON%\\python.exe -m pip install certifi PyInstaller" + - "%PYTHON%\\python.exe -m pip install certifi https://github.com/bjones1/pyinstaller/archive/pyqt5_fix.zip" - nuget install secure-file -ExcludeVersion - secure-file\tools\secure-file -decrypt other\windows\sentry.py.enc -out kindlecomicconverter\sentry.py -secret %ENCRYPTION% diff --git a/kcc.iss b/kcc.iss index 40eca0d..28a8d41 100644 --- a/kcc.iss +++ b/kcc.iss @@ -1,5 +1,5 @@ #define MyAppName "Kindle Comic Converter" -#define MyAppVersion "5.4.4" +#define MyAppVersion "5.4.5" #define MyAppPublisher "Ciro Mattia Gonano, Paweł Jastrzębski" #define MyAppURL "http://kcc.iosphe.re/" #define MyAppExeName "KCC.exe" diff --git a/kindlecomicconverter/__init__.py b/kindlecomicconverter/__init__.py index 8cb3bad..2ccec97 100644 --- a/kindlecomicconverter/__init__.py +++ b/kindlecomicconverter/__init__.py @@ -1,4 +1,4 @@ -__version__ = '5.4.4' +__version__ = '5.4.5' __license__ = 'ISC' __copyright__ = '2012-2018, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>' __docformat__ = 'restructuredtext en' diff --git a/kindlecomicconverter/cbxarchive.py b/kindlecomicconverter/cbxarchive.py index 40ce928..94545ae 100644 --- a/kindlecomicconverter/cbxarchive.py +++ b/kindlecomicconverter/cbxarchive.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- +# # Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com> # Copyright (c) 2013-2018 Pawel Jastrzebski <pawelj@iosphe.re> # diff --git a/kindlecomicconverter/image.py b/kindlecomicconverter/image.py index d7c05ec..5f195a5 100755 --- a/kindlecomicconverter/image.py +++ b/kindlecomicconverter/image.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- +# # Copyright (C) 2010 Alex Yatskov # Copyright (C) 2011 Stanislav (proDOOMman) Kosolapov <prodoomman@gmail.com> # Copyright (c) 2016 Alberto Planas <aplanas@gmail.com> diff --git a/kindlecomicconverter/pdfjpgextract.py b/kindlecomicconverter/pdfjpgextract.py index 250cf35..258b1b4 100644 --- a/kindlecomicconverter/pdfjpgextract.py +++ b/kindlecomicconverter/pdfjpgextract.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- +# # Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com> # Copyright (c) 2013-2018 Pawel Jastrzebski <pawelj@iosphe.re> # diff --git a/kindlecomicconverter/shared.py b/kindlecomicconverter/shared.py index 6778621..56f07d6 100644 --- a/kindlecomicconverter/shared.py +++ b/kindlecomicconverter/shared.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- +# # Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com> # Copyright (c) 2013-2018 Pawel Jastrzebski <pawelj@iosphe.re> # diff --git a/other/osx/Info.plist b/other/osx/Info.plist index 9ae04ea..4a9fa48 100644 --- a/other/osx/Info.plist +++ b/other/osx/Info.plist @@ -30,7 +30,7 @@ <key>CFBundleExecutable</key> <string>MacOS/Kindle Comic Converter</string> <key>CFBundleGetInfoString</key> - <string>KindleComicConverter 5.4.4, written 2012-2018 by Ciro Mattia Gonano and Pawel Jastrzebski</string> + <string>KindleComicConverter 5.4.5, written 2012-2018 by Ciro Mattia Gonano and Pawel Jastrzebski</string> <key>CFBundleIconFile</key> <string>comic2ebook.icns</string> <key>CFBundleIdentifier</key> @@ -42,11 +42,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>5.4.4</string> + <string>5.4.5</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>5.4.4</string> + <string>5.4.5</string> <key>LSEnvironment</key> <dict> <key>PATH</key> diff --git a/setup.py b/setup.py index 5028704..f7d71e0 100755 --- a/setup.py +++ b/setup.py @@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# -*- coding: utf-8 -*- """ pip/pyinstaller build script for KCC. @@ -59,7 +60,7 @@ class BuildBinaryCommand(distutils.cmd.Command): os.system('cp other/linux/kindlecomicconverter dist/usr/share/lintian/overrides') os.chdir('dist') os.system('fpm -f -s dir -t deb -n kindlecomicconverter -v ' + VERSION + - ' -m "Paweł Jastrzębski <pawelj@iosphe.re>" --license "ISC" ' + ' -m "Pawel Jastrzebski <pawelj@iosphe.re>" --license "ISC" ' '--description "$(printf "Comic and Manga converter for e-book ' 'readers.\nThis app allows you to transform your PNG, JPG, GIF, ' 'CBZ, CBR and CB7 files\ninto EPUB or MOBI format e-books.")" ' |