From 6b9765e7e85f1f19b65d6f217a3e6598233138f8 Mon Sep 17 00:00:00 2001 From: Etienne Denis Date: Sat, 7 May 2022 00:51:59 +0000 Subject: [PATCH 1/4] Fixed package structure to support pip install --- __init__.py => python-utils/__init__.py | 0 auutil.py => python-utils/auutil.py | 0 color_conversion.py => python-utils/color_conversion.py | 0 crop.py => python-utils/crop.py | 0 draw_shapes.py => python-utils/draw_shapes.py | 0 ffmpeg.py => python-utils/ffmpeg.py | 0 geometry.py => python-utils/geometry.py | 0 histogram_equalize.py => python-utils/histogram_equalize.py | 0 imutil.py => python-utils/imutil.py | 0 imwarp.py => python-utils/imwarp.py | 0 itertools.py => python-utils/itertools.py | 0 list_files.py => python-utils/list_files.py | 0 mosaic.py => python-utils/mosaic.py | 0 multiworker.py => python-utils/multiworker.py | 0 pixelated.py => python-utils/pixelated.py | 0 plot_images.py => python-utils/plot_images.py | 0 progress.py => python-utils/progress.py | 0 rainbow.py => python-utils/rainbow.py | 0 specshow.py => python-utils/specshow.py | 0 stratified.py => python-utils/stratified.py | 0 timing.py => python-utils/timing.py | 0 wavshow.py => python-utils/wavshow.py | 0 22 files changed, 0 insertions(+), 0 deletions(-) rename __init__.py => python-utils/__init__.py (100%) rename auutil.py => python-utils/auutil.py (100%) rename color_conversion.py => python-utils/color_conversion.py (100%) rename crop.py => python-utils/crop.py (100%) rename draw_shapes.py => python-utils/draw_shapes.py (100%) rename ffmpeg.py => python-utils/ffmpeg.py (100%) rename geometry.py => python-utils/geometry.py (100%) rename histogram_equalize.py => python-utils/histogram_equalize.py (100%) rename imutil.py => python-utils/imutil.py (100%) rename imwarp.py => python-utils/imwarp.py (100%) rename itertools.py => python-utils/itertools.py (100%) rename list_files.py => python-utils/list_files.py (100%) rename mosaic.py => python-utils/mosaic.py (100%) rename multiworker.py => python-utils/multiworker.py (100%) rename pixelated.py => python-utils/pixelated.py (100%) rename plot_images.py => python-utils/plot_images.py (100%) rename progress.py => python-utils/progress.py (100%) rename rainbow.py => python-utils/rainbow.py (100%) rename specshow.py => python-utils/specshow.py (100%) rename stratified.py => python-utils/stratified.py (100%) rename timing.py => python-utils/timing.py (100%) rename wavshow.py => python-utils/wavshow.py (100%) diff --git a/__init__.py b/python-utils/__init__.py similarity index 100% rename from __init__.py rename to python-utils/__init__.py diff --git a/auutil.py b/python-utils/auutil.py similarity index 100% rename from auutil.py rename to python-utils/auutil.py diff --git a/color_conversion.py b/python-utils/color_conversion.py similarity index 100% rename from color_conversion.py rename to python-utils/color_conversion.py diff --git a/crop.py b/python-utils/crop.py similarity index 100% rename from crop.py rename to python-utils/crop.py diff --git a/draw_shapes.py b/python-utils/draw_shapes.py similarity index 100% rename from draw_shapes.py rename to python-utils/draw_shapes.py diff --git a/ffmpeg.py b/python-utils/ffmpeg.py similarity index 100% rename from ffmpeg.py rename to python-utils/ffmpeg.py diff --git a/geometry.py b/python-utils/geometry.py similarity index 100% rename from geometry.py rename to python-utils/geometry.py diff --git a/histogram_equalize.py b/python-utils/histogram_equalize.py similarity index 100% rename from histogram_equalize.py rename to python-utils/histogram_equalize.py diff --git a/imutil.py b/python-utils/imutil.py similarity index 100% rename from imutil.py rename to python-utils/imutil.py diff --git a/imwarp.py b/python-utils/imwarp.py similarity index 100% rename from imwarp.py rename to python-utils/imwarp.py diff --git a/itertools.py b/python-utils/itertools.py similarity index 100% rename from itertools.py rename to python-utils/itertools.py diff --git a/list_files.py b/python-utils/list_files.py similarity index 100% rename from list_files.py rename to python-utils/list_files.py diff --git a/mosaic.py b/python-utils/mosaic.py similarity index 100% rename from mosaic.py rename to python-utils/mosaic.py diff --git a/multiworker.py b/python-utils/multiworker.py similarity index 100% rename from multiworker.py rename to python-utils/multiworker.py diff --git a/pixelated.py b/python-utils/pixelated.py similarity index 100% rename from pixelated.py rename to python-utils/pixelated.py diff --git a/plot_images.py b/python-utils/plot_images.py similarity index 100% rename from plot_images.py rename to python-utils/plot_images.py diff --git a/progress.py b/python-utils/progress.py similarity index 100% rename from progress.py rename to python-utils/progress.py diff --git a/rainbow.py b/python-utils/rainbow.py similarity index 100% rename from rainbow.py rename to python-utils/rainbow.py diff --git a/specshow.py b/python-utils/specshow.py similarity index 100% rename from specshow.py rename to python-utils/specshow.py diff --git a/stratified.py b/python-utils/stratified.py similarity index 100% rename from stratified.py rename to python-utils/stratified.py diff --git a/timing.py b/python-utils/timing.py similarity index 100% rename from timing.py rename to python-utils/timing.py diff --git a/wavshow.py b/python-utils/wavshow.py similarity index 100% rename from wavshow.py rename to python-utils/wavshow.py From 157862706f9ddf40aa5b5eb3f89d28ee29779821 Mon Sep 17 00:00:00 2001 From: Etienne Denis Date: Sat, 7 May 2022 01:43:02 +0000 Subject: [PATCH 2/4] Fixed package importing issues --- {python-utils => src/pyutils}/__init__.py | 0 {python-utils => src/pyutils}/auutil.py | 0 {python-utils => src/pyutils}/color_conversion.py | 0 {python-utils => src/pyutils}/crop.py | 0 {python-utils => src/pyutils}/draw_shapes.py | 0 {python-utils => src/pyutils}/ffmpeg.py | 0 {python-utils => src/pyutils}/geometry.py | 0 {python-utils => src/pyutils}/histogram_equalize.py | 0 {python-utils => src/pyutils}/imutil.py | 0 {python-utils => src/pyutils}/imwarp.py | 0 {python-utils => src/pyutils}/itertools.py | 0 {python-utils => src/pyutils}/list_files.py | 0 {python-utils => src/pyutils}/mosaic.py | 0 {python-utils => src/pyutils}/multiworker.py | 0 {python-utils => src/pyutils}/pixelated.py | 0 {python-utils => src/pyutils}/plot_images.py | 0 {python-utils => src/pyutils}/progress.py | 0 {python-utils => src/pyutils}/rainbow.py | 0 {python-utils => src/pyutils}/specshow.py | 0 {python-utils => src/pyutils}/stratified.py | 0 {python-utils => src/pyutils}/timing.py | 0 {python-utils => src/pyutils}/wavshow.py | 0 22 files changed, 0 insertions(+), 0 deletions(-) rename {python-utils => src/pyutils}/__init__.py (100%) rename {python-utils => src/pyutils}/auutil.py (100%) rename {python-utils => src/pyutils}/color_conversion.py (100%) rename {python-utils => src/pyutils}/crop.py (100%) rename {python-utils => src/pyutils}/draw_shapes.py (100%) rename {python-utils => src/pyutils}/ffmpeg.py (100%) rename {python-utils => src/pyutils}/geometry.py (100%) rename {python-utils => src/pyutils}/histogram_equalize.py (100%) rename {python-utils => src/pyutils}/imutil.py (100%) rename {python-utils => src/pyutils}/imwarp.py (100%) rename {python-utils => src/pyutils}/itertools.py (100%) rename {python-utils => src/pyutils}/list_files.py (100%) rename {python-utils => src/pyutils}/mosaic.py (100%) rename {python-utils => src/pyutils}/multiworker.py (100%) rename {python-utils => src/pyutils}/pixelated.py (100%) rename {python-utils => src/pyutils}/plot_images.py (100%) rename {python-utils => src/pyutils}/progress.py (100%) rename {python-utils => src/pyutils}/rainbow.py (100%) rename {python-utils => src/pyutils}/specshow.py (100%) rename {python-utils => src/pyutils}/stratified.py (100%) rename {python-utils => src/pyutils}/timing.py (100%) rename {python-utils => src/pyutils}/wavshow.py (100%) diff --git a/python-utils/__init__.py b/src/pyutils/__init__.py similarity index 100% rename from python-utils/__init__.py rename to src/pyutils/__init__.py diff --git a/python-utils/auutil.py b/src/pyutils/auutil.py similarity index 100% rename from python-utils/auutil.py rename to src/pyutils/auutil.py diff --git a/python-utils/color_conversion.py b/src/pyutils/color_conversion.py similarity index 100% rename from python-utils/color_conversion.py rename to src/pyutils/color_conversion.py diff --git a/python-utils/crop.py b/src/pyutils/crop.py similarity index 100% rename from python-utils/crop.py rename to src/pyutils/crop.py diff --git a/python-utils/draw_shapes.py b/src/pyutils/draw_shapes.py similarity index 100% rename from python-utils/draw_shapes.py rename to src/pyutils/draw_shapes.py diff --git a/python-utils/ffmpeg.py b/src/pyutils/ffmpeg.py similarity index 100% rename from python-utils/ffmpeg.py rename to src/pyutils/ffmpeg.py diff --git a/python-utils/geometry.py b/src/pyutils/geometry.py similarity index 100% rename from python-utils/geometry.py rename to src/pyutils/geometry.py diff --git a/python-utils/histogram_equalize.py b/src/pyutils/histogram_equalize.py similarity index 100% rename from python-utils/histogram_equalize.py rename to src/pyutils/histogram_equalize.py diff --git a/python-utils/imutil.py b/src/pyutils/imutil.py similarity index 100% rename from python-utils/imutil.py rename to src/pyutils/imutil.py diff --git a/python-utils/imwarp.py b/src/pyutils/imwarp.py similarity index 100% rename from python-utils/imwarp.py rename to src/pyutils/imwarp.py diff --git a/python-utils/itertools.py b/src/pyutils/itertools.py similarity index 100% rename from python-utils/itertools.py rename to src/pyutils/itertools.py diff --git a/python-utils/list_files.py b/src/pyutils/list_files.py similarity index 100% rename from python-utils/list_files.py rename to src/pyutils/list_files.py diff --git a/python-utils/mosaic.py b/src/pyutils/mosaic.py similarity index 100% rename from python-utils/mosaic.py rename to src/pyutils/mosaic.py diff --git a/python-utils/multiworker.py b/src/pyutils/multiworker.py similarity index 100% rename from python-utils/multiworker.py rename to src/pyutils/multiworker.py diff --git a/python-utils/pixelated.py b/src/pyutils/pixelated.py similarity index 100% rename from python-utils/pixelated.py rename to src/pyutils/pixelated.py diff --git a/python-utils/plot_images.py b/src/pyutils/plot_images.py similarity index 100% rename from python-utils/plot_images.py rename to src/pyutils/plot_images.py diff --git a/python-utils/progress.py b/src/pyutils/progress.py similarity index 100% rename from python-utils/progress.py rename to src/pyutils/progress.py diff --git a/python-utils/rainbow.py b/src/pyutils/rainbow.py similarity index 100% rename from python-utils/rainbow.py rename to src/pyutils/rainbow.py diff --git a/python-utils/specshow.py b/src/pyutils/specshow.py similarity index 100% rename from python-utils/specshow.py rename to src/pyutils/specshow.py diff --git a/python-utils/stratified.py b/src/pyutils/stratified.py similarity index 100% rename from python-utils/stratified.py rename to src/pyutils/stratified.py diff --git a/python-utils/timing.py b/src/pyutils/timing.py similarity index 100% rename from python-utils/timing.py rename to src/pyutils/timing.py diff --git a/python-utils/wavshow.py b/src/pyutils/wavshow.py similarity index 100% rename from python-utils/wavshow.py rename to src/pyutils/wavshow.py From 0b4bdc60696ca32ce8aa0e63bbbf91d2405d6715 Mon Sep 17 00:00:00 2001 From: Etienne Denis Date: Sat, 7 May 2022 01:45:16 +0000 Subject: [PATCH 3/4] Setup.py issue preventing pip install --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3f6033f..52622f9 100644 --- a/setup.py +++ b/setup.py @@ -7,5 +7,6 @@ description="Test for pip install git+", url="https://github.com/kylemcdonald/python-utils", install_requires=["numpy", "opencv-python", "Pillow"], - packages=find_packages() + packages=['pyutils'], + package_dir={'':'src'} ) From c86843a57b5095f3c8538f79e90cb1bdaf3adfb7 Mon Sep 17 00:00:00 2001 From: Etienne Denis Date: Sat, 7 May 2022 01:47:21 +0000 Subject: [PATCH 4/4] Updated readme to reflect github no longer supporting unauthenticated git protocol --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 66ae247..22d5da8 100644 --- a/readme.md +++ b/readme.md @@ -7,5 +7,5 @@ For Python 3.7+ Install using pip: ``` -pip install git+git://github.com/kylemcdonald/python-utils.git +pip install git+https://github.com/kylemcdonald/python-utils.git ```