From b5db79c6d59daac78b85128c8878631f29fc74e3 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Fri, 6 Oct 2023 13:15:03 -0400 Subject: [PATCH] update magma-suite to 1.5.0.3b6 and dcicutils to 8.0.0 --- poetry.lock | 50 +++++++++++++++++++++++++++++++------------------- pyproject.toml | 6 +++--- 2 files changed, 34 insertions(+), 22 deletions(-) diff --git a/poetry.lock b/poetry.lock index 9b9eb52..f38a53c 100644 --- a/poetry.lock +++ b/poetry.lock @@ -670,22 +670,23 @@ test-randomorder = ["pytest-randomly"] [[package]] name = "dcicutils" -version = "7.12.0.2b9" +version = "8.0.0" description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources" optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "dcicutils-7.12.0.2b9-py3-none-any.whl", hash = "sha256:12d3e6cd0f26ad7e464a5e8c7c646d28d23f63a1e423ca4fa7ae536f3b9fd4d2"}, - {file = "dcicutils-7.12.0.2b9.tar.gz", hash = "sha256:ef0da351164cd2495e5570d393c6564fdf8dab1f60a1b613c40dfd405693894e"}, + {file = "dcicutils-8.0.0-py3-none-any.whl", hash = "sha256:339834dd93a70fdc26d1c552273c1390275ba637583bbec41a4a8035270b0c72"}, + {file = "dcicutils-8.0.0.tar.gz", hash = "sha256:50aafbe2dce173bb6779184be0db8497d818a41b62bd686851cf64de507c5b76"}, ] [package.dependencies] aws-requests-auth = ">=0.4.2,<1" -boto3 = ">=1.28.54,<2.0.0" -botocore = ">=1.31.54,<2.0.0" +boto3 = ">=1.28.57,<2.0.0" +botocore = ">=1.31.57,<2.0.0" docker = ">=4.4.4,<5.0.0" elasticsearch = "7.13.4" gitpython = ">=3.1.2,<4.0.0" +jsonc-parser = ">=1.1.5,<2.0.0" opensearch-py = ">=2.0.1,<3.0.0" PyJWT = ">=2.6.0,<3.0.0" pyOpenSSL = ">=23.1.1,<24.0.0" @@ -850,6 +851,17 @@ files = [ {file = "jmespath-1.0.1.tar.gz", hash = "sha256:90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe"}, ] +[[package]] +name = "jsonc-parser" +version = "1.1.5" +description = "A lightweight, native tool for parsing .jsonc files" +optional = false +python-versions = ">=3.5" +files = [ + {file = "jsonc-parser-1.1.5.tar.gz", hash = "sha256:7126d17725b0413cd40af4297d9f6412c4181a62135e4c41cdf8f6a82c5936e6"}, + {file = "jsonc_parser-1.1.5-py3-none-any.whl", hash = "sha256:abd1db76a4c6d1733ec7bb5340a89c49cbc878a181a1e7947ee6719eedf2c6cc"}, +] + [[package]] name = "jsonschema" version = "4.19.1" @@ -890,18 +902,18 @@ referencing = ">=0.28.0" [[package]] name = "magma-suite" -version = "1.5.0.3b5" +version = "1.5.0.3b6" description = "Collection of tools to manage meta-workflows automation." optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "magma_suite-1.5.0.3b5-py3-none-any.whl", hash = "sha256:bc9b97bae6dc2457cd66bd965238836e7a9d952c08417086e7ecf63abc47480b"}, - {file = "magma_suite-1.5.0.3b5.tar.gz", hash = "sha256:85aa56cb69fb42377a95ceec80015e028dfa8d1262bc7539fe92be3fccafaccf"}, + {file = "magma_suite-1.5.0.3b6-py3-none-any.whl", hash = "sha256:32bc67b5af6af2b5b70a4369cb044a85881b733358d8b42b527dd448c9493f8b"}, + {file = "magma_suite-1.5.0.3b6.tar.gz", hash = "sha256:1698e8ffc97371febbb7cac54e7f162405453673ffe9aa5594b743b3d21fef1e"}, ] [package.dependencies] -dcicutils = "7.12.0.2b9" -tibanna-ff = "2.0.1.1b10" +dcicutils = "8.0.0" +tibanna-ff = "3.0.0.1b2" [[package]] name = "opensearch-py" @@ -1414,13 +1426,13 @@ tests = ["coverage", "freezegun (>=0.2.8)", "pretend", "pytest (>=3.3.0)", "pyth [[package]] name = "tibanna" -version = "4.0.0.1b4" +version = "5.0.0.1b4" description = "Tibanna runs portable pipelines (in CWL/WDL) on the AWS Cloud." optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "tibanna-4.0.0.1b4-py3-none-any.whl", hash = "sha256:f3fde1244f3a52641bdb0cdfd2688f46e3b31197b195b05f7fbb3161df2d4dfb"}, - {file = "tibanna-4.0.0.1b4.tar.gz", hash = "sha256:6a8a8a4a2daa6c0c079ed9db764dd107ea97b0d1356941b90831f4437b24fbab"}, + {file = "tibanna-5.0.0.1b4-py3-none-any.whl", hash = "sha256:f79a0b6c8d9bf6a107950e0e350061ae6d98e429582d3af990b8b9480e49bb60"}, + {file = "tibanna-5.0.0.1b4.tar.gz", hash = "sha256:29390ce6250d11bee9c1d20724516d35a35c0be31f619f9ce74f67b40cd4241a"}, ] [package.dependencies] @@ -1432,21 +1444,21 @@ tomlkit = ">=0.11.0,<0.12.0" [[package]] name = "tibanna-ff" -version = "2.0.1.1b10" +version = "3.0.0.1b2" description = "Tibanna runs portable pipelines (in CWL/WDL) on the AWS Cloud." optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "tibanna_ff-2.0.1.1b10-py3-none-any.whl", hash = "sha256:0e482f6cf98bfa18b4353e91686da176d4cdc1b4636b5cc0bde1529bd70ef0bd"}, - {file = "tibanna_ff-2.0.1.1b10.tar.gz", hash = "sha256:f08ad73325dce65157c36a780b8e0252ec56829dae17b0960bd86faae18aa594"}, + {file = "tibanna_ff-3.0.0.1b2-py3-none-any.whl", hash = "sha256:3aea44426870de0ef9f18c602cc5e5cf2a45ecf7ed53833738c0e735cd6fda57"}, + {file = "tibanna_ff-3.0.0.1b2.tar.gz", hash = "sha256:f5e65028afdd862eec5db2f6d6d546d94337ff5dfbe8f6c8cbd9fb60f19b6c89"}, ] [package.dependencies] boto3 = ">=1.28.56,<2.0.0" botocore = ">=1.31.56,<2.0.0" -dcicutils = "7.12.0.2b9" +dcicutils = "8.0.0" requests = "2.27.1" -tibanna = "4.0.0.1b4" +tibanna = "5.0.0.1b4" tomlkit = ">=0.11.0,<0.12.0" [[package]] @@ -1636,4 +1648,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.12" -content-hash = "75f34b09d0e37e6cac95012c03b7a3bead34a2a24e38237c351eefb3eca304eb" +content-hash = "16dd9cba288db21e384e61dd61e204cff0da001fa87d7d3a6d3bebfbb9efb952" diff --git a/pyproject.toml b/pyproject.toml index a361d77..f033a5b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "portal-pipeline-utils" -version = "2.1.0.1b5" # TODO: To become 3.0.0 +version = "2.1.0.1b6" # TODO: To become 3.0.0 description = "Utilities for deploying pipelines and interfacing with portal infrastructure." authors = [ "Michele Berselli ", @@ -22,11 +22,11 @@ packages = [ [tool.poetry.dependencies] python = ">=3.8,<3.12" -dcicutils = "7.12.0.2b9" +dcicutils = "8.0.0" boto3 = "^1.28.60" awscli = "^1.29.60" jsonschema = "^4.7.2" -magma-suite = "1.5.0.3b5" +magma-suite = "1.5.0.3b6" [tool.poetry.dev-dependencies]