From 0a09948855825341e92c35bef2c4c8cd59d5fb08 Mon Sep 17 00:00:00 2001 From: Alix Fullerton Date: Thu, 22 Apr 2021 19:06:16 -0600 Subject: [PATCH 1/4] Working on new setup.py so version 1.0.3 can be published to pypi --- README.md | 2 +- pyproject.toml | 6 +++++ setup.cfg | 25 ++++++++++++++++++- setup.py | 18 ++----------- .../dockerprettyps}/__init__.py | 2 +- .../dockerprettyps}/bin/docker-pretty-ps | 0 .../dockerprettyps}/errors.py | 0 7 files changed, 34 insertions(+), 19 deletions(-) create mode 100644 pyproject.toml rename {dockerprettyps => src/dockerprettyps}/__init__.py (99%) rename {dockerprettyps => src/dockerprettyps}/bin/docker-pretty-ps (100%) rename {dockerprettyps => src/dockerprettyps}/errors.py (100%) diff --git a/README.md b/README.md index 217e9b5..c57b7da 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# docker-pretty-ps (v.1.0.2) +# docker-pretty-ps (v.1.0.3) Tired of that awful super wide ```docker ps``` output? I'm always shrinking my terminal output just to see what ```docker ps``` is trying saying... and it's making me go blind. If you commiserate, try `docker-pretty-ps`! Just run ```docker-pretty-ps``` and get your output long, instead of wide and with **COLORS!** Use ```docker-pretty-ps``` to get all running containers, stopped containers, search for containers. You can do all this in a beautiful, colored, long output with only the data you requested. diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..374b58c --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,6 @@ +[build-system] +requires = [ + "setuptools>=42", + "wheel" +] +build-backend = "setuptools.build_meta" diff --git a/setup.cfg b/setup.cfg index b88034e..ed8e6b0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,2 +1,25 @@ [metadata] -description-file = README.md +# replace with your username: +name = docker-pretty-ps +version = 1.0.3 +author = Alix Fullerton +author_email = fullertonalix0@gmail.com +description = CLI tool for docker ps reading in a pretty format +long_description = file: README.md +long_description_content_type = text/markdown +url = https://github.com/politeauthority/docker-pretty-ps +project_urls = + Bug Tracker = https://github.com/politeauthority/docker-pretty-ps/issues +classifiers = + Programming Language :: Python :: 3 + License :: OSI Approved :: MIT License + Operating System :: OS Independent + +[options] +package_dir = + = src +packages = find: +python_requires = >=3.6 + +[options.packages.find] +where = src diff --git a/setup.py b/setup.py index e2cd22a..fdad5c8 100644 --- a/setup.py +++ b/setup.py @@ -3,21 +3,7 @@ Builds packages so that each package can be imported (and allow relative imports) """ -import dockerprettyps import setuptools -setuptools.setup( - name="docker-pretty-ps", - version=dockerprettyps.__version__, - author="politeauthority", - author_email="fullteronalix0@gmail.com", - url="https://github.com/politeauthority/docker-pretty-ps", - download_url="https://github.com/politeauthority/docker-pretty-ps/archive/v0.0.1-alpha.zip", - packages=setuptools.find_packages(), - scripts=['dockerprettyps/bin/docker-pretty-ps'], - classifiers=[ - "Programming Language :: Python :: 3", - "License :: OSI Approved :: MIT License", - "Operating System :: OS Independent", - ], -) +if __name__ == "__main__": + setuptools.setup() diff --git a/dockerprettyps/__init__.py b/src/dockerprettyps/__init__.py similarity index 99% rename from dockerprettyps/__init__.py rename to src/dockerprettyps/__init__.py index d0d0b9d..25bce97 100644 --- a/dockerprettyps/__init__.py +++ b/src/dockerprettyps/__init__.py @@ -36,7 +36,7 @@ from dockerprettyps import errors -__version__ = "1.0.2" +__version__ = "1.0.3" __title__ = """ _ _ _ _ __| |___ __| |_____ _ _ ___ _ __ _ _ ___| |_| |_ _ _ ___ _ __ ___ diff --git a/dockerprettyps/bin/docker-pretty-ps b/src/dockerprettyps/bin/docker-pretty-ps similarity index 100% rename from dockerprettyps/bin/docker-pretty-ps rename to src/dockerprettyps/bin/docker-pretty-ps diff --git a/dockerprettyps/errors.py b/src/dockerprettyps/errors.py similarity index 100% rename from dockerprettyps/errors.py rename to src/dockerprettyps/errors.py From e5bdcb4237eb790093cc7337e0116a1dd2cdcbc8 Mon Sep 17 00:00:00 2001 From: Alix Fullerton Date: Thu, 22 Apr 2021 19:18:50 -0600 Subject: [PATCH 2/4] Removing setup.py since it contains no unique info --- setup.py | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 setup.py diff --git a/setup.py b/setup.py deleted file mode 100644 index fdad5c8..0000000 --- a/setup.py +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env python -""" -Builds packages so that each package can be imported (and allow relative imports) - -""" -import setuptools - -if __name__ == "__main__": - setuptools.setup() From 24f17af0634c7a366fe56c3e14474cb147f8d392 Mon Sep 17 00:00:00 2001 From: Alix Date: Thu, 22 Apr 2021 19:47:47 -0600 Subject: [PATCH 3/4] Updating configs, versions and bringing setup.py back --- setup.cfg | 3 ++- setup.py | 6 ++++++ src/dockerprettyps/__init__.py | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 setup.py diff --git a/setup.cfg b/setup.cfg index ed8e6b0..d25c2bb 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,12 +1,13 @@ [metadata] # replace with your username: name = docker-pretty-ps -version = 1.0.3 +version = 1.0.32 author = Alix Fullerton author_email = fullertonalix0@gmail.com description = CLI tool for docker ps reading in a pretty format long_description = file: README.md long_description_content_type = text/markdown +scripts=['src/dockerprettyps/bin/docker-pretty-ps'], url = https://github.com/politeauthority/docker-pretty-ps project_urls = Bug Tracker = https://github.com/politeauthority/docker-pretty-ps/issues diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..35f9f50 --- /dev/null +++ b/setup.py @@ -0,0 +1,6 @@ +import setuptools + + +setuptools.setup( + scripts=['src/dockerprettyps/bin/docker-pretty-ps'], +) diff --git a/src/dockerprettyps/__init__.py b/src/dockerprettyps/__init__.py index 25bce97..5c87479 100644 --- a/src/dockerprettyps/__init__.py +++ b/src/dockerprettyps/__init__.py @@ -36,7 +36,7 @@ from dockerprettyps import errors -__version__ = "1.0.3" +__version__ = "1.0.32" __title__ = """ _ _ _ _ __| |___ __| |_____ _ _ ___ _ __ _ _ ___| |_| |_ _ _ ___ _ __ ___ From 40794c6487eead13a39576600cc2414c2fe021e5 Mon Sep 17 00:00:00 2001 From: Alix Date: Thu, 22 Apr 2021 20:14:56 -0600 Subject: [PATCH 4/4] Bringing version numbers inline with 1.0.3 in preperation for release --- setup.cfg | 2 +- src/dockerprettyps/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index d25c2bb..fc5a020 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,7 @@ [metadata] # replace with your username: name = docker-pretty-ps -version = 1.0.32 +version = 1.0.3 author = Alix Fullerton author_email = fullertonalix0@gmail.com description = CLI tool for docker ps reading in a pretty format diff --git a/src/dockerprettyps/__init__.py b/src/dockerprettyps/__init__.py index d53dd92..6f868d9 100644 --- a/src/dockerprettyps/__init__.py +++ b/src/dockerprettyps/__init__.py @@ -36,7 +36,7 @@ from dockerprettyps import errors -__version__ = "1.0.32" +__version__ = "1.0.3" __title__ = """ _ _ _ _ __| |___ __| |_____ _ _ ___ _ __ _ _ ___| |_| |_ _ _ ___ _ __ ___