Fix issues with Python package

safeeyes/BreakScreen.py

@@ -16,11 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import gi
-import signal
-import sys
-import threading
-import logging
+import gi, signal, sys, threading, logging
 from Xlib import Xatom, Xutil
 from Xlib.display import Display, X
 gi.require_version('Gtk', '3.0')

safeeyes/Notification.py

@@ -19,7 +19,7 @@
 import gi, logging
 gi.require_version('Notify', '0.7')
 from gi.repository import Notify
-import Utility
+from safeeyes import Utility
 
 
 APPINDICATOR_ID = 'safeeyes'

safeeyes/SafeEyesCore.py

@@ -17,7 +17,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-import time, datetime, threading, sys, subprocess, logging, Utility
+import time, datetime, threading, sys, subprocess, logging
+from safeeyes import Utility
 
 
 """

safeeyes/SettingsDialog.py

@@ -19,7 +19,7 @@
 import gi
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk, Gdk, GdkX11, GObject
-import Utility
+from safeeyes import Utility
 
 class SettingsDialog:
 	"""

safeeyes/TrayIcon.py

@@ -16,11 +16,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import gi, logging, threading, datetime, Utility
+import gi, logging, threading, datetime
 gi.require_version('Gtk', '3.0')
 gi.require_version('AppIndicator3', '0.1')
 from gi.repository import Gtk
 from gi.repository import AppIndicator3 as appindicator
+from safeeyes import Utility
 
 # Global variables
 APPINDICATOR_ID = 'safeeyes'

safeeyes/__main__.py

@@ -18,18 +18,18 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import os, gi, json, shutil, dbus, logging, operator, Utility
-import psutil, sys
+import os, gi, json, shutil, dbus, logging, operator, psutil, sys
 from threading import Timer
 from dbus.mainloop.glib import DBusGMainLoop
-from BreakScreen import BreakScreen
-from TrayIcon import TrayIcon
-from SettingsDialog import SettingsDialog
-from AboutDialog import AboutDialog
-from SafeEyesCore import SafeEyesCore
-from Notification import Notification
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
+from safeeyes.AboutDialog import AboutDialog
+from safeeyes.BreakScreen import BreakScreen
+from safeeyes.Notification import Notification
+from safeeyes.SafeEyesCore import SafeEyesCore
+from safeeyes.SettingsDialog import SettingsDialog
+from safeeyes.TrayIcon import TrayIcon
+from safeeyes import Utility
 
 # Define necessary paths
 config_file_path = os.path.join(Utility.home_directory, '.config/safeeyes/safeeyes.json')

setup.py

@@ -19,11 +19,11 @@ def _data_files(path):
     for root, dirs, files in os.walk(path):
         if not files:
             continue
-        yield (root, [os.path.join(root, f) for f in files])
+        yield (os.path.join('/usr', root), [os.path.join(root, f) for f in files])
 
 setuptools.setup(
     name="safeeyes",
-    version="1.1.9",
+    version="1.2.0",
     description="Protect your eyes from eye strain using this continuous breaks reminder.",
     long_description=long_description,
     author="Gobinath Loganathan",
@@ -39,7 +39,7 @@ setuptools.setup(
     data_files=list(_data_files(
             os.path.join(os.path.dirname(__file__), 'share'))),
     install_requires=requires,
-    entry_points={'console_scripts': ['safeeyes = safeeyes.safeeyes:main']},
+    entry_points={'console_scripts': ['safeeyes = safeeyes.__main__:main']},
     keywords='linux utility health eye-strain safe-eyes',
     classifiers=[
         "Operating System :: POSIX :: Linux",
@@ -49,6 +49,6 @@ setuptools.setup(
         "Intended Audience :: End Users/Desktop",
         "Topic :: Utilities"] + [
         ('Programming Language :: Python :: %s' % x) for x in
-        '2 2.7'.split()
+        '3 3.4'.split()
     ]
 )