From 01a1dab53dfce69a3d0b61724c8e5a8bbf849b20 Mon Sep 17 00:00:00 2001
From: Angad Sharma <30529572+L04DB4L4NC3R@users.noreply.github.com>
Date: Wed, 22 Jan 2020 08:05:28 -0500
Subject: [PATCH] Fixed pipgui entrypoint command not working, and cleaned
 versioning (#19)

* changed author and versioning system

* removed versioning re func

* fixed pipgui entrypoint not working

* __init__ corrected
---
 .gitignore                                    |  1 +
 .../Resource_Files/installedPackageList.json  |  1 -
 .../Resource_Files/installedPackageList3.json |  1 -
 pipgui/__init__.py                            |  3 +--
 pipgui/mainGUI.py                             |  2 --
 setup.py                                      | 20 +++----------------
 6 files changed, 5 insertions(+), 23 deletions(-)
 delete mode 100644 pipgui/Resource_Files/installedPackageList.json
 delete mode 100644 pipgui/Resource_Files/installedPackageList3.json

diff --git a/.gitignore b/.gitignore
index e2d7559..983af05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.pyc
+venv/
 env/
 *.egg-info
 build/
diff --git a/pipgui/Resource_Files/installedPackageList.json b/pipgui/Resource_Files/installedPackageList.json
deleted file mode 100644
index 209e2da..0000000
--- a/pipgui/Resource_Files/installedPackageList.json
+++ /dev/null
@@ -1 +0,0 @@
-["1337", "astroid", "autopep8", "beautifulsoup4", "certifi", "chardet", "Click", "colorama", "docopt", "Flask", "idna", "isort", "itsdangerous", "Jinja2", "lazy-object-proxy", "lxml", "MarkupSafe", "mccabe", "oauthlib", "pipreqs", "pycodestyle", "pylint", "PyQt5", "PyQt5-sip", "PySocks", "requests", "requests-oauthlib", "six", "soupsieve", "typed-ast", "urllib3", "Werkzeug", "wrapt", "yarg"]
\ No newline at end of file
diff --git a/pipgui/Resource_Files/installedPackageList3.json b/pipgui/Resource_Files/installedPackageList3.json
deleted file mode 100644
index bcdae9e..0000000
--- a/pipgui/Resource_Files/installedPackageList3.json
+++ /dev/null
@@ -1 +0,0 @@
-["1337", "Click", "Flask", "Jinja2", "MarkupSafe", "PyQt5", "PyQt5-sip", "PySocks", "Werkzeug", "astroid", "autopep8", "beautifulsoup4", "certifi", "chardet", "colorama", "docopt", "idna", "isort", "itsdangerous", "lazy-object-proxy", "lxml", "mccabe", "oauthlib", "pipreqs", "pycodestyle", "pylint", "requests", "requests-oauthlib", "six", "soupsieve", "typed-ast", "urllib3", "wrapt", "yarg"]
\ No newline at end of file
diff --git a/pipgui/__init__.py b/pipgui/__init__.py
index dffc9a6..8edbbae 100644
--- a/pipgui/__init__.py
+++ b/pipgui/__init__.py
@@ -1,2 +1 @@
-
-from mainGUI import main
\ No newline at end of file
+from . import mainGUI
diff --git a/pipgui/mainGUI.py b/pipgui/mainGUI.py
index 98dd2d8..dd12168 100644
--- a/pipgui/mainGUI.py
+++ b/pipgui/mainGUI.py
@@ -16,8 +16,6 @@
 
 # from Scraping import genreList, packageList
 
-__version__ = "1.1"
-
 VERSION = 0
 FILEVERSION = ''
 Yes = QtWidgets.QMessageBox.Yes
diff --git a/setup.py b/setup.py
index 5e8097b..3006649 100644
--- a/setup.py
+++ b/setup.py
@@ -10,21 +10,6 @@
 here = os.path.abspath(os.path.dirname(__file__))
 
 
-def find_version(*file_paths):
-    try:
-        fh = codecs.open(os.path.join(here, *file_paths), "r", "latin1")
-        version_file = fh.read()
-        fh.close()
-    except FileNotFoundError:
-        raise RuntimeError("Unable to find version string.")
-
-    version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]",
-                              version_file, re.M)
-    if version_match:
-        return version_match.group(1)
-    raise RuntimeError("Unable to find version string.")
-
-
 try:
     fh = codecs.open("README.md", encoding="utf-8")
     long_description = fh.read()
@@ -34,10 +19,11 @@ def find_version(*file_paths):
 
 setup(
         name="pipgui",
-        version=find_version("pipgui/mainGUI.py"),
+        version=1.1,
         description="This package is GUI based tool for installing pip packages in your environment.",
         url="https://github.com/GDGVIT/pip-gui",
-        author="Ayush Priya",
+        author="Ayush Priya, DSC-VIT",
+        author_email="ayushpriya10@gmail.com, dscvitvellore@gmail.com",
         packages=find_packages(include=[
             "pipgui",
             "pipgui.*"