From 52bcaa58b239016552704aee22260143f9b1069a Mon Sep 17 00:00:00 2001 From: Jeremy O'Brien Date: Fri, 22 Jul 2022 09:41:43 -0400 Subject: [PATCH 1/2] small fixes to make the precursor updater python package work through pip --- tools/updater/precursorupdater.egg-info/entry_points.txt | 6 ++++-- tools/updater/precursorupdater/precursorupdater.py | 2 +- tools/updater/precursorupdater/precursorusb/__init__.py | 1 + tools/updater/setup.py | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/updater/precursorupdater.egg-info/entry_points.txt b/tools/updater/precursorupdater.egg-info/entry_points.txt index 8eaa3a73e..1e81b88cf 100644 --- a/tools/updater/precursorupdater.egg-info/entry_points.txt +++ b/tools/updater/precursorupdater.egg-info/entry_points.txt @@ -1,2 +1,4 @@ -[console_scripts] -precursorupdater = precursorupdater:main + + [console_scripts] + precursorupdater=precursorupdater.precursorupdater:main + \ No newline at end of file diff --git a/tools/updater/precursorupdater/precursorupdater.py b/tools/updater/precursorupdater/precursorupdater.py index bbe36747b..c5a4b87c3 100755 --- a/tools/updater/precursorupdater/precursorupdater.py +++ b/tools/updater/precursorupdater/precursorupdater.py @@ -6,7 +6,7 @@ import usb.util from datetime import datetime import requests -from precursorusb.precursorusb import PrecursorUsb +from .precursorusb import PrecursorUsb from progressbar.bar import ProgressBar QR_CODE = """ diff --git a/tools/updater/precursorupdater/precursorusb/__init__.py b/tools/updater/precursorupdater/precursorusb/__init__.py index e69de29bb..64f29ce64 100644 --- a/tools/updater/precursorupdater/precursorusb/__init__.py +++ b/tools/updater/precursorupdater/precursorusb/__init__.py @@ -0,0 +1 @@ +from .precursorusb import PrecursorUsb diff --git a/tools/updater/setup.py b/tools/updater/setup.py index 19db1ad11..c94b785a5 100644 --- a/tools/updater/setup.py +++ b/tools/updater/setup.py @@ -28,7 +28,7 @@ setup( "Topic :: System :: Hardware", "Topic :: System :: Hardware :: Universal Serial Bus (USB)", ], - packages=["precursorupdater"], + packages=find_packages(), install_requires=[ "requests >= 2", "pyusb >= 1", @@ -36,6 +36,6 @@ setup( ], entry_points=""" [console_scripts] - precursorupdater=precursorupdater:main + precursorupdater=precursorupdater.precursorupdater:main """, ) From b47fccde6af9ec34718f2544490da40945408f43 Mon Sep 17 00:00:00 2001 From: Jeremy O'Brien Date: Fri, 22 Jul 2022 09:52:36 -0400 Subject: [PATCH 2/2] precursorupdater python package improvements move precursorupdater's main into its own namespace and handle both running from the repo directly and from pip --- tools/updater/precursorupdater.egg-info/entry_points.txt | 2 +- tools/updater/precursorupdater/__init__.py | 1 + tools/updater/precursorupdater/precursorupdater.py | 7 +++++-- tools/updater/setup.py | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/updater/precursorupdater.egg-info/entry_points.txt b/tools/updater/precursorupdater.egg-info/entry_points.txt index 1e81b88cf..8d9b0ffb0 100644 --- a/tools/updater/precursorupdater.egg-info/entry_points.txt +++ b/tools/updater/precursorupdater.egg-info/entry_points.txt @@ -1,4 +1,4 @@ [console_scripts] - precursorupdater=precursorupdater.precursorupdater:main + precursorupdater=precursorupdater:main \ No newline at end of file diff --git a/tools/updater/precursorupdater/__init__.py b/tools/updater/precursorupdater/__init__.py index e69de29bb..b4c39a3e4 100644 --- a/tools/updater/precursorupdater/__init__.py +++ b/tools/updater/precursorupdater/__init__.py @@ -0,0 +1 @@ +from .precursorupdater import main diff --git a/tools/updater/precursorupdater/precursorupdater.py b/tools/updater/precursorupdater/precursorupdater.py index c5a4b87c3..30e86df2b 100755 --- a/tools/updater/precursorupdater/precursorupdater.py +++ b/tools/updater/precursorupdater/precursorupdater.py @@ -4,10 +4,13 @@ import argparse import usb.core import usb.util from datetime import datetime +from progressbar.bar import ProgressBar import requests -from .precursorusb import PrecursorUsb -from progressbar.bar import ProgressBar +try: + from .precursorusb import PrecursorUsb +except ImportError: + from precursorusb import PrecursorUsb QR_CODE = """ diff --git a/tools/updater/setup.py b/tools/updater/setup.py index c94b785a5..2e8ea7125 100644 --- a/tools/updater/setup.py +++ b/tools/updater/setup.py @@ -36,6 +36,6 @@ setup( ], entry_points=""" [console_scripts] - precursorupdater=precursorupdater.precursorupdater:main + precursorupdater=precursorupdater:main """, )