diff --git a/CHANGELOG/CHANGELOG.md b/CHANGELOG/CHANGELOG.md index 41e60db1..7ab50967 100644 --- a/CHANGELOG/CHANGELOG.md +++ b/CHANGELOG/CHANGELOG.md @@ -1,3 +1,10 @@ +## [1.17.1](https://github.com/rapyuta-robotics/rapyuta-io-sdk/compare/v1.17.0...v1.17.1) (2024-09-12) + + +### Bug Fixes + +* force bump release version ([dfd78f0](https://github.com/rapyuta-robotics/rapyuta-io-sdk/commit/dfd78f0ad84a96a72748f20d1f58924b4cccc416)) + # [1.17.0](https://github.com/rapyuta-robotics/rapyuta-io-sdk/compare/v1.16.0...v1.17.0) (2024-08-01) diff --git a/Pipfile b/Pipfile index f5783fda..d3340ee5 100644 --- a/Pipfile +++ b/Pipfile @@ -9,7 +9,6 @@ six = ">=1.13.0" urllib3 = ">=1.23" python-dateutil = ">=2.8.1" pytz = "*" -jsonschema = "==4.0.0" pyyaml = ">=5.4.1" [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock index 225f1e4a..65be36d2 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "a25c5a55061087b7c343ff4f29be7d0a33ef1a7731a4534d114e5935237177dc" + "sha256": "0a53a758dbc0c347e9a6210b085c78308c6e012da7c1bd30420c6ad6635eea45" }, "pipfile-spec": 6, "requires": { @@ -16,21 +16,13 @@ ] }, "default": { - "attrs": { - "hashes": [ - "sha256:935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30", - "sha256:99b87a485a5820b23b879f04c2305b44b951b502fd64be915879d77a7e8fc6f1" - ], - "markers": "python_version >= '3.7'", - "version": "==23.2.0" - }, "certifi": { "hashes": [ - "sha256:3cd43f1c6fa7dedc5899d69d3ad0398fd018ad1a17fba83ddaf78aa46c747516", - "sha256:ddc6c8ce995e6987e7faf5e3f1b02b302836a0e5d98ece18392cb1a36c72ad56" + "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b", + "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90" ], "markers": "python_version >= '3.6'", - "version": "==2024.6.2" + "version": "==2024.7.4" }, "charset-normalizer": { "hashes": [ @@ -136,58 +128,13 @@ "markers": "python_version >= '3.5'", "version": "==3.7" }, - "jsonschema": { - "hashes": [ - "sha256:bc51325b929171791c42ebc1c70b9713eb134d3bb8ebd5474c8b659b15be6d86", - "sha256:c773028c649441ab980015b5b622f4cd5134cf563daaf0235ca4b73cc3734f20" - ], - "index": "pypi", - "version": "==4.0.0" - }, - "pyrsistent": { - "hashes": [ - "sha256:0724c506cd8b63c69c7f883cc233aac948c1ea946ea95996ad8b1380c25e1d3f", - "sha256:09848306523a3aba463c4b49493a760e7a6ca52e4826aa100ee99d8d39b7ad1e", - "sha256:0f3b1bcaa1f0629c978b355a7c37acd58907390149b7311b5db1b37648eb6958", - "sha256:21cc459636983764e692b9eba7144cdd54fdec23ccdb1e8ba392a63666c60c34", - "sha256:2e14c95c16211d166f59c6611533d0dacce2e25de0f76e4c140fde250997b3ca", - "sha256:2e2c116cc804d9b09ce9814d17df5edf1df0c624aba3b43bc1ad90411487036d", - "sha256:4021a7f963d88ccd15b523787d18ed5e5269ce57aa4037146a2377ff607ae87d", - "sha256:4c48f78f62ab596c679086084d0dd13254ae4f3d6c72a83ffdf5ebdef8f265a4", - "sha256:4f5c2d012671b7391803263419e31b5c7c21e7c95c8760d7fc35602353dee714", - "sha256:58b8f6366e152092194ae68fefe18b9f0b4f89227dfd86a07770c3d86097aebf", - "sha256:59a89bccd615551391f3237e00006a26bcf98a4d18623a19909a2c48b8e986ee", - "sha256:5cdd7ef1ea7a491ae70d826b6cc64868de09a1d5ff9ef8d574250d0940e275b8", - "sha256:6288b3fa6622ad8a91e6eb759cfc48ff3089e7c17fb1d4c59a919769314af224", - "sha256:6d270ec9dd33cdb13f4d62c95c1a5a50e6b7cdd86302b494217137f760495b9d", - "sha256:79ed12ba79935adaac1664fd7e0e585a22caa539dfc9b7c7c6d5ebf91fb89054", - "sha256:7d29c23bdf6e5438c755b941cef867ec2a4a172ceb9f50553b6ed70d50dfd656", - "sha256:8441cf9616d642c475684d6cf2520dd24812e996ba9af15e606df5f6fd9d04a7", - "sha256:881bbea27bbd32d37eb24dd320a5e745a2a5b092a17f6debc1349252fac85423", - "sha256:8c3aba3e01235221e5b229a6c05f585f344734bd1ad42a8ac51493d74722bbce", - "sha256:a14798c3005ec892bbada26485c2eea3b54109cb2533713e355c806891f63c5e", - "sha256:b14decb628fac50db5e02ee5a35a9c0772d20277824cfe845c8a8b717c15daa3", - "sha256:b318ca24db0f0518630e8b6f3831e9cba78f099ed5c1d65ffe3e023003043ba0", - "sha256:c1beb78af5423b879edaf23c5591ff292cf7c33979734c99aa66d5914ead880f", - "sha256:c55acc4733aad6560a7f5f818466631f07efc001fd023f34a6c203f8b6df0f0b", - "sha256:ca52d1ceae015859d16aded12584c59eb3825f7b50c6cfd621d4231a6cc624ce", - "sha256:cae40a9e3ce178415040a0383f00e8d68b569e97f31928a3a8ad37e3fde6df6a", - "sha256:e78d0c7c1e99a4a45c99143900ea0546025e41bb59ebc10182e947cf1ece9174", - "sha256:ef3992833fbd686ee783590639f4b8343a57f1f75de8633749d984dc0eb16c86", - "sha256:f058a615031eea4ef94ead6456f5ec2026c19fb5bd6bfe86e9665c4158cf802f", - "sha256:f5ac696f02b3fc01a710427585c855f65cd9c640e14f52abe52020722bb4906b", - "sha256:f920385a11207dc372a028b3f1e1038bb244b3ec38d448e6d8e43c6b3ba20e98", - "sha256:fed2c3216a605dc9a6ea50c7e84c82906e3684c4e80d2908208f662a6cbf9022" - ], - "markers": "python_version >= '3.8'", - "version": "==0.20.0" - }, "python-dateutil": { "hashes": [ "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3", "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427" ], "index": "pypi", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.9.0.post0" }, "pytz": { @@ -253,6 +200,7 @@ "sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f" ], "index": "pypi", + "markers": "python_version >= '3.6'", "version": "==6.0.1" }, "requests": { @@ -261,6 +209,7 @@ "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6" ], "index": "pypi", + "markers": "python_version >= '3.8'", "version": "==2.32.3" }, "six": { @@ -269,6 +218,7 @@ "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" ], "index": "pypi", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.16.0" }, "urllib3": { @@ -277,6 +227,7 @@ "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168" ], "index": "pypi", + "markers": "python_version >= '3.8'", "version": "==2.2.2" } }, @@ -326,6 +277,7 @@ "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" ], "index": "pypi", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.16.0" }, "testtools": { @@ -334,6 +286,7 @@ "sha256:798525999f053e4df4e352c0c198baeb9f5079f34bad5bd57a44e97a54fa0330" ], "index": "pypi", + "markers": "python_version >= '3.5'", "version": "==2.5.0" } }, @@ -364,11 +317,11 @@ }, "certifi": { "hashes": [ - "sha256:3cd43f1c6fa7dedc5899d69d3ad0398fd018ad1a17fba83ddaf78aa46c747516", - "sha256:ddc6c8ce995e6987e7faf5e3f1b02b302836a0e5d98ece18392cb1a36c72ad56" + "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b", + "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90" ], "markers": "python_version >= '3.6'", - "version": "==2024.6.2" + "version": "==2024.7.4" }, "charset-normalizer": { "hashes": [ @@ -480,6 +433,7 @@ "sha256:81f205a6605ebccbb883350432b4831c0196dd3d1bc92f61e1f459045b3d2b0b" ], "index": "pypi", + "markers": "python_version >= '3.8'", "version": "==2024.5.6" }, "idna": { @@ -602,6 +556,7 @@ "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6" ], "index": "pypi", + "markers": "python_version >= '3.8'", "version": "==2.32.3" }, "snowballstemmer": { @@ -625,6 +580,7 @@ "sha256:a4a7db75ed37531c05002d56ed6948d4c42f473a36f46e1382b0bd76ca9627bc" ], "index": "pypi", + "markers": "python_version >= '3.9'", "version": "==7.3.7" }, "sphinx-basic-ng": { @@ -683,20 +639,13 @@ "markers": "python_version >= '3.9'", "version": "==1.1.10" }, - "tomli": { - "hashes": [ - "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", - "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f" - ], - "markers": "python_version < '3.11'", - "version": "==2.0.1" - }, "tzdata": { "hashes": [ "sha256:2674120f8d891909751c38abcdfd386ac0a5a1127954fbc332af6b5ceae07efd", "sha256:9068bc196136463f5245e51efda838afa15aaeca9903f49050dfa2679db4d252" ], "index": "pypi", + "markers": "python_version >= '2'", "version": "==2024.1" }, "urllib3": { @@ -705,6 +654,7 @@ "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168" ], "index": "pypi", + "markers": "python_version >= '3.8'", "version": "==2.2.2" } } diff --git a/rapyuta_io/__init__.py b/rapyuta_io/__init__.py index b4fb4322..9c2039e5 100644 --- a/rapyuta_io/__init__.py +++ b/rapyuta_io/__init__.py @@ -15,4 +15,4 @@ from .clients.rosbag import UploadOptions from .clients.user_group import UserGroup -__version__ = "1.17.0" +__version__ = "1.17.1" diff --git a/rapyuta_io/rio_client.py b/rapyuta_io/rio_client.py index 311fe563..a4c9ec0e 100644 --- a/rapyuta_io/rio_client.py +++ b/rapyuta_io/rio_client.py @@ -2,7 +2,6 @@ from __future__ import absolute_import import json -import jsonschema import os import six @@ -13,27 +12,20 @@ from rapyuta_io.clients.core_api_client import CoreAPIClient from rapyuta_io.clients.deployment import Deployment from rapyuta_io.clients.device import Device -from rapyuta_io.clients.metrics import QueryMetricsRequest, MetricOperation, \ - MetricFunction, QueryMetricsResponse, \ - ListMetricsRequest, ListTagKeysRequest, \ - Metric, Tags, ListTagValuesRequest +from rapyuta_io.clients.metrics import ListMetricsRequest, ListTagKeysRequest, ListTagValuesRequest, Metric, \ + MetricFunction, MetricOperation, QueryMetricsRequest, QueryMetricsResponse, Tags from rapyuta_io.clients.native_network import NativeNetwork -from rapyuta_io.clients.package import Package -from rapyuta_io.clients.package import Runtime, ROSDistro, RestartPolicy +from rapyuta_io.clients.package import Package, ROSDistro, RestartPolicy, Runtime from rapyuta_io.clients.persistent_volumes import VolumeInstance from rapyuta_io.clients.project import Project -from rapyuta_io.clients.rip_client import RIPClient, AuthTokenLevel -from rapyuta_io.clients.rosbag import ROSBagJob, ROSBagJobStatus, ROSBagBlob, \ - ROSBagBlobStatus -from rapyuta_io.clients.routed_network import RoutedNetwork, Parameters +from rapyuta_io.clients.rip_client import AuthTokenLevel, RIPClient +from rapyuta_io.clients.rosbag import ROSBagBlob, ROSBagBlobStatus, ROSBagJob, ROSBagJobStatus +from rapyuta_io.clients.routed_network import Parameters, RoutedNetwork from rapyuta_io.clients.secret import Secret from rapyuta_io.clients.user_group import UserGroup -from rapyuta_io.utils import InvalidAuthTokenException, \ - InvalidParameterException -from rapyuta_io.utils import to_objdict +from rapyuta_io.utils import InvalidAuthTokenException, InvalidParameterException, to_objdict from rapyuta_io.utils.settings import VOLUME_PACKAGE_ID, default_host_config from rapyuta_io.utils.utils import get_api_response_data, valid_list_elements -from rapyuta_io.clients.validation_schema import UPDATE_DEPLOYMENT_SCHEMA class Client(object): @@ -356,7 +348,6 @@ def update_deployment(self, payload, retry_limit=0): >>> status = client.update_deployment(payload) """ - jsonschema.validate(instance=payload, schema=UPDATE_DEPLOYMENT_SCHEMA) return self._catalog_client.update_deployment(payload, retry_limit) def get_authenticated_user(self): diff --git a/setup.py b/setup.py index cf488839..89d423f2 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,6 @@ "pytz", "pyyaml>=5.4.1", "setuptools", - "jsonschema==4.0.0", ], extras_require={ "dev": ["sphinx", "furo"],