From 3188820bc6b86f79f9d413d701acf3c7ba8c5228 Mon Sep 17 00:00:00 2001 From: Vinicius Moreira Date: Fri, 14 Jun 2019 14:02:44 -0300 Subject: [PATCH] setup.py --- {view => fpakman}/__init__.py | 0 app.py => fpakman/app.py | 9 ++-- {core => fpakman/core}/__init__.py | 0 {core => fpakman/core}/controller.py | 2 +- {core => fpakman/core}/flatpak.py | 2 +- {core => fpakman/core}/model.py | 2 +- {core => fpakman/core}/resource.py | 0 {core => fpakman/core}/system.py | 0 {core => fpakman/core}/util.py | 2 +- .../resources}/img/flathub_10.svg | 0 .../resources}/img/flathub_45.svg | 0 .../resources}/img/refresh.svg | 0 .../resources}/img/toggle_off.svg | 0 .../resources}/img/toggle_on.svg | 0 .../resources}/img/update.svg | 0 .../resources}/img/update_green.svg | 0 .../resources}/img/update_logo.svg | 0 {resources => fpakman/resources}/locale/en | 0 {resources => fpakman/resources}/locale/es | 0 {resources => fpakman/resources}/locale/pt | 0 {view/qt => fpakman/view}/__init__.py | 0 fpakman/view/qt/__init__.py | 0 {view => fpakman/view}/qt/systray.py | 8 ++- {view => fpakman/view}/qt/window.py | 5 +- install.py | 6 +-- setup.py | 49 +++++++++++++++++++ 26 files changed, 67 insertions(+), 18 deletions(-) rename {view => fpakman}/__init__.py (100%) mode change 100755 => 100644 rename app.py => fpakman/app.py (78%) rename {core => fpakman/core}/__init__.py (100%) rename {core => fpakman/core}/controller.py (92%) rename {core => fpakman/core}/flatpak.py (98%) rename {core => fpakman/core}/model.py (98%) rename {core => fpakman/core}/resource.py (100%) rename {core => fpakman/core}/system.py (100%) rename {core => fpakman/core}/util.py (96%) rename {resources => fpakman/resources}/img/flathub_10.svg (100%) rename {resources => fpakman/resources}/img/flathub_45.svg (100%) rename {resources => fpakman/resources}/img/refresh.svg (100%) rename {resources => fpakman/resources}/img/toggle_off.svg (100%) rename {resources => fpakman/resources}/img/toggle_on.svg (100%) rename {resources => fpakman/resources}/img/update.svg (100%) rename {resources => fpakman/resources}/img/update_green.svg (100%) rename {resources => fpakman/resources}/img/update_logo.svg (100%) rename {resources => fpakman/resources}/locale/en (100%) rename {resources => fpakman/resources}/locale/es (100%) rename {resources => fpakman/resources}/locale/pt (100%) rename {view/qt => fpakman/view}/__init__.py (100%) create mode 100755 fpakman/view/qt/__init__.py rename {view => fpakman/view}/qt/systray.py (95%) rename {view => fpakman/view}/qt/window.py (99%) create mode 100644 setup.py diff --git a/view/__init__.py b/fpakman/__init__.py old mode 100755 new mode 100644 similarity index 100% rename from view/__init__.py rename to fpakman/__init__.py diff --git a/app.py b/fpakman/app.py similarity index 78% rename from app.py rename to fpakman/app.py index 11e21960..cadcefa2 100755 --- a/app.py +++ b/fpakman/app.py @@ -5,10 +5,11 @@ import sys from PyQt5.QtWidgets import QApplication, QWidget -from core.controller import FlatpakController -from core.model import FlatpakManager -from view.qt.systray import TrayIcon -from core import __version__, util +from fpakman.core.controller import FlatpakController +from fpakman.core.model import FlatpakManager +from fpakman.view.qt.systray import TrayIcon +from fpakman.core import __version__ +from fpakman.core import util parser = argparse.ArgumentParser(prog='fpakman', description="GUI for Flatpak applications management") parser.add_argument('-v', '--version', action='version', version='%(prog)s {}'.format(__version__)) diff --git a/core/__init__.py b/fpakman/core/__init__.py similarity index 100% rename from core/__init__.py rename to fpakman/core/__init__.py diff --git a/core/controller.py b/fpakman/core/controller.py similarity index 92% rename from core/controller.py rename to fpakman/core/controller.py index fe028d80..3e43630b 100755 --- a/core/controller.py +++ b/fpakman/core/controller.py @@ -1,6 +1,6 @@ from typing import List -from core.model import FlatpakManager +from fpakman.core.model import FlatpakManager class FlatpakController: diff --git a/core/flatpak.py b/fpakman/core/flatpak.py similarity index 98% rename from core/flatpak.py rename to fpakman/core/flatpak.py index 094e6740..823c146a 100755 --- a/core/flatpak.py +++ b/fpakman/core/flatpak.py @@ -1,7 +1,7 @@ import re from typing import List -from core import system +from fpakman.core import system def app_str_to_json(line: str, version: str) -> dict: diff --git a/core/model.py b/fpakman/core/model.py similarity index 98% rename from core/model.py rename to fpakman/core/model.py index 95e55b2f..115976c6 100755 --- a/core/model.py +++ b/fpakman/core/model.py @@ -6,7 +6,7 @@ from PyQt5.QtCore import QUrl from PyQt5.QtGui import QPixmap, QIcon from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest -from core import flatpak +from fpakman.core import flatpak __FLATHUB_URL__ = 'https://flathub.org' __FLATHUB_API_URL__ = __FLATHUB_URL__ + '/api/v1' diff --git a/core/resource.py b/fpakman/core/resource.py similarity index 100% rename from core/resource.py rename to fpakman/core/resource.py diff --git a/core/system.py b/fpakman/core/system.py similarity index 100% rename from core/system.py rename to fpakman/core/system.py diff --git a/core/util.py b/fpakman/core/util.py similarity index 96% rename from core/util.py rename to fpakman/core/util.py index a12a9b41..f502ceee 100644 --- a/core/util.py +++ b/fpakman/core/util.py @@ -1,6 +1,6 @@ import locale -from core import resource +from fpakman.core import resource import glob diff --git a/resources/img/flathub_10.svg b/fpakman/resources/img/flathub_10.svg similarity index 100% rename from resources/img/flathub_10.svg rename to fpakman/resources/img/flathub_10.svg diff --git a/resources/img/flathub_45.svg b/fpakman/resources/img/flathub_45.svg similarity index 100% rename from resources/img/flathub_45.svg rename to fpakman/resources/img/flathub_45.svg diff --git a/resources/img/refresh.svg b/fpakman/resources/img/refresh.svg similarity index 100% rename from resources/img/refresh.svg rename to fpakman/resources/img/refresh.svg diff --git a/resources/img/toggle_off.svg b/fpakman/resources/img/toggle_off.svg similarity index 100% rename from resources/img/toggle_off.svg rename to fpakman/resources/img/toggle_off.svg diff --git a/resources/img/toggle_on.svg b/fpakman/resources/img/toggle_on.svg similarity index 100% rename from resources/img/toggle_on.svg rename to fpakman/resources/img/toggle_on.svg diff --git a/resources/img/update.svg b/fpakman/resources/img/update.svg similarity index 100% rename from resources/img/update.svg rename to fpakman/resources/img/update.svg diff --git a/resources/img/update_green.svg b/fpakman/resources/img/update_green.svg similarity index 100% rename from resources/img/update_green.svg rename to fpakman/resources/img/update_green.svg diff --git a/resources/img/update_logo.svg b/fpakman/resources/img/update_logo.svg similarity index 100% rename from resources/img/update_logo.svg rename to fpakman/resources/img/update_logo.svg diff --git a/resources/locale/en b/fpakman/resources/locale/en similarity index 100% rename from resources/locale/en rename to fpakman/resources/locale/en diff --git a/resources/locale/es b/fpakman/resources/locale/es similarity index 100% rename from resources/locale/es rename to fpakman/resources/locale/es diff --git a/resources/locale/pt b/fpakman/resources/locale/pt similarity index 100% rename from resources/locale/pt rename to fpakman/resources/locale/pt diff --git a/view/qt/__init__.py b/fpakman/view/__init__.py similarity index 100% rename from view/qt/__init__.py rename to fpakman/view/__init__.py diff --git a/fpakman/view/qt/__init__.py b/fpakman/view/qt/__init__.py new file mode 100755 index 00000000..e69de29b diff --git a/view/qt/systray.py b/fpakman/view/qt/systray.py similarity index 95% rename from view/qt/systray.py rename to fpakman/view/qt/systray.py index 9e22b1d8..f81d6a21 100755 --- a/view/qt/systray.py +++ b/fpakman/view/qt/systray.py @@ -5,11 +5,9 @@ from PyQt5.QtCore import QThread, pyqtSignal, QCoreApplication from PyQt5.QtGui import QIcon from PyQt5.QtWidgets import QSystemTrayIcon, QMenu -from core import resource - -# to update -from core.controller import FlatpakController -from view.qt.window import ManageWindow +from fpakman.core import resource +from fpakman.core.controller import FlatpakController +from fpakman.view.qt.window import ManageWindow class UpdateCheck(QThread): diff --git a/view/qt/window.py b/fpakman/view/qt/window.py similarity index 99% rename from view/qt/window.py rename to fpakman/view/qt/window.py index ae75deb3..337d9efe 100755 --- a/view/qt/window.py +++ b/fpakman/view/qt/window.py @@ -10,8 +10,9 @@ from PyQt5.QtWidgets import QWidget, QVBoxLayout, QApplication, QTableWidget, \ QTableWidgetItem, QTableView, QCheckBox, QHeaderView, QToolButton, QToolBar, \ QSizePolicy, QLabel, QMessageBox -from core import resource, __version__ -from core.controller import FlatpakController +from fpakman.core import __version__ +from fpakman.core import resource +from fpakman.core.controller import FlatpakController class UpdateToggleButton(QToolButton): diff --git a/install.py b/install.py index b2b8ec8e..fae54698 100755 --- a/install.py +++ b/install.py @@ -8,7 +8,7 @@ import os import sys from shutil import rmtree -from core import system, flatpak +from fpakman.core import system, flatpak if not os.geteuid() == 0: sys.exit("\nOnly root can run this script\n") @@ -64,12 +64,12 @@ else: log('Aborting...') exit(1) - res = system.run_cmd('env/bin/pip install -r requirements.txt') + res = system.run_cmd('env/bin/pip install .') if res: log("Creating runner as '{}'".format(runner_file)) with open(runner_file, 'w+') as f: - f.write('#!/bin/bash\n{d}/env/bin/python {d}/app.py'.format(d=os.getcwd())) + f.write('#!/bin/bash\n{d}/env/bin/fpakman'.format(d=os.getcwd())) system.run_cmd('chmod +x ' + runner_file) diff --git a/setup.py b/setup.py new file mode 100644 index 00000000..b4119ba7 --- /dev/null +++ b/setup.py @@ -0,0 +1,49 @@ +import os +from setuptools import setup, find_packages + +DESCRIPTION = ( + "Graphical user interface to manage Flatpak applications." +) + +AUTHOR = "Vinicius Moreira" +AUTHOR_EMAIL = "vinicius_fmoreira@hotmail.com" +URL = "https://github.com/vinifmor/fpakman" + +file_dir = os.path.dirname(os.path.abspath(__file__)) + +with open(file_dir + '/requirements.txt', 'r') as f: + requirements = [line.strip() for line in f.readlines() if line] + + +with open(file_dir + '/fpakman/core/__init__.py', 'r') as f: + exec(f.readlines()[0]) + + +setup( + name="fpakman", + version=eval('__version__'), + description=DESCRIPTION, + long_description=DESCRIPTION, + author=AUTHOR, + author_email=AUTHOR_EMAIL, + python_requires=">=3.5", + url=URL, + packages=find_packages(), + package_data={"fpakman": ["resources/locale/*", "resources/img/*"]}, + install_requires=requirements, + entry_points={ + "console_scripts": [ + "fpakman=fpakman.app" + ] + }, + include_package_data=True, + license="zlib/libpng", + classifiers=[ + 'Topic :: Utilities', + 'Programming Language :: Python', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7' + ] +)