From 02815f2c8c2fe149b012a00320a5a1afbaf3db3e Mon Sep 17 00:00:00 2001 From: Angad Sharma <30529572+L04DB4L4NC3R@users.noreply.github.com> Date: Wed, 22 Jan 2020 16:20:29 +0530 Subject: [PATCH 1/7] Create main.yml --- .github/workflows/main.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..9e7ec42 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,26 @@ +name: Upload Python Package + +on: + release: + types: [created] + +jobs: + deploy: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: Set up Python + uses: actions/setup-python@v1 + with: + python-version: '3.x' + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install setuptools wheel twine + - name: Build and publish + env: + TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} + TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} + run: | + python setup.py sdist bdist_wheel + twine upload dist/* From 11fc9f540d3f46d4a82441e9274fb0c750a4ff95 Mon Sep 17 00:00:00 2001 From: Angad Sharma <30529572+L04DB4L4NC3R@users.noreply.github.com> Date: Wed, 22 Jan 2020 16:27:35 +0530 Subject: [PATCH 2/7] Added contributors and functionalities --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d45739e..b8e33e1 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,8 @@ - [x] Update packages - [x] Get the latest packages directly from the pypi package directory - [ ] Choose enviroment to download packages +- [ ] Search option in updates and uninstall windows +- [ ] Installing package in user directory (--user)
@@ -70,7 +72,11 @@ pip install pipgui==1.1 ## Contributors -* Ayush Priya +* [Ayush Priya](https://github.com/ayushpriya10) +* [zdenop](https://github.com/zdenop) +* [Geek-ubaid](https://github.com/Geek-ubaid) +* [ujjwal96](https://github.com/ujjwal96) +* [L04DB4L4NC3R](https://github.com/L04DB4L4NC3R)
From 490080c96d5e656115c0c84edf3dfd7ae8e19fa8 Mon Sep 17 00:00:00 2001 From: Angad Sharma <30529572+L04DB4L4NC3R@users.noreply.github.com> Date: Wed, 22 Jan 2020 16:41:50 +0530 Subject: [PATCH 3/7] Version updated --- pipgui/mainGUI.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipgui/mainGUI.py b/pipgui/mainGUI.py index 90f55a2..98dd2d8 100644 --- a/pipgui/mainGUI.py +++ b/pipgui/mainGUI.py @@ -16,7 +16,7 @@ # from Scraping import genreList, packageList -__version__ = "2.0" +__version__ = "1.1" VERSION = 0 FILEVERSION = '' From e99ab30ac7c5449d7945dcf8ede603a3ddeb1a14 Mon Sep 17 00:00:00 2001 From: Ayush Priya Date: Wed, 22 Jan 2020 16:52:59 +0530 Subject: [PATCH 4/7] Fixed typo in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b8e33e1..e57ddc0 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

PIP-GUI

-

A GUI framework for managine PIP packages developed using PyQt5

+

A GUI framework for managing PIP packages developed using PyQt5

Description

### The Start Screen From a6a99db8eb2411d39c8c92afddb9b8b58b4d2e16 Mon Sep 17 00:00:00 2001 From: Ayush Priya Date: Wed, 22 Jan 2020 17:35:19 +0530 Subject: [PATCH 5/7] Edited .gitignore to add a directory for UI files. --- .gitignore | 1 - pipgui/GUI/UI_Files/aboutScreen.ui | 41 ++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 pipgui/GUI/UI_Files/aboutScreen.ui diff --git a/.gitignore b/.gitignore index b7ff741..e2d7559 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ *.pyc env/ *.egg-info -UI_Files/ build/ dist/ .idea* diff --git a/pipgui/GUI/UI_Files/aboutScreen.ui b/pipgui/GUI/UI_Files/aboutScreen.ui new file mode 100644 index 0000000..681b8a8 --- /dev/null +++ b/pipgui/GUI/UI_Files/aboutScreen.ui @@ -0,0 +1,41 @@ + + + Form + + + + 0 + 0 + 381 + 350 + + + + About + + + + + 30 + 30 + 321 + 291 + + + + + + + TextLabel + + + + + + + + + + + + From 588e0ae8551f3bb7d4c350a450a990ab2de57f97 Mon Sep 17 00:00:00 2001 From: Ayush Priya Date: Wed, 22 Jan 2020 17:36:56 +0530 Subject: [PATCH 6/7] Added the *.ui Files under /pipgui/GUI/UI_Files --- pipgui/GUI/UI_Files/installScreen.ui | 98 +++++++++++++ pipgui/GUI/UI_Files/progressScreen.ui | 61 ++++++++ pipgui/GUI/UI_Files/startScreen.ui | 195 +++++++++++++++++++++++++ pipgui/GUI/UI_Files/uninstallScreen.ui | 83 +++++++++++ pipgui/GUI/UI_Files/updateScreen.ui | 83 +++++++++++ 5 files changed, 520 insertions(+) create mode 100644 pipgui/GUI/UI_Files/installScreen.ui create mode 100644 pipgui/GUI/UI_Files/progressScreen.ui create mode 100644 pipgui/GUI/UI_Files/startScreen.ui create mode 100644 pipgui/GUI/UI_Files/uninstallScreen.ui create mode 100644 pipgui/GUI/UI_Files/updateScreen.ui diff --git a/pipgui/GUI/UI_Files/installScreen.ui b/pipgui/GUI/UI_Files/installScreen.ui new file mode 100644 index 0000000..754b9bc --- /dev/null +++ b/pipgui/GUI/UI_Files/installScreen.ui @@ -0,0 +1,98 @@ + + + Form + + + + 0 + 0 + 439 + 503 + + + + Install Packages + + + + + 300 + 110 + 121 + 98 + + + + + + + Install + + + + + + + Go Back + + + + + + + + + 20 + 110 + 261 + 381 + + + + QAbstractItemView::MultiSelection + + + + + + 20 + 70 + 401 + 21 + + + + + 14 + + + + Please select the packages you want to update: + + + + + + 20 + 0 + 401 + 80 + + + + + + + Search Packages: + + + + + + + + + + + + diff --git a/pipgui/GUI/UI_Files/progressScreen.ui b/pipgui/GUI/UI_Files/progressScreen.ui new file mode 100644 index 0000000..7433af7 --- /dev/null +++ b/pipgui/GUI/UI_Files/progressScreen.ui @@ -0,0 +1,61 @@ + + + Form + + + + 0 + 0 + 582 + 317 + + + + Progress Window + + + + + 10 + 10 + 561 + 261 + + + + + + + + 12 + 75 + true + + + + Filler Text.. + + + + + + + + + + + + 450 + 280 + 90 + 28 + + + + Continue + + + + + + diff --git a/pipgui/GUI/UI_Files/startScreen.ui b/pipgui/GUI/UI_Files/startScreen.ui new file mode 100644 index 0000000..eeb723e --- /dev/null +++ b/pipgui/GUI/UI_Files/startScreen.ui @@ -0,0 +1,195 @@ + + + mainWindow + + + + 0 + 0 + 352 + 311 + + + + ArrowCursor + + + PIP GUI + + + + ../Resource_Files/googledev.png../Resource_Files/googledev.png + + + QTabWidget::Rounded + + + + + + 20 + 20 + 231 + 20 + + + + + 16 + true + + + + What do you wanna do? + + + + + + 50 + 100 + 251 + 101 + + + + + + + Install new packages + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Update existing packages + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Uninstall existing packages + + + + + + + + + 110 + 200 + 188 + 80 + + + + + + + Next + + + + + + + Exit + + + + + + + + + 30 + 50 + 226 + 31 + + + + + + + Python 2 + + + + + + + Python 3 + + + + + + + + + + 0 + 0 + 352 + 26 + + + + + File + + + + + + + + + + Exit + + + + + PIP GUI + + + + + Refresh Lists + + + + + + diff --git a/pipgui/GUI/UI_Files/uninstallScreen.ui b/pipgui/GUI/UI_Files/uninstallScreen.ui new file mode 100644 index 0000000..cf156d1 --- /dev/null +++ b/pipgui/GUI/UI_Files/uninstallScreen.ui @@ -0,0 +1,83 @@ + + + Form + + + + 0 + 0 + 428 + 457 + + + + Uninstall Packages + + + + + 10 + 20 + 401 + 21 + + + + + 14 + + + + Please select the packages you want to uninstall: + + + + + + 10 + 60 + 261 + 381 + + + + QAbstractItemView::MultiSelection + + + + + + 290 + 60 + 121 + 98 + + + + + + + Uninstall + + + + + + + Uninstall All + + + + + + + Go Back + + + + + + + + + diff --git a/pipgui/GUI/UI_Files/updateScreen.ui b/pipgui/GUI/UI_Files/updateScreen.ui new file mode 100644 index 0000000..5759280 --- /dev/null +++ b/pipgui/GUI/UI_Files/updateScreen.ui @@ -0,0 +1,83 @@ + + + Form + + + + 0 + 0 + 427 + 456 + + + + Update Packages + + + + + 10 + 60 + 261 + 381 + + + + QAbstractItemView::MultiSelection + + + + + + 290 + 60 + 121 + 98 + + + + + + + Update + + + + + + + Update All + + + + + + + Go Back + + + + + + + + + 10 + 20 + 401 + 21 + + + + + 14 + + + + Please select the packages you want to update: + + + + + + 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 7/7] 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.*"