diff --git a/README.md b/README.md index 4ead54d..eda81d0 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ export PATH="${PATH}:/path/to/your/script" 6) Run drove cli -``` +```shell drove -h ``` @@ -98,18 +98,20 @@ options: To see documentation for a command/section: ``` $ drove cluster -h -usage: drove cluster [-h] {ping,summary,leader,endpoints,events} ... +usage: drove cluster [-h] {ping,summary,leader,endpoints,events,maintenance-on,maintenance-off} ... positional arguments: - {ping,summary,leader,endpoints,events} + {ping,summary,leader,endpoints,events,maintenance-on,maintenance-off} Available commands for cluster management ping Ping the cluster summary Show cluster summary leader Show leader for cluster endpoints Show all exposed endpoints events Events on the cluster + maintenance-on Set cluster to maintenance mode + maintenance-off Removed maintenance mode on cluster -optional arguments: +options: -h, --help show this help message and exit ``` @@ -242,17 +244,18 @@ usage: drove [-h] [--file FILE] [--cluster CLUSTER] [--endpoint ENDPOINT] [--aut ## Commands Commands in drove are meant to address specific functionality. They can be summarized as follows: ``` - executor Drove cluster executor related commands - cluster Drove cluster related commands - apps Drove application related commands - appinstances Drove application instance related commands - tasks Drove task related commands + list List all executors + info Show details about executor + appinstances Show app instances running on this executor + tasks Show tasks running on this executor + blacklist Blacklist executors + unblacklist Un-blacklist executors ``` ### executor --- Drove cluster executor related commands -``` +```shell drove executor [-h] {list,info,appinstances,tasks} ... ``` @@ -262,7 +265,7 @@ drove executor [-h] {list,info,appinstances,tasks} ... List all executors -``` +```shell drove executor list [-h] ``` @@ -270,7 +273,7 @@ drove executor list [-h] Show details about executor -``` +```shell drove executor info [-h] executor-id ``` @@ -282,7 +285,7 @@ drove executor info [-h] executor-id Show app instances running on this executor -``` +```shell drove executor appinstances [-h] [--sort {0,1,2,3,4,5}] [--reverse] executor-id ``` ###### Positional Arguments @@ -301,7 +304,7 @@ drove executor appinstances [-h] [--sort {0,1,2,3,4,5}] [--reverse] executor-id Show tasks running on this executor -``` +```shell drove executor tasks [-h] [--sort {0,1,2,3,4,5}] [--reverse] executor-id ``` @@ -316,12 +319,35 @@ drove executor tasks [-h] [--sort {0,1,2,3,4,5}] [--reverse] executor-id --reverse, -r Sort in reverse order ``` +##### blacklist + +Take executors out of rotation. + +```shell +drove executor blacklist executor-id [executor-id ...] +``` + +###### Positional Arguments + +`executor-id` - List of executor ids to be blacklisted. At least one is mandatory. + +##### unblacklist + +Bring blacklisted executors back into rotation. + +```shell +drove executor blacklist executor-id [executor-id ...] +``` + +###### Positional Arguments + +`executor-id` - List of executor ids to be blacklisted. At least one is mandatory. ### cluster --- Drove cluster related commands -``` +```shell drove cluster [-h] {ping,summary,leader,endpoints,events} ... ``` @@ -331,7 +357,7 @@ drove cluster [-h] {ping,summary,leader,endpoints,events} ... Ping the cluster -``` +```shell drove cluster ping [-h] ``` @@ -339,20 +365,20 @@ drove cluster ping [-h] Show cluster summary -``` +```shell drove cluster summary [-h] ``` ##### leader Show leader for cluster -``` +```shell drove cluster leader [-h] ``` ##### endpoints Show all exposed endpoints -``` +```shell drove cluster endpoints [-h] [--vhost VHOST] ``` @@ -367,7 +393,7 @@ drove cluster endpoints [-h] [--vhost VHOST] Events on the cluster -``` +```shell drove cluster events [-h] [--follow] [--type TYPE] [--count COUNT] [--textfmt TEXTFMT] ``` @@ -382,12 +408,24 @@ drove cluster events [-h] [--follow] [--type TYPE] [--count COUNT] [--textfmt TE Use the format string to print message Default: “{type: <25} | {id: <36} | {time: <20} | {metadata}” ``` +##### maintenance-on +Set cluster to maintenance mode. + +```shell +drove cluster maintenance-on +``` +##### maintenance-off +Set cluster to normal mode. + +```shell +drove cluster maintenance-off +``` ### apps --- Drove application related commands -``` +```shell drove apps [-h] {list,summary,spec,create,destroy,deploy,scale,suspend,restart,cancelop} ... ``` #### Sub-commands @@ -396,7 +434,7 @@ drove apps [-h] {list,summary,spec,create,destroy,deploy,scale,suspend,restart,c List all applications -``` +```shell drove apps list [-h] [--sort {0,1,2,3,4,5,6,7,8}] [--reverse] ``` @@ -411,7 +449,7 @@ drove apps list [-h] [--sort {0,1,2,3,4,5,6,7,8}] [--reverse] ##### summary Show a summary for an application -``` +```shell drove apps summary [-h] app-id ``` ###### Positional Arguments @@ -421,7 +459,7 @@ drove apps summary [-h] app-id ##### spec Print the raw json spec for an application -``` +```shell drove apps spec [-h] app-id ``` ###### Positional Arguments @@ -431,7 +469,7 @@ drove apps spec [-h] app-id ##### create Create application on cluster -``` +```shell drove apps create [-h] spec-file ``` ###### Positional Arguments @@ -441,7 +479,7 @@ drove apps create [-h] spec-file ##### destroy Destroy an app with zero instances -``` +```shell drove apps destroy [-h] app-id ``` ###### Positional Arguments @@ -451,7 +489,7 @@ drove apps destroy [-h] app-id ##### deploy Deploy new app instances. -``` +```shell drove apps deploy [-h] [--parallelism PARALLELISM] [--timeout TIMEOUT] app-id instances ``` ###### Positional Arguments @@ -472,7 +510,7 @@ drove apps deploy [-h] [--parallelism PARALLELISM] [--timeout TIMEOUT] app-id in Scale app to required instances. Will increase or decrease instances on the cluster to match this number -``` +```shell drove apps scale [-h] [--parallelism PARALLELISM] [--timeout TIMEOUT] app-id instances ``` ###### Positional Arguments @@ -493,7 +531,7 @@ drove apps scale [-h] [--parallelism PARALLELISM] [--timeout TIMEOUT] app-id ins ##### suspend Suspend the app -``` +```shell drove apps suspend [-h] [--parallelism PARALLELISM] [--timeout TIMEOUT] app-id ``` ###### Positional Arguments[¶](#Positional%20Arguments_repeat9 "Link to this heading") @@ -514,7 +552,7 @@ drove apps suspend [-h] [--parallelism PARALLELISM] [--timeout TIMEOUT] app-id Restart am existing app instances. -``` +```shell drove apps restart [-h] [--parallelism PARALLELISM] [--timeout TIMEOUT] app-id ``` @@ -533,7 +571,7 @@ drove apps restart [-h] [--parallelism PARALLELISM] [--timeout TIMEOUT] app-id ##### cancelop Cancel current operation -``` +```shell drove apps cancelop [-h] app-id ``` ###### Positional Arguments @@ -542,7 +580,7 @@ drove apps cancelop [-h] app-id ### appinstances --- Drove application instance related commands -``` +```shell drove appinstances [-h] {list,info,logs,tail,download,replace,kill} ... ``` #### Sub-commands @@ -550,7 +588,7 @@ drove appinstances [-h] {list,info,logs,tail,download,replace,kill} ... ##### list List all application instances -``` +```shell drove appinstances list [-h] [--old] [--sort {0,1,2,3,4,5}] [--reverse] app-id ``` ###### Positional Arguments @@ -567,7 +605,7 @@ drove appinstances list [-h] [--old] [--sort {0,1,2,3,4,5}] [--reverse] app-id ##### info Print details for an application instance -``` +```shell drove appinstances info [-h] app-id instance-id ``` ###### Positional Arguments @@ -577,7 +615,7 @@ drove appinstances info [-h] app-id instance-id ##### logs Print list of logs for application instance -``` +```shell drove appinstances logs [-h] app-id instance-id ``` ###### Positional Arguments @@ -588,7 +626,7 @@ drove appinstances logs [-h] app-id instance-id ##### tail Tail log for application instance -``` +```shell drove appinstances tail [-h] [--file FILE] app-id instance-id ``` ###### Positional Arguments @@ -605,7 +643,7 @@ drove appinstances tail [-h] [--file FILE] app-id instance-id ##### download Download log for application instance -``` +```shell drove appinstances download [-h] [--out OUT] app-id instance-id file ``` ###### Positional Arguments @@ -621,7 +659,7 @@ drove appinstances download [-h] [--out OUT] app-id instance-id file ##### replace Replace specific app instances with fresh instances -``` +```shell drove appinstances replace [-h] [--parallelism PARALLELISM] [--timeout TIMEOUT] app-id instance-id [instance-id ...] ``` ###### Positional Arguments @@ -640,7 +678,7 @@ drove appinstances replace [-h] [--parallelism PARALLELISM] [--timeout TIMEOUT] ##### kill Kill specific app instances -``` +```shell drove appinstances kill [-h] [--parallelism PARALLELISM] [--timeout TIMEOUT] app-id instance-id [instance-id ...] ``` ###### Positional Arguments @@ -659,7 +697,7 @@ drove appinstances kill [-h] [--parallelism PARALLELISM] [--timeout TIMEOUT] app ### tasks --- Drove task related commands -``` +```shell drove tasks [-h] {create,kill,list,show,logs,tail,download} ... ``` #### Sub-commands @@ -667,7 +705,7 @@ drove tasks [-h] {create,kill,list,show,logs,tail,download} ... ##### create Create a task on cluster -``` +```shell drove tasks create [-h] spec-file ``` ###### Positional Arguments @@ -677,7 +715,7 @@ drove tasks create [-h] spec-file ##### kill Kill a running task -``` +```shell drove tasks kill [-h] source-app-name task-id ``` ###### Positional Arguments @@ -688,7 +726,7 @@ drove tasks kill [-h] source-app-name task-id ##### list List all active tasks -``` +```shell drove tasks list [-h] [--app APP] [--sort {0,1,2,3,4,5,6,7,8}] [--reverse] ``` ###### Named Arguments @@ -701,7 +739,7 @@ drove tasks list [-h] [--app APP] [--sort {0,1,2,3,4,5,6,7,8}] [--reverse] ##### show Shows details about a task -``` +```shell drove tasks show [-h] source-app task-id ``` ###### Positional Arguments @@ -711,7 +749,7 @@ drove tasks show [-h] source-app task-id ##### logs Print list of logs for task -``` +```shell drove tasks logs [-h] source-app task-id ``` ###### Positional Arguments @@ -721,7 +759,7 @@ drove tasks logs [-h] source-app task-id ##### tail Tail log for task -``` +```shell drove tasks tail [-h] [--file FILE] source-app task-id ``` ###### Positional Arguments @@ -737,7 +775,7 @@ drove tasks tail [-h] [--file FILE] source-app task-id Download log for task -``` +```shell drove tasks download [-h] [--out OUT] source-app task-id file ``` ###### Positional Arguments diff --git a/droveclient.py b/droveclient.py index 1bb024a..711d1f2 100644 --- a/droveclient.py +++ b/droveclient.py @@ -70,9 +70,9 @@ def app_instances(self, app_id: str, healthy_only: bool = True): return set(instances) - def get(self, path: str, expected_status = 200) -> dict: + def get(self, path: str, params = None, expected_status = 200) -> dict: try: - response = self.session.get(self.endpoint + path) + response = self.session.get(self.endpoint + path, params=params) except requests.ConnectionError as e: raise DroveException(-1, "Error connecting to endpoint " + self.endpoint, raw={}) return handle_drove_response(response, expected_status) @@ -111,9 +111,9 @@ def get_to_file(self, path: str, filename: str, expected_status: int = 200) -> i except Exception as e: raise DroveException(-1, str(e)) - def post(self, path: str, body: dict, parse=True, expected_status = 200) -> dict: + def post(self, path: str, body: dict, params = None, parse=True, expected_status = 200) -> dict: try: - response = self.session.post(self.endpoint + path, json=body) + response = self.session.post(self.endpoint + path, json=body, params=params) except requests.ConnectionError as e: raise DroveException(-1, "Error connecting to endpoint " + self.endpoint, raw={}) return handle_drove_response(response, expected_status) diff --git a/plugins/executors.py b/plugins/executors.py index 1371e6a..b51afd3 100644 --- a/plugins/executors.py +++ b/plugins/executors.py @@ -2,11 +2,10 @@ from operator import itemgetter import droveclient import droveutils -import json import plugins -import time from types import SimpleNamespace +from urllib.parse import urlencode class Executors(plugins.DrovePlugin): def __init__(self) -> None: @@ -37,6 +36,14 @@ def populate_options(self, drove_client: droveclient.DroveClient, subparser: arg sub_parser.add_argument("--reverse", "-r", help="Sort in reverse order", action="store_true") sub_parser.set_defaults(func=self.show_tasks) + sub_parser = commands.add_parser("blacklist", help="Blacklist executors") + sub_parser.add_argument("executor_ids", nargs="+", metavar="executor-id", help="Executor IDs") + sub_parser.set_defaults(func=self.blacklist) + + sub_parser = commands.add_parser("unblacklist", help="Un-blacklist executors") + sub_parser.add_argument("executor_ids", nargs="+", metavar="executor-id", help="Executor IDs") + sub_parser.set_defaults(func=self.unblacklist) + super().populate_options(drove_client, parser) def list(self, options: SimpleNamespace): @@ -126,4 +133,31 @@ def show_tasks(self, options: SimpleNamespace): task_rows = sorted(task_rows, key=itemgetter(options.sort), reverse=options.reverse) headers = ["Id", "Source App", "Task ID", "State", "CPU", "Memory(MB)", "Created", "Updated"] - droveutils.print_table(headers, task_rows) \ No newline at end of file + droveutils.print_table(headers, task_rows) + + + def blacklist(self, options: SimpleNamespace): + try: + response = self.drove_client.post("/apis/v1/cluster/executors/blacklist", params={'id' : options.executor_ids}, body={}) + successful = response["successful"] + failed = response["failed"] + print("Successful: " + ",".join(successful)) + print("Failed: " + ",".join(failed)) + except droveclient.DroveException as e: + print("Error blacklisting: status: {status} message: {message} raw: {raw}" + .format(status = e.status_code, message = str(e), raw = e.raw)) + except Exception as e: + print("Error blacklisting: " + str(e)) + + def unblacklist(self, options: SimpleNamespace): + try: + response = self.drove_client.post("/apis/v1/cluster/executors/unblacklist", params={'id' : options.executor_ids}, body={}) + successful = response["successful"] + failed = response["failed"] + print("Successful: " + ",".join(successful)) + print("Failed: " + ",".join(failed)) + except droveclient.DroveException as e: + print("Error un-blacklisting: status: {status} message: {message} raw: {raw}" + .format(status = e.status_code, message = str(e), raw = e.raw)) + except Exception as e: + print("Error un-blacklisting: " + str(e)) diff --git a/poetry.lock b/poetry.lock index 84011ae..b4e92ef 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,34 +1,136 @@ +# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. + [[package]] name = "certifi" version = "2024.2.2" description = "Python package for providing Mozilla's CA Bundle." -category = "main" optional = false python-versions = ">=3.6" +files = [ + {file = "certifi-2024.2.2-py3-none-any.whl", hash = "sha256:dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1"}, + {file = "certifi-2024.2.2.tar.gz", hash = "sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f"}, +] [[package]] name = "charset-normalizer" version = "3.3.2" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." -category = "main" optional = false python-versions = ">=3.7.0" +files = [ + {file = "charset-normalizer-3.3.2.tar.gz", hash = "sha256:f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:25baf083bf6f6b341f4121c2f3c548875ee6f5339300e08be3f2b2ba1721cdd3"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9063e24fdb1e498ab71cb7419e24622516c4a04476b17a2dab57e8baa30d6e03"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6897af51655e3691ff853668779c7bad41579facacf5fd7253b0133308cf000d"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1d3193f4a680c64b4b6a9115943538edb896edc190f0b222e73761716519268e"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cd70574b12bb8a4d2aaa0094515df2463cb429d8536cfb6c7ce983246983e5a6"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a9a8e9031d613fd2009c182b69c7b2c1ef8239a0efb1df3f7c8da66d5dd3d537"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:beb58fe5cdb101e3a055192ac291b7a21e3b7ef4f67fa1d74e331a7f2124341c"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:e06ed3eb3218bc64786f7db41917d4e686cc4856944f53d5bdf83a6884432e12"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:2e81c7b9c8979ce92ed306c249d46894776a909505d8f5a4ba55b14206e3222f"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:572c3763a264ba47b3cf708a44ce965d98555f618ca42c926a9c1616d8f34269"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-win32.whl", hash = "sha256:3d47fa203a7bd9c5b6cee4736ee84ca03b8ef23193c0d1ca99b5089f72645c73"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-win_amd64.whl", hash = "sha256:10955842570876604d404661fbccbc9c7e684caf432c09c715ec38fbae45ae09"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:802fe99cca7457642125a8a88a084cef28ff0cf9407060f7b93dca5aa25480db"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:573f6eac48f4769d667c4442081b1794f52919e7edada77495aaed9236d13a96"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:549a3a73da901d5bc3ce8d24e0600d1fa85524c10287f6004fbab87672bf3e1e"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f27273b60488abe721a075bcca6d7f3964f9f6f067c8c4c605743023d7d3944f"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1ceae2f17a9c33cb48e3263960dc5fc8005351ee19db217e9b1bb15d28c02574"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:65f6f63034100ead094b8744b3b97965785388f308a64cf8d7c34f2f2e5be0c4"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:753f10e867343b4511128c6ed8c82f7bec3bd026875576dfd88483c5c73b2fd8"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4a78b2b446bd7c934f5dcedc588903fb2f5eec172f3d29e52a9096a43722adfc"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e537484df0d8f426ce2afb2d0f8e1c3d0b114b83f8850e5f2fbea0e797bd82ae"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:eb6904c354526e758fda7167b33005998fb68c46fbc10e013ca97f21ca5c8887"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:deb6be0ac38ece9ba87dea880e438f25ca3eddfac8b002a2ec3d9183a454e8ae"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:4ab2fe47fae9e0f9dee8c04187ce5d09f48eabe611be8259444906793ab7cbce"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:80402cd6ee291dcb72644d6eac93785fe2c8b9cb30893c1af5b8fdd753b9d40f"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-win32.whl", hash = "sha256:7cd13a2e3ddeed6913a65e66e94b51d80a041145a026c27e6bb76c31a853c6ab"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-win_amd64.whl", hash = "sha256:663946639d296df6a2bb2aa51b60a2454ca1cb29835324c640dafb5ff2131a77"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:0b2b64d2bb6d3fb9112bafa732def486049e63de9618b5843bcdd081d8144cd8"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:ddbb2551d7e0102e7252db79ba445cdab71b26640817ab1e3e3648dad515003b"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:55086ee1064215781fff39a1af09518bc9255b50d6333f2e4c74ca09fac6a8f6"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8f4a014bc36d3c57402e2977dada34f9c12300af536839dc38c0beab8878f38a"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a10af20b82360ab00827f916a6058451b723b4e65030c5a18577c8b2de5b3389"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8d756e44e94489e49571086ef83b2bb8ce311e730092d2c34ca8f7d925cb20aa"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6ac7ffc7ad6d040517be39eb591cac5ff87416c2537df6ba3cba3bae290c0fed"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:7ed9e526742851e8d5cc9e6cf41427dfc6068d4f5a3bb03659444b4cabf6bc26"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:8bdb58ff7ba23002a4c5808d608e4e6c687175724f54a5dade5fa8c67b604e4d"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:6b3251890fff30ee142c44144871185dbe13b11bab478a88887a639655be1068"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:b4a23f61ce87adf89be746c8a8974fe1c823c891d8f86eb218bb957c924bb143"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:efcb3f6676480691518c177e3b465bcddf57cea040302f9f4e6e191af91174d4"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-win32.whl", hash = "sha256:d965bba47ddeec8cd560687584e88cf699fd28f192ceb452d1d7ee807c5597b7"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-win_amd64.whl", hash = "sha256:96b02a3dc4381e5494fad39be677abcb5e6634bf7b4fa83a6dd3112607547001"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:95f2a5796329323b8f0512e09dbb7a1860c46a39da62ecb2324f116fa8fdc85c"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c002b4ffc0be611f0d9da932eb0f704fe2602a9a949d1f738e4c34c75b0863d5"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a981a536974bbc7a512cf44ed14938cf01030a99e9b3a06dd59578882f06f985"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3287761bc4ee9e33561a7e058c72ac0938c4f57fe49a09eae428fd88aafe7bb6"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:42cb296636fcc8b0644486d15c12376cb9fa75443e00fb25de0b8602e64c1714"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0a55554a2fa0d408816b3b5cedf0045f4b8e1a6065aec45849de2d6f3f8e9786"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:c083af607d2515612056a31f0a8d9e0fcb5876b7bfc0abad3ecd275bc4ebc2d5"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:87d1351268731db79e0f8e745d92493ee2841c974128ef629dc518b937d9194c"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:bd8f7df7d12c2db9fab40bdd87a7c09b1530128315d047a086fa3ae3435cb3a8"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:c180f51afb394e165eafe4ac2936a14bee3eb10debc9d9e4db8958fe36afe711"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:8c622a5fe39a48f78944a87d4fb8a53ee07344641b0562c540d840748571b811"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-win32.whl", hash = "sha256:db364eca23f876da6f9e16c9da0df51aa4f104a972735574842618b8c6d999d4"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-win_amd64.whl", hash = "sha256:86216b5cee4b06df986d214f664305142d9c76df9b6512be2738aa72a2048f99"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:6463effa3186ea09411d50efc7d85360b38d5f09b870c48e4600f63af490e56a"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6c4caeef8fa63d06bd437cd4bdcf3ffefe6738fb1b25951440d80dc7df8c03ac"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:37e55c8e51c236f95b033f6fb391d7d7970ba5fe7ff453dad675e88cf303377a"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fb69256e180cb6c8a894fee62b3afebae785babc1ee98b81cdf68bbca1987f33"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ae5f4161f18c61806f411a13b0310bea87f987c7d2ecdbdaad0e94eb2e404238"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b2b0a0c0517616b6869869f8c581d4eb2dd83a4d79e0ebcb7d373ef9956aeb0a"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:45485e01ff4d3630ec0d9617310448a8702f70e9c01906b0d0118bdf9d124cf2"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:eb00ed941194665c332bf8e078baf037d6c35d7c4f3102ea2d4f16ca94a26dc8"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:2127566c664442652f024c837091890cb1942c30937add288223dc895793f898"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a50aebfa173e157099939b17f18600f72f84eed3049e743b68ad15bd69b6bf99"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:4d0d1650369165a14e14e1e47b372cfcb31d6ab44e6e33cb2d4e57265290044d"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:923c0c831b7cfcb071580d3f46c4baf50f174be571576556269530f4bbd79d04"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-win32.whl", hash = "sha256:6ef1d82a3af9d3eecdba2321dc1b3c238245d890843e040e41e470ffa64c3e25"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-win_amd64.whl", hash = "sha256:eb8821e09e916165e160797a6c17edda0679379a4be5c716c260e836e122f54b"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:c235ebd9baae02f1b77bcea61bce332cb4331dc3617d254df3323aa01ab47bd4"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5b4c145409bef602a690e7cfad0a15a55c13320ff7a3ad7ca59c13bb8ba4d45d"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:68d1f8a9e9e37c1223b656399be5d6b448dea850bed7d0f87a8311f1ff3dabb0"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:22afcb9f253dac0696b5a4be4a1c0f8762f8239e21b99680099abd9b2b1b2269"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e27ad930a842b4c5eb8ac0016b0a54f5aebbe679340c26101df33424142c143c"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1f79682fbe303db92bc2b1136016a38a42e835d932bab5b3b1bfcfbf0640e519"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b261ccdec7821281dade748d088bb6e9b69e6d15b30652b74cbbac25e280b796"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:122c7fa62b130ed55f8f285bfd56d5f4b4a5b503609d181f9ad85e55c89f4185"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:d0eccceffcb53201b5bfebb52600a5fb483a20b61da9dbc885f8b103cbe7598c"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9f96df6923e21816da7e0ad3fd47dd8f94b2a5ce594e00677c0013018b813458"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:7f04c839ed0b6b98b1a7501a002144b76c18fb1c1850c8b98d458ac269e26ed2"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:34d1c8da1e78d2e001f363791c98a272bb734000fcef47a491c1e3b0505657a8"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-win32.whl", hash = "sha256:aed38f6e4fb3f5d6bf81bfa990a07806be9d83cf7bacef998ab1a9bd660a581f"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-win_amd64.whl", hash = "sha256:b01b88d45a6fcb69667cd6d2f7a9aeb4bf53760d7fc536bf679ec94fe9f3ff3d"}, + {file = "charset_normalizer-3.3.2-py3-none-any.whl", hash = "sha256:3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc"}, +] [[package]] name = "idna" version = "3.6" description = "Internationalized Domain Names in Applications (IDNA)" -category = "main" optional = false python-versions = ">=3.5" +files = [ + {file = "idna-3.6-py3-none-any.whl", hash = "sha256:c05567e9c24a6b9faaa835c4821bad0590fbb9d5779e7caa6e1cc4978e7eb24f"}, + {file = "idna-3.6.tar.gz", hash = "sha256:9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca"}, +] [[package]] name = "requests" version = "2.31.0" description = "Python HTTP for Humans." -category = "main" optional = false python-versions = ">=3.7" +files = [ + {file = "requests-2.31.0-py3-none-any.whl", hash = "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f"}, + {file = "requests-2.31.0.tar.gz", hash = "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"}, +] [package.dependencies] certifi = ">=2017.4.17" @@ -38,15 +140,18 @@ urllib3 = ">=1.21.1,<3" [package.extras] socks = ["PySocks (>=1.5.6,!=1.5.7)"] -use_chardet_on_py3 = ["chardet (>=3.0.2,<6)"] +use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] [[package]] name = "tabulate" version = "0.9.0" description = "Pretty-print tabular data" -category = "main" optional = false python-versions = ">=3.7" +files = [ + {file = "tabulate-0.9.0-py3-none-any.whl", hash = "sha256:024ca478df22e9340661486f85298cff5f6dcdba14f3813e8830015b9ed1948f"}, + {file = "tabulate-0.9.0.tar.gz", hash = "sha256:0095b12bf5966de529c0feb1fa08671671b3368eec77d7ef7ab114be2c068b3c"}, +] [package.extras] widechars = ["wcwidth"] @@ -55,9 +160,12 @@ widechars = ["wcwidth"] name = "tenacity" version = "8.2.3" description = "Retry code until it succeeds" -category = "main" optional = false python-versions = ">=3.7" +files = [ + {file = "tenacity-8.2.3-py3-none-any.whl", hash = "sha256:ce510e327a630c9e1beaf17d42e6ffacc88185044ad85cf74c0a8887c6a0f88c"}, + {file = "tenacity-8.2.3.tar.gz", hash = "sha256:5398ef0d78e63f40007c1fb4c0bff96e1911394d2fa8d194f77619c05ff6cc8a"}, +] [package.extras] doc = ["reno", "sphinx", "tornado (>=4.5)"] @@ -66,9 +174,12 @@ doc = ["reno", "sphinx", "tornado (>=4.5)"] name = "urllib3" version = "2.0.7" description = "HTTP library with thread-safe connection pooling, file post, and more." -category = "main" optional = false python-versions = ">=3.7" +files = [ + {file = "urllib3-2.0.7-py3-none-any.whl", hash = "sha256:fdb6d215c776278489906c2f8916e6e7d4f5a9b602ccbcfdf7f016fc8da0596e"}, + {file = "urllib3-2.0.7.tar.gz", hash = "sha256:c97dfde1f7bd43a71c8d2a58e369e9b2bf692d1334ea9f9cae55add7d0dd0f84"}, +] [package.extras] brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)"] @@ -77,15 +188,6 @@ socks = ["pysocks (>=1.5.6,!=1.5.7,<2.0)"] zstd = ["zstandard (>=0.18.0)"] [metadata] -lock-version = "1.1" +lock-version = "2.0" python-versions = "^3.7" content-hash = "fbcdda4a9325dd19038849ab36235c8038584537b78f2dca096d819f253b1253" - -[metadata.files] -certifi = [] -charset-normalizer = [] -idna = [] -requests = [] -tabulate = [] -tenacity = [] -urllib3 = [] diff --git a/pyproject.toml b/pyproject.toml index cf1a845..7221c6e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "drove-cli" -version = "0.0.1" +version = "0.0.2" description = "Drove Command Line Interface" authors = ["Santanu Sinha "] maintainers = [ diff --git a/requirements.txt b/requirements.txt index 63c6297..7607a2f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ Requests==2.31.0 tabulate==0.9.0 tenacity==8.2.3 -urllib3==1.25.8 -urllib3==1.26.5 +urllib3==2.0.7