Updated build enviroment

.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
 

CHANGELOG.md

@@ -1,4 +1,7 @@
 # CHANGELOG
+#### 5.4.5:
+* Fixed EPUB output for non-Kindle devices
+
 #### 5.4.4:
 * Minor bug fixes
 

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%
 

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"

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'

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>
 #

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>

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>
 #

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>
 #

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>

setup.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# -*- coding: utf-8 -*-
 """
 pip/pyinstaller build script for KCC.
 
@@ -59,7 +60,7 @@ def run(self):
             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.")" '