tweaks for PyPI upload of 0.0.1

eddy-geek · Sep 13, 2015 · 40c5054 · 40c5054
1 parent dcd5529
commit 40c5054
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ Video &amp; subtitle cut
 
 * Global (/usr/local)
 
-        sudo pip3 install quickcut  # Hopefully soon
+        sudo pip3 install quickcut
 
 * Local
 

diff --git a/quickcut/__init__.py b/quickcut/__init__.py
@@ -17,11 +17,9 @@
 """
 
 __author__ = 'Edward Oubrayrie'
+__version__ = pkg_resources.get_distribution(Path(__file__).parent.name).version
 
-package = Path(__file__).parent.name
-__version__ = pkg_resources.get_distribution(package).version
-icon_path = pkg_resources.resource_filename('quickcut', 'quickcut.png')
-print(icon_path)
+ICON = pkg_resources.resource_filename('quickcut', 'quickcut.png')
 
 
 def packagekit_install(pack='ffmpeg'):
@@ -252,7 +250,7 @@ def main():
 
     icon = QtGui.QIcon()
     # icon.addPixmap(QtGui.QPixmap(":/icons/hicolor/128x128/apps/quickcut.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-    icon.addPixmap(QtGui.QPixmap(icon_path), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+    icon.addPixmap(QtGui.QPixmap(ICON), QtGui.QIcon.Normal, QtGui.QIcon.Off)
 
     app.setWindowIcon(icon)
 

diff --git a/quickcut/widgets.py b/quickcut/widgets.py
@@ -4,7 +4,7 @@
 from PyQt5.QtGui import QValidator
 from PyQt5.QtWidgets import QLineEdit, QPushButton, QFileDialog, QMessageBox
 
-__author__ = 'eoubrayrie'
+__author__ = 'Edward Oubrayrie'
 
 
 lastDir = os.path.expandvars('$HOME')

diff --git a/setup.py b/setup.py
@@ -32,6 +32,12 @@
 
 try:
     # noinspection PyUnresolvedReferences
+    import pathlib
+except ImportError:
+    REQUIRES.append('pathlib')
+
+try:
+    # noinspection PyUnresolvedReferences,PyPackageRequirements
     import PyQt5
 except ImportError:
     if os.name == "nt":
@@ -49,6 +55,7 @@
     url='http://github.com/eddy-geek/quickcut/',
     license='GPL',
     author='Edward Oubrayrie',
+    author_email='edoubrayrie@gmail.com',
     description='Video & subtitle cut on given time-range. ffmpeg/pysrt based.',
     long_description=long_description,
     keywords='video, subtitle, editor, avi, mp4, srt, ffmpeg, pysrt',
@@ -80,7 +87,7 @@
         'Intended Audience :: Education',
         'Intended Audience :: End Users/Desktop',
         'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
-        'Operating System :: POSIX'
+        'Operating System :: POSIX',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',