diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | docker/Dockerfile | 7 | ||||
| -rwxr-xr-x | setup.py | 44 |
3 files changed, 17 insertions, 35 deletions
diff --git a/.gitignore b/.gitignore index 9e0e197..d4fbd53 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ setup.sh kindlecomicconverter/sentry.py build/ .python-version +KindleComicConverter.egg-info/ diff --git a/docker/Dockerfile b/docker/Dockerfile index 784bfac..89dd7e3 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,14 +1,11 @@ # acidweb/kcc -FROM debian:jessie +FROM debian:stretch MAINTAINER Paweł Jastrzębski <pawelj@iosphe.re> ADD ./Build /Build -RUN printf "deb http://httpredir.debian.org/debian stretch main" > /etc/apt/sources.list.d/stretch.list -RUN printf "Package: *\nPin: release a=testing\nPin-Priority: 400\n" > /etc/apt/preferences.d/stretch.pref RUN apt-get update && apt-get -y dist-upgrade -RUN apt-get -y install build-essential curl ruby ruby-dev libpng-dev libjpeg-dev -RUN apt-get -y -t testing install python3 python3-dev python3-pyqt5 +RUN apt-get -y install build-essential curl ruby ruby-dev libpng-dev libjpeg-dev python3 python3-dev python3-pyqt5 RUN curl https://bootstrap.pypa.io/get-pip.py | python3 RUN apt-get clean -y && apt-get autoclean -y && apt-get autoremove -y && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/setup.py b/setup.py index d1d4808..cdd19eb 100755 --- a/setup.py +++ b/setup.py @@ -20,8 +20,6 @@ from kindlecomicconverter import __version__ NAME = 'KindleComicConverter' MAIN = 'kcc.py' VERSION = __version__ -OPTIONS = {} - class BuildBinaryCommand(distutils.cmd.Command): description = 'build binary release' @@ -99,35 +97,9 @@ class BuildBinaryCommand(distutils.cmd.Command): os.system('docker run --rm -v ' + os.getcwd() + ':/app -e KCCVER=' + VERSION + ' acidweb/kcc') exit(0) - -class BuildCommand(build): - def run(self): - os.makedirs('build/_scripts/', exist_ok=True) - shutil.copyfile('kcc.py', 'build/_scripts/kcc') - shutil.copyfile('kcc-c2e.py', 'build/_scripts/kcc-c2e') - shutil.copyfile('kcc-c2p.py', 'build/_scripts/kcc-c2p') - # noinspection PyUnusedLocal,PyShadowingNames - OPTIONS = dict( - scripts=['build/_scripts/kcc', - 'build/_scripts/kcc-c2e', - 'build/_scripts/kcc-c2p'], - packages=['kcc'], - install_requires=[ - 'PyQt5>=5.6.0' - 'Pillow>=4.0.0', - 'psutil>=5.0.0', - 'python-slugify>=1.2.1', - 'raven>=6.0.0', - ], - zip_safe=False, - ) - build.run(self) - - setuptools.setup( cmdclass={ 'build_binary': BuildBinaryCommand, - 'build': BuildCommand, }, name=NAME, version=VERSION, @@ -135,7 +107,19 @@ setuptools.setup( author_email='ciromattia@gmail.com, pawelj@iosphe.re', description='Comic and Manga converter for e-book readers.', license='ISC License (ISCL)', - keywords='kindle comic mobipocket mobi cbz cbr manga', + keywords=['kindle', 'kobo', 'comic', 'manga', 'mobi', 'epub', 'cbz'], url='http://github.com/ciromattia/kcc', - **OPTIONS + scripts=['kcc.py', + 'kcc-c2e.py', + 'kcc-c2p.py'], + packages=['kindlecomicconverter'], + install_requires=[ + 'PyQt5>=5.6.0' + 'Pillow>=4.0.0', + 'psutil>=5.0.0', + 'python-slugify>=1.2.1', + 'raven>=6.0.0', + ], + classifiers = [], + zip_safe=False, ) |