From f0f641ea6ae86d287ad0716c48708abb9f154c3b Mon Sep 17 00:00:00 2001 From: David Michaels Date: Wed, 11 Oct 2023 09:19:31 -0400 Subject: [PATCH 01/21] new portal reindex page --- CHANGELOG.rst | 6 ++ poetry.lock | 210 +++++++++++++------------------------------------ pyproject.toml | 6 +- 3 files changed, 63 insertions(+), 159 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index dd844e91..c0452348 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,6 +7,12 @@ foursight Change Log ---------- + +4.1.0 +===== + +* New Portal Reindex page. + 4.0.0 ===== diff --git a/poetry.lock b/poetry.lock index c7c9cb12..7f7895d1 100644 --- a/poetry.lock +++ b/poetry.lock @@ -382,34 +382,34 @@ dev = ["polib"] [[package]] name = "cryptography" -version = "39.0.2" +version = "41.0.4" description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" files = [ - {file = "cryptography-39.0.2-cp36-abi3-macosx_10_12_universal2.whl", hash = "sha256:2725672bb53bb92dc7b4150d233cd4b8c59615cd8288d495eaa86db00d4e5c06"}, - {file = "cryptography-39.0.2-cp36-abi3-macosx_10_12_x86_64.whl", hash = "sha256:23df8ca3f24699167daf3e23e51f7ba7334d504af63a94af468f468b975b7dd7"}, - {file = "cryptography-39.0.2-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:eb40fe69cfc6f5cdab9a5ebd022131ba21453cf7b8a7fd3631f45bbf52bed612"}, - {file = "cryptography-39.0.2-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bc0521cce2c1d541634b19f3ac661d7a64f9555135e9d8af3980965be717fd4a"}, - {file = "cryptography-39.0.2-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ffd394c7896ed7821a6d13b24657c6a34b6e2650bd84ae063cf11ccffa4f1a97"}, - {file = "cryptography-39.0.2-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:e8a0772016feeb106efd28d4a328e77dc2edae84dfbac06061319fdb669ff828"}, - {file = "cryptography-39.0.2-cp36-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:8f35c17bd4faed2bc7797d2a66cbb4f986242ce2e30340ab832e5d99ae60e011"}, - {file = "cryptography-39.0.2-cp36-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:b49a88ff802e1993b7f749b1eeb31134f03c8d5c956e3c125c75558955cda536"}, - {file = "cryptography-39.0.2-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:5f8c682e736513db7d04349b4f6693690170f95aac449c56f97415c6980edef5"}, - {file = "cryptography-39.0.2-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:d7d84a512a59f4412ca8549b01f94be4161c94efc598bf09d027d67826beddc0"}, - {file = "cryptography-39.0.2-cp36-abi3-win32.whl", hash = "sha256:c43ac224aabcbf83a947eeb8b17eaf1547bce3767ee2d70093b461f31729a480"}, - {file = "cryptography-39.0.2-cp36-abi3-win_amd64.whl", hash = "sha256:788b3921d763ee35dfdb04248d0e3de11e3ca8eb22e2e48fef880c42e1f3c8f9"}, - {file = "cryptography-39.0.2-pp38-pypy38_pp73-macosx_10_12_x86_64.whl", hash = "sha256:d15809e0dbdad486f4ad0979753518f47980020b7a34e9fc56e8be4f60702fac"}, - {file = "cryptography-39.0.2-pp38-pypy38_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:50cadb9b2f961757e712a9737ef33d89b8190c3ea34d0fb6675e00edbe35d074"}, - {file = "cryptography-39.0.2-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:103e8f7155f3ce2ffa0049fe60169878d47a4364b277906386f8de21c9234aa1"}, - {file = "cryptography-39.0.2-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:6236a9610c912b129610eb1a274bdc1350b5df834d124fa84729ebeaf7da42c3"}, - {file = "cryptography-39.0.2-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:e944fe07b6f229f4c1a06a7ef906a19652bdd9fd54c761b0ff87e83ae7a30354"}, - {file = "cryptography-39.0.2-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:35d658536b0a4117c885728d1a7032bdc9a5974722ae298d6c533755a6ee3915"}, - {file = "cryptography-39.0.2-pp39-pypy39_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:30b1d1bfd00f6fc80d11300a29f1d8ab2b8d9febb6ed4a38a76880ec564fae84"}, - {file = "cryptography-39.0.2-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:e029b844c21116564b8b61216befabca4b500e6816fa9f0ba49527653cae2108"}, - {file = "cryptography-39.0.2-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:fa507318e427169ade4e9eccef39e9011cdc19534f55ca2f36ec3f388c1f70f3"}, - {file = "cryptography-39.0.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:8bc0008ef798231fac03fe7d26e82d601d15bd16f3afaad1c6113771566570f3"}, - {file = "cryptography-39.0.2.tar.gz", hash = "sha256:bc5b871e977c8ee5a1bbc42fa8d19bcc08baf0c51cbf1586b0e87a2694dde42f"}, + {file = "cryptography-41.0.4-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:80907d3faa55dc5434a16579952ac6da800935cd98d14dbd62f6f042c7f5e839"}, + {file = "cryptography-41.0.4-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:35c00f637cd0b9d5b6c6bd11b6c3359194a8eba9c46d4e875a3660e3b400005f"}, + {file = "cryptography-41.0.4-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cecfefa17042941f94ab54f769c8ce0fe14beff2694e9ac684176a2535bf9714"}, + {file = "cryptography-41.0.4-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e40211b4923ba5a6dc9769eab704bdb3fbb58d56c5b336d30996c24fcf12aadb"}, + {file = "cryptography-41.0.4-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:23a25c09dfd0d9f28da2352503b23e086f8e78096b9fd585d1d14eca01613e13"}, + {file = "cryptography-41.0.4-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:2ed09183922d66c4ec5fdaa59b4d14e105c084dd0febd27452de8f6f74704143"}, + {file = "cryptography-41.0.4-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:5a0f09cefded00e648a127048119f77bc2b2ec61e736660b5789e638f43cc397"}, + {file = "cryptography-41.0.4-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:9eeb77214afae972a00dee47382d2591abe77bdae166bda672fb1e24702a3860"}, + {file = "cryptography-41.0.4-cp37-abi3-win32.whl", hash = "sha256:3b224890962a2d7b57cf5eeb16ccaafba6083f7b811829f00476309bce2fe0fd"}, + {file = "cryptography-41.0.4-cp37-abi3-win_amd64.whl", hash = "sha256:c880eba5175f4307129784eca96f4e70b88e57aa3f680aeba3bab0e980b0f37d"}, + {file = "cryptography-41.0.4-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:004b6ccc95943f6a9ad3142cfabcc769d7ee38a3f60fb0dddbfb431f818c3a67"}, + {file = "cryptography-41.0.4-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:86defa8d248c3fa029da68ce61fe735432b047e32179883bdb1e79ed9bb8195e"}, + {file = "cryptography-41.0.4-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:37480760ae08065437e6573d14be973112c9e6dcaf5f11d00147ee74f37a3829"}, + {file = "cryptography-41.0.4-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:b5f4dfe950ff0479f1f00eda09c18798d4f49b98f4e2006d644b3301682ebdca"}, + {file = "cryptography-41.0.4-pp38-pypy38_pp73-macosx_10_12_x86_64.whl", hash = "sha256:7e53db173370dea832190870e975a1e09c86a879b613948f09eb49324218c14d"}, + {file = "cryptography-41.0.4-pp38-pypy38_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:5b72205a360f3b6176485a333256b9bcd48700fc755fef51c8e7e67c4b63e3ac"}, + {file = "cryptography-41.0.4-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:93530900d14c37a46ce3d6c9e6fd35dbe5f5601bf6b3a5c325c7bffc030344d9"}, + {file = "cryptography-41.0.4-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:efc8ad4e6fc4f1752ebfb58aefece8b4e3c4cae940b0994d43649bdfce8d0d4f"}, + {file = "cryptography-41.0.4-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:c3391bd8e6de35f6f1140e50aaeb3e2b3d6a9012536ca23ab0d9c35ec18c8a91"}, + {file = "cryptography-41.0.4-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:0d9409894f495d465fe6fda92cb70e8323e9648af912d5b9141d616df40a87b8"}, + {file = "cryptography-41.0.4-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:8ac4f9ead4bbd0bc8ab2d318f97d85147167a488be0e08814a37eb2f439d5cf6"}, + {file = "cryptography-41.0.4-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:047c4603aeb4bbd8db2756e38f5b8bd7e94318c047cfe4efeb5d715e08b49311"}, + {file = "cryptography-41.0.4.tar.gz", hash = "sha256:7febc3094125fc126a7f6fb1f420d0da639f3f32cb15c8ff0dc3997c4549f51a"}, ] [package.dependencies] @@ -418,32 +418,31 @@ cffi = ">=1.12" [package.extras] docs = ["sphinx (>=5.3.0)", "sphinx-rtd-theme (>=1.1.1)"] docstest = ["pyenchant (>=1.6.11)", "sphinxcontrib-spelling (>=4.0.1)", "twine (>=1.12.0)"] -pep8test = ["black", "check-manifest", "mypy", "ruff", "types-pytz", "types-requests"] -sdist = ["setuptools-rust (>=0.11.4)"] +nox = ["nox"] +pep8test = ["black", "check-sdist", "mypy", "ruff"] +sdist = ["build"] ssh = ["bcrypt (>=3.1.5)"] -test = ["hypothesis (>=1.11.4,!=3.79.2)", "iso8601", "pretend", "pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-shard (>=0.1.2)", "pytest-subtests", "pytest-xdist", "pytz"] +test = ["pretend", "pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-xdist"] test-randomorder = ["pytest-randomly"] -tox = ["tox"] [[package]] name = "dcicutils" -version = "8.0.0" +version = "7.12.0.2b9" 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-8.0.0-py3-none-any.whl", hash = "sha256:339834dd93a70fdc26d1c552273c1390275ba637583bbec41a4a8035270b0c72"}, - {file = "dcicutils-8.0.0.tar.gz", hash = "sha256:50aafbe2dce173bb6779184be0db8497d818a41b62bd686851cf64de507c5b76"}, + {file = "dcicutils-7.12.0.2b9-py3-none-any.whl", hash = "sha256:12d3e6cd0f26ad7e464a5e8c7c646d28d23f63a1e423ca4fa7ae536f3b9fd4d2"}, + {file = "dcicutils-7.12.0.2b9.tar.gz", hash = "sha256:ef0da351164cd2495e5570d393c6564fdf8dab1f60a1b613c40dfd405693894e"}, ] [package.dependencies] aws-requests-auth = ">=0.4.2,<1" -boto3 = ">=1.28.57,<2.0.0" -botocore = ">=1.31.57,<2.0.0" +boto3 = ">=1.28.54,<2.0.0" +botocore = ">=1.31.54,<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" @@ -569,37 +568,16 @@ files = [ [[package]] name = "foursight-core" -version = "5.0.0" +version = "5.0.0.1b2" description = "Serverless Chalice Application for Monitoring" optional = false -python-versions = ">=3.8,<3.12" -files = [ - {file = "foursight_core-5.0.0-py3-none-any.whl", hash = "sha256:c298ec7778fc3765a7181e1984ca271a7cdcaa3641bf8935d3349cfd42c9818e"}, - {file = "foursight_core-5.0.0.tar.gz", hash = "sha256:efc10c815e91ad439884f5e1dd1f294ca813c34e2ad479ca9303b9bb65341ecf"}, -] +python-versions = "*" +files = [] +develop = true -[package.dependencies] -boto3 = ">=1.28.62,<2.0.0" -botocore = ">=1.31.62,<2.0.0" -click = ">=7.1.2,<8.0.0" -cron-descriptor = ">=1.2.31,<2.0.0" -cryptography = "39.0.2" -dcicutils = ">=8.0.0,<9.0.0" -elasticsearch = "7.13.4" -elasticsearch-dsl = ">=7.0.0,<8.0.0" -geocoder = "1.38.1" -gitpython = ">=3.1.2,<4.0.0" -google = ">=3.0.0,<4.0.0" -google-api-python-client = ">=1.12.5,<2.0.0" -google-auth-oauthlib = ">=0.7.0,<0.8.0" -Jinja2 = ">=3.1.2,<4.0.0" -MarkupSafe = ">=2.1.3,<3.0.0" -pyDes = ">=2.0.1,<3.0.0" -PyJWT = ">=2.5.0,<3.0.0" -pytz = ">=2020.1" -redis = ">=4.5.1,<5.0.0" -toml = ">=0.10.2,<1" -tzlocal = ">=5.0.1,<6.0.0" +[package.source] +type = "directory" +url = "../foursight-core" [[package]] name = "future" @@ -660,20 +638,6 @@ gitdb = ">=4.0.1,<5" [package.extras] test = ["black", "coverage[toml]", "ddt (>=1.1.1,!=1.4.3)", "mypy", "pre-commit", "pytest", "pytest-cov", "pytest-sugar"] -[[package]] -name = "google" -version = "3.0.0" -description = "Python bindings to the Google search engine." -optional = false -python-versions = "*" -files = [ - {file = "google-3.0.0-py2.py3-none-any.whl", hash = "sha256:889cf695f84e4ae2c55fbc0cfdaf4c1e729417fa52ab1db0485202ba173e4935"}, - {file = "google-3.0.0.tar.gz", hash = "sha256:143530122ee5130509ad5e989f0512f7cb218b2d4eddbafbad40fd10e8d8ccbe"}, -] - -[package.dependencies] -beautifulsoup4 = "*" - [[package]] name = "google-analytics-data" version = "0.17.1" @@ -723,25 +687,6 @@ grpc = ["grpcio (>=1.33.2,<2.0dev)", "grpcio (>=1.49.1,<2.0dev)", "grpcio-status grpcgcp = ["grpcio-gcp (>=0.2.2,<1.0.dev0)"] grpcio-gcp = ["grpcio-gcp (>=0.2.2,<1.0.dev0)"] -[[package]] -name = "google-api-python-client" -version = "1.12.11" -description = "Google API Client Library for Python" -optional = false -python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*" -files = [ - {file = "google-api-python-client-1.12.11.tar.gz", hash = "sha256:1b4bd42a46321e13c0542a9e4d96fa05d73626f07b39f83a73a947d70ca706a9"}, - {file = "google_api_python_client-1.12.11-py2.py3-none-any.whl", hash = "sha256:7e0a1a265c8d3088ee1987778c72683fcb376e32bada8d7767162bd9c503fd9b"}, -] - -[package.dependencies] -google-api-core = {version = ">=1.21.0,<3dev", markers = "python_version >= \"3\""} -google-auth = {version = ">=1.16.0,<3dev", markers = "python_version >= \"3\""} -google-auth-httplib2 = ">=0.0.3" -httplib2 = ">=0.15.0,<1dev" -six = ">=1.13.0,<2dev" -uritemplate = ">=3.0.0,<4dev" - [[package]] name = "google-auth" version = "2.23.3" @@ -765,34 +710,19 @@ pyopenssl = ["cryptography (>=38.0.3)", "pyopenssl (>=20.0.0)"] reauth = ["pyu2f (>=0.1.5)"] requests = ["requests (>=2.20.0,<3.0.0.dev0)"] -[[package]] -name = "google-auth-httplib2" -version = "0.1.1" -description = "Google Authentication Library: httplib2 transport" -optional = false -python-versions = "*" -files = [ - {file = "google-auth-httplib2-0.1.1.tar.gz", hash = "sha256:c64bc555fdc6dd788ea62ecf7bccffcf497bf77244887a3f3d7a5a02f8e3fc29"}, - {file = "google_auth_httplib2-0.1.1-py2.py3-none-any.whl", hash = "sha256:42c50900b8e4dcdf8222364d1f0efe32b8421fb6ed72f2613f12f75cc933478c"}, -] - -[package.dependencies] -google-auth = "*" -httplib2 = ">=0.19.0" - [[package]] name = "google-auth-oauthlib" -version = "0.7.1" +version = "1.1.0" description = "Google Authentication Library" optional = false python-versions = ">=3.6" files = [ - {file = "google-auth-oauthlib-0.7.1.tar.gz", hash = "sha256:9940f543f77d1447432a93781d7c931fb53e418023351ad4bf9e92837a1154ec"}, - {file = "google_auth_oauthlib-0.7.1-py2.py3-none-any.whl", hash = "sha256:860e54c4b58b2664116c9cb44325bc0ec92bcd93e8211698ceea911b1b873b86"}, + {file = "google-auth-oauthlib-1.1.0.tar.gz", hash = "sha256:83ea8c3b0881e453790baff4448e8a6112ac8778d1de9da0b68010b843937afb"}, + {file = "google_auth_oauthlib-1.1.0-py2.py3-none-any.whl", hash = "sha256:089c6e587d36f4803ac7e0720c045c6a8b1fd1790088b8424975b90d0ee61c12"}, ] [package.dependencies] -google-auth = ">=2.14.0" +google-auth = ">=2.15.0" requests-oauthlib = ">=0.7.0" [package.extras] @@ -1006,17 +936,6 @@ 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 = "markupsafe" version = "2.1.3" @@ -1297,16 +1216,6 @@ files = [ {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, ] -[[package]] -name = "pydes" -version = "2.0.1" -description = "Pure python implementation of DES and TRIPLE DES encryption algorithm" -optional = false -python-versions = "*" -files = [ - {file = "pyDes-2.0.1.tar.gz", hash = "sha256:e2ab8e21d2b83e90d90dbfdcb6fb8ac0000b813238b7ecaede04f8435c389012"}, -] - [[package]] name = "pyjwt" version = "2.8.0" @@ -1737,13 +1646,13 @@ tests = ["coverage", "freezegun (>=0.2.8)", "pretend", "pytest (>=3.3.0)", "pyth [[package]] name = "tibanna" -version = "5.1.0" +version = "4.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-5.1.0-py3-none-any.whl", hash = "sha256:fbe066eda6544a680690e9510f2cb535c79cb8b05ee70d627079e1e1cf8339ff"}, - {file = "tibanna-5.1.0.tar.gz", hash = "sha256:3d293d701c822a97cb1e7ff0a015b310a87f6461087670898b4db4c41b918dfd"}, + {file = "tibanna-4.0.0.1b4-py3-none-any.whl", hash = "sha256:f3fde1244f3a52641bdb0cdfd2688f46e3b31197b195b05f7fbb3161df2d4dfb"}, + {file = "tibanna-4.0.0.1b4.tar.gz", hash = "sha256:6a8a8a4a2daa6c0c079ed9db764dd107ea97b0d1356941b90831f4437b24fbab"}, ] [package.dependencies] @@ -1755,21 +1664,21 @@ tomlkit = ">=0.11.0,<0.12.0" [[package]] name = "tibanna-ff" -version = "3.1.1" +version = "2.0.1.1b10" description = "Tibanna runs portable pipelines (in CWL/WDL) on the AWS Cloud." optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "tibanna_ff-3.1.1-py3-none-any.whl", hash = "sha256:fac37cc31318dcc9f0fa6ce9dd9b1ce6347452c704f499939d054d51cab167b4"}, - {file = "tibanna_ff-3.1.1.tar.gz", hash = "sha256:7801dface3e60ef6b867b8cda875238cf511bce3938d2f52f28ccb77a83c6e17"}, + {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"}, ] [package.dependencies] boto3 = ">=1.28.56,<2.0.0" botocore = ">=1.31.56,<2.0.0" -dcicutils = "8.0.0" +dcicutils = "7.12.0.2b9" requests = "2.27.1" -tibanna = "5.1.0" +tibanna = "4.0.0.1b4" tomlkit = ">=0.11.0,<0.12.0" [[package]] @@ -1865,17 +1774,6 @@ tzdata = {version = "*", markers = "platform_system == \"Windows\""} [package.extras] devenv = ["black", "check-manifest", "flake8", "pyroma", "pytest (>=4.3)", "pytest-cov", "pytest-mock (>=3.3)", "zest.releaser"] -[[package]] -name = "uritemplate" -version = "3.0.1" -description = "URI templates" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -files = [ - {file = "uritemplate-3.0.1-py2.py3-none-any.whl", hash = "sha256:07620c3f3f8eed1f12600845892b0e036a2420acf513c53f7de0abd911a5894f"}, - {file = "uritemplate-3.0.1.tar.gz", hash = "sha256:5af8ad10cec94f215e3f48112de2022e1d5a37ed427fbd88652fa908f2ab7cae"}, -] - [[package]] name = "urllib3" version = "1.26.17" @@ -1987,4 +1885,4 @@ test = ["pytest (>=6.0.0)", "setuptools (>=65)"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.12" -content-hash = "1756c98773f63c7d6b1c16248f7ba217fc1df352095587b03e4838801be7f226" +content-hash = "9dafeb6de6139ca40737064be3e0dafc842d20a83fce785fc4703a1339b6b6e5" diff --git a/pyproject.toml b/pyproject.toml index 098ecbd0..293759f3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "foursight" -version = "4.0.0" # TODO: To become 4.0.0 +version = "4.0.0.1b2" # TODO: To become 4.1.0 description = "Serverless Chalice Application for Monitoring" authors = ["4DN-DCIC Team "] license = "MIT" @@ -12,7 +12,7 @@ packages = [ python = ">=3.8,<3.12" cron-descriptor = "^1.4.0" click = "^7.1.2" -dcicutils = "^8.0.0" +dcicutils = "7.12.0.2b9" # This one has sheet_utils; 8.0.0 does not. PyJWT = "^2.5.0" Jinja2 = "^3.1.2" MarkupSafe = "^2.1.3" @@ -24,7 +24,7 @@ elasticsearch = "7.13.4" elasticsearch-dsl = "^7.0.0" gitpython = "^3.1.2" pytz = "^2020.1" -tibanna-ff = "^3.1.1" +tibanna-ff = "^2.0.0" ## adding foursight-core # use below for deployment foursight-core = "^5.0.0" From aba66db895413c646140f239515e3d85a7a6dc31 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Wed, 11 Oct 2023 15:06:02 -0400 Subject: [PATCH 02/21] Version update --- CHANGELOG.rst | 3 +- Makefile | 2 +- poetry.lock | 210 ++++++++++++++++++++++++++++++++++++------------- pyproject.toml | 8 +- 4 files changed, 163 insertions(+), 60 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c0452348..77641973 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -11,7 +11,8 @@ Change Log 4.1.0 ===== -* New Portal Reindex page. +* New Portal Reindex page. +* Update poetry to 1.4.2. 4.0.0 ===== diff --git a/Makefile b/Makefile index abacb57f..ef30f9a9 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ clear-poetry-cache: # clear poetry/pypi cache. for user to do explicitly, never poetry cache clear pypi --all configure: # does any pre-requisite installs - pip install poetry==1.3.2 + pip install poetry==1.4.2 build: # builds make configure diff --git a/poetry.lock b/poetry.lock index 7f7895d1..7ffb728f 100644 --- a/poetry.lock +++ b/poetry.lock @@ -382,34 +382,34 @@ dev = ["polib"] [[package]] name = "cryptography" -version = "41.0.4" +version = "39.0.2" description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." optional = false -python-versions = ">=3.7" +python-versions = ">=3.6" files = [ - {file = "cryptography-41.0.4-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:80907d3faa55dc5434a16579952ac6da800935cd98d14dbd62f6f042c7f5e839"}, - {file = "cryptography-41.0.4-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:35c00f637cd0b9d5b6c6bd11b6c3359194a8eba9c46d4e875a3660e3b400005f"}, - {file = "cryptography-41.0.4-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cecfefa17042941f94ab54f769c8ce0fe14beff2694e9ac684176a2535bf9714"}, - {file = "cryptography-41.0.4-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e40211b4923ba5a6dc9769eab704bdb3fbb58d56c5b336d30996c24fcf12aadb"}, - {file = "cryptography-41.0.4-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:23a25c09dfd0d9f28da2352503b23e086f8e78096b9fd585d1d14eca01613e13"}, - {file = "cryptography-41.0.4-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:2ed09183922d66c4ec5fdaa59b4d14e105c084dd0febd27452de8f6f74704143"}, - {file = "cryptography-41.0.4-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:5a0f09cefded00e648a127048119f77bc2b2ec61e736660b5789e638f43cc397"}, - {file = "cryptography-41.0.4-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:9eeb77214afae972a00dee47382d2591abe77bdae166bda672fb1e24702a3860"}, - {file = "cryptography-41.0.4-cp37-abi3-win32.whl", hash = "sha256:3b224890962a2d7b57cf5eeb16ccaafba6083f7b811829f00476309bce2fe0fd"}, - {file = "cryptography-41.0.4-cp37-abi3-win_amd64.whl", hash = "sha256:c880eba5175f4307129784eca96f4e70b88e57aa3f680aeba3bab0e980b0f37d"}, - {file = "cryptography-41.0.4-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:004b6ccc95943f6a9ad3142cfabcc769d7ee38a3f60fb0dddbfb431f818c3a67"}, - {file = "cryptography-41.0.4-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:86defa8d248c3fa029da68ce61fe735432b047e32179883bdb1e79ed9bb8195e"}, - {file = "cryptography-41.0.4-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:37480760ae08065437e6573d14be973112c9e6dcaf5f11d00147ee74f37a3829"}, - {file = "cryptography-41.0.4-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:b5f4dfe950ff0479f1f00eda09c18798d4f49b98f4e2006d644b3301682ebdca"}, - {file = "cryptography-41.0.4-pp38-pypy38_pp73-macosx_10_12_x86_64.whl", hash = "sha256:7e53db173370dea832190870e975a1e09c86a879b613948f09eb49324218c14d"}, - {file = "cryptography-41.0.4-pp38-pypy38_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:5b72205a360f3b6176485a333256b9bcd48700fc755fef51c8e7e67c4b63e3ac"}, - {file = "cryptography-41.0.4-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:93530900d14c37a46ce3d6c9e6fd35dbe5f5601bf6b3a5c325c7bffc030344d9"}, - {file = "cryptography-41.0.4-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:efc8ad4e6fc4f1752ebfb58aefece8b4e3c4cae940b0994d43649bdfce8d0d4f"}, - {file = "cryptography-41.0.4-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:c3391bd8e6de35f6f1140e50aaeb3e2b3d6a9012536ca23ab0d9c35ec18c8a91"}, - {file = "cryptography-41.0.4-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:0d9409894f495d465fe6fda92cb70e8323e9648af912d5b9141d616df40a87b8"}, - {file = "cryptography-41.0.4-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:8ac4f9ead4bbd0bc8ab2d318f97d85147167a488be0e08814a37eb2f439d5cf6"}, - {file = "cryptography-41.0.4-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:047c4603aeb4bbd8db2756e38f5b8bd7e94318c047cfe4efeb5d715e08b49311"}, - {file = "cryptography-41.0.4.tar.gz", hash = "sha256:7febc3094125fc126a7f6fb1f420d0da639f3f32cb15c8ff0dc3997c4549f51a"}, + {file = "cryptography-39.0.2-cp36-abi3-macosx_10_12_universal2.whl", hash = "sha256:2725672bb53bb92dc7b4150d233cd4b8c59615cd8288d495eaa86db00d4e5c06"}, + {file = "cryptography-39.0.2-cp36-abi3-macosx_10_12_x86_64.whl", hash = "sha256:23df8ca3f24699167daf3e23e51f7ba7334d504af63a94af468f468b975b7dd7"}, + {file = "cryptography-39.0.2-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:eb40fe69cfc6f5cdab9a5ebd022131ba21453cf7b8a7fd3631f45bbf52bed612"}, + {file = "cryptography-39.0.2-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bc0521cce2c1d541634b19f3ac661d7a64f9555135e9d8af3980965be717fd4a"}, + {file = "cryptography-39.0.2-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ffd394c7896ed7821a6d13b24657c6a34b6e2650bd84ae063cf11ccffa4f1a97"}, + {file = "cryptography-39.0.2-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:e8a0772016feeb106efd28d4a328e77dc2edae84dfbac06061319fdb669ff828"}, + {file = "cryptography-39.0.2-cp36-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:8f35c17bd4faed2bc7797d2a66cbb4f986242ce2e30340ab832e5d99ae60e011"}, + {file = "cryptography-39.0.2-cp36-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:b49a88ff802e1993b7f749b1eeb31134f03c8d5c956e3c125c75558955cda536"}, + {file = "cryptography-39.0.2-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:5f8c682e736513db7d04349b4f6693690170f95aac449c56f97415c6980edef5"}, + {file = "cryptography-39.0.2-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:d7d84a512a59f4412ca8549b01f94be4161c94efc598bf09d027d67826beddc0"}, + {file = "cryptography-39.0.2-cp36-abi3-win32.whl", hash = "sha256:c43ac224aabcbf83a947eeb8b17eaf1547bce3767ee2d70093b461f31729a480"}, + {file = "cryptography-39.0.2-cp36-abi3-win_amd64.whl", hash = "sha256:788b3921d763ee35dfdb04248d0e3de11e3ca8eb22e2e48fef880c42e1f3c8f9"}, + {file = "cryptography-39.0.2-pp38-pypy38_pp73-macosx_10_12_x86_64.whl", hash = "sha256:d15809e0dbdad486f4ad0979753518f47980020b7a34e9fc56e8be4f60702fac"}, + {file = "cryptography-39.0.2-pp38-pypy38_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:50cadb9b2f961757e712a9737ef33d89b8190c3ea34d0fb6675e00edbe35d074"}, + {file = "cryptography-39.0.2-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:103e8f7155f3ce2ffa0049fe60169878d47a4364b277906386f8de21c9234aa1"}, + {file = "cryptography-39.0.2-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:6236a9610c912b129610eb1a274bdc1350b5df834d124fa84729ebeaf7da42c3"}, + {file = "cryptography-39.0.2-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:e944fe07b6f229f4c1a06a7ef906a19652bdd9fd54c761b0ff87e83ae7a30354"}, + {file = "cryptography-39.0.2-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:35d658536b0a4117c885728d1a7032bdc9a5974722ae298d6c533755a6ee3915"}, + {file = "cryptography-39.0.2-pp39-pypy39_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:30b1d1bfd00f6fc80d11300a29f1d8ab2b8d9febb6ed4a38a76880ec564fae84"}, + {file = "cryptography-39.0.2-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:e029b844c21116564b8b61216befabca4b500e6816fa9f0ba49527653cae2108"}, + {file = "cryptography-39.0.2-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:fa507318e427169ade4e9eccef39e9011cdc19534f55ca2f36ec3f388c1f70f3"}, + {file = "cryptography-39.0.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:8bc0008ef798231fac03fe7d26e82d601d15bd16f3afaad1c6113771566570f3"}, + {file = "cryptography-39.0.2.tar.gz", hash = "sha256:bc5b871e977c8ee5a1bbc42fa8d19bcc08baf0c51cbf1586b0e87a2694dde42f"}, ] [package.dependencies] @@ -418,31 +418,32 @@ cffi = ">=1.12" [package.extras] docs = ["sphinx (>=5.3.0)", "sphinx-rtd-theme (>=1.1.1)"] docstest = ["pyenchant (>=1.6.11)", "sphinxcontrib-spelling (>=4.0.1)", "twine (>=1.12.0)"] -nox = ["nox"] -pep8test = ["black", "check-sdist", "mypy", "ruff"] -sdist = ["build"] +pep8test = ["black", "check-manifest", "mypy", "ruff", "types-pytz", "types-requests"] +sdist = ["setuptools-rust (>=0.11.4)"] ssh = ["bcrypt (>=3.1.5)"] -test = ["pretend", "pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-xdist"] +test = ["hypothesis (>=1.11.4,!=3.79.2)", "iso8601", "pretend", "pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-shard (>=0.1.2)", "pytest-subtests", "pytest-xdist", "pytz"] test-randomorder = ["pytest-randomly"] +tox = ["tox"] [[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" @@ -568,16 +569,37 @@ files = [ [[package]] name = "foursight-core" -version = "5.0.0.1b2" +version = "5.0.0.1b3" description = "Serverless Chalice Application for Monitoring" optional = false -python-versions = "*" -files = [] -develop = true +python-versions = ">=3.8,<3.12" +files = [ + {file = "foursight_core-5.0.0.1b3-py3-none-any.whl", hash = "sha256:130d9cabe3db4f62cc0d7dd1be8e5c5994422e51868a8483e02d40cbdf5498a5"}, + {file = "foursight_core-5.0.0.1b3.tar.gz", hash = "sha256:b3d88ce5ca203e313679f34dacc1d9bad5b705f54a86bd92829ea0d9dd6494d4"}, +] -[package.source] -type = "directory" -url = "../foursight-core" +[package.dependencies] +boto3 = ">=1.28.62,<2.0.0" +botocore = ">=1.31.62,<2.0.0" +click = ">=7.1.2,<8.0.0" +cron-descriptor = ">=1.2.31,<2.0.0" +cryptography = "39.0.2" +dcicutils = ">=8.0.0,<9.0.0" +elasticsearch = "7.13.4" +elasticsearch-dsl = ">=7.0.0,<8.0.0" +geocoder = "1.38.1" +gitpython = ">=3.1.2,<4.0.0" +google = ">=3.0.0,<4.0.0" +google-api-python-client = ">=1.12.5,<2.0.0" +google-auth-oauthlib = ">=0.7.0,<0.8.0" +Jinja2 = ">=3.1.2,<4.0.0" +MarkupSafe = ">=2.1.3,<3.0.0" +pyDes = ">=2.0.1,<3.0.0" +PyJWT = ">=2.5.0,<3.0.0" +pytz = ">=2020.1" +redis = ">=4.5.1,<5.0.0" +toml = ">=0.10.2,<1" +tzlocal = ">=5.0.1,<6.0.0" [[package]] name = "future" @@ -638,6 +660,20 @@ gitdb = ">=4.0.1,<5" [package.extras] test = ["black", "coverage[toml]", "ddt (>=1.1.1,!=1.4.3)", "mypy", "pre-commit", "pytest", "pytest-cov", "pytest-sugar"] +[[package]] +name = "google" +version = "3.0.0" +description = "Python bindings to the Google search engine." +optional = false +python-versions = "*" +files = [ + {file = "google-3.0.0-py2.py3-none-any.whl", hash = "sha256:889cf695f84e4ae2c55fbc0cfdaf4c1e729417fa52ab1db0485202ba173e4935"}, + {file = "google-3.0.0.tar.gz", hash = "sha256:143530122ee5130509ad5e989f0512f7cb218b2d4eddbafbad40fd10e8d8ccbe"}, +] + +[package.dependencies] +beautifulsoup4 = "*" + [[package]] name = "google-analytics-data" version = "0.17.1" @@ -687,6 +723,25 @@ grpc = ["grpcio (>=1.33.2,<2.0dev)", "grpcio (>=1.49.1,<2.0dev)", "grpcio-status grpcgcp = ["grpcio-gcp (>=0.2.2,<1.0.dev0)"] grpcio-gcp = ["grpcio-gcp (>=0.2.2,<1.0.dev0)"] +[[package]] +name = "google-api-python-client" +version = "1.12.11" +description = "Google API Client Library for Python" +optional = false +python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*" +files = [ + {file = "google-api-python-client-1.12.11.tar.gz", hash = "sha256:1b4bd42a46321e13c0542a9e4d96fa05d73626f07b39f83a73a947d70ca706a9"}, + {file = "google_api_python_client-1.12.11-py2.py3-none-any.whl", hash = "sha256:7e0a1a265c8d3088ee1987778c72683fcb376e32bada8d7767162bd9c503fd9b"}, +] + +[package.dependencies] +google-api-core = {version = ">=1.21.0,<3dev", markers = "python_version >= \"3\""} +google-auth = {version = ">=1.16.0,<3dev", markers = "python_version >= \"3\""} +google-auth-httplib2 = ">=0.0.3" +httplib2 = ">=0.15.0,<1dev" +six = ">=1.13.0,<2dev" +uritemplate = ">=3.0.0,<4dev" + [[package]] name = "google-auth" version = "2.23.3" @@ -710,19 +765,34 @@ pyopenssl = ["cryptography (>=38.0.3)", "pyopenssl (>=20.0.0)"] reauth = ["pyu2f (>=0.1.5)"] requests = ["requests (>=2.20.0,<3.0.0.dev0)"] +[[package]] +name = "google-auth-httplib2" +version = "0.1.1" +description = "Google Authentication Library: httplib2 transport" +optional = false +python-versions = "*" +files = [ + {file = "google-auth-httplib2-0.1.1.tar.gz", hash = "sha256:c64bc555fdc6dd788ea62ecf7bccffcf497bf77244887a3f3d7a5a02f8e3fc29"}, + {file = "google_auth_httplib2-0.1.1-py2.py3-none-any.whl", hash = "sha256:42c50900b8e4dcdf8222364d1f0efe32b8421fb6ed72f2613f12f75cc933478c"}, +] + +[package.dependencies] +google-auth = "*" +httplib2 = ">=0.19.0" + [[package]] name = "google-auth-oauthlib" -version = "1.1.0" +version = "0.7.1" description = "Google Authentication Library" optional = false python-versions = ">=3.6" files = [ - {file = "google-auth-oauthlib-1.1.0.tar.gz", hash = "sha256:83ea8c3b0881e453790baff4448e8a6112ac8778d1de9da0b68010b843937afb"}, - {file = "google_auth_oauthlib-1.1.0-py2.py3-none-any.whl", hash = "sha256:089c6e587d36f4803ac7e0720c045c6a8b1fd1790088b8424975b90d0ee61c12"}, + {file = "google-auth-oauthlib-0.7.1.tar.gz", hash = "sha256:9940f543f77d1447432a93781d7c931fb53e418023351ad4bf9e92837a1154ec"}, + {file = "google_auth_oauthlib-0.7.1-py2.py3-none-any.whl", hash = "sha256:860e54c4b58b2664116c9cb44325bc0ec92bcd93e8211698ceea911b1b873b86"}, ] [package.dependencies] -google-auth = ">=2.15.0" +google-auth = ">=2.14.0" requests-oauthlib = ">=0.7.0" [package.extras] @@ -936,6 +1006,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 = "markupsafe" version = "2.1.3" @@ -1216,6 +1297,16 @@ files = [ {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, ] +[[package]] +name = "pydes" +version = "2.0.1" +description = "Pure python implementation of DES and TRIPLE DES encryption algorithm" +optional = false +python-versions = "*" +files = [ + {file = "pyDes-2.0.1.tar.gz", hash = "sha256:e2ab8e21d2b83e90d90dbfdcb6fb8ac0000b813238b7ecaede04f8435c389012"}, +] + [[package]] name = "pyjwt" version = "2.8.0" @@ -1646,13 +1737,13 @@ tests = ["coverage", "freezegun (>=0.2.8)", "pretend", "pytest (>=3.3.0)", "pyth [[package]] name = "tibanna" -version = "4.0.0.1b4" +version = "5.1.0" 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.1.0-py3-none-any.whl", hash = "sha256:fbe066eda6544a680690e9510f2cb535c79cb8b05ee70d627079e1e1cf8339ff"}, + {file = "tibanna-5.1.0.tar.gz", hash = "sha256:3d293d701c822a97cb1e7ff0a015b310a87f6461087670898b4db4c41b918dfd"}, ] [package.dependencies] @@ -1664,21 +1755,21 @@ tomlkit = ">=0.11.0,<0.12.0" [[package]] name = "tibanna-ff" -version = "2.0.1.1b10" +version = "3.1.1" 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.1.1-py3-none-any.whl", hash = "sha256:fac37cc31318dcc9f0fa6ce9dd9b1ce6347452c704f499939d054d51cab167b4"}, + {file = "tibanna_ff-3.1.1.tar.gz", hash = "sha256:7801dface3e60ef6b867b8cda875238cf511bce3938d2f52f28ccb77a83c6e17"}, ] [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.1.0" tomlkit = ">=0.11.0,<0.12.0" [[package]] @@ -1774,6 +1865,17 @@ tzdata = {version = "*", markers = "platform_system == \"Windows\""} [package.extras] devenv = ["black", "check-manifest", "flake8", "pyroma", "pytest (>=4.3)", "pytest-cov", "pytest-mock (>=3.3)", "zest.releaser"] +[[package]] +name = "uritemplate" +version = "3.0.1" +description = "URI templates" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +files = [ + {file = "uritemplate-3.0.1-py2.py3-none-any.whl", hash = "sha256:07620c3f3f8eed1f12600845892b0e036a2420acf513c53f7de0abd911a5894f"}, + {file = "uritemplate-3.0.1.tar.gz", hash = "sha256:5af8ad10cec94f215e3f48112de2022e1d5a37ed427fbd88652fa908f2ab7cae"}, +] + [[package]] name = "urllib3" version = "1.26.17" @@ -1885,4 +1987,4 @@ test = ["pytest (>=6.0.0)", "setuptools (>=65)"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.12" -content-hash = "9dafeb6de6139ca40737064be3e0dafc842d20a83fce785fc4703a1339b6b6e5" +content-hash = "57d050bd1919a8708a78e816032776878057b38f185dcaf1addb46e230f5b0f2" diff --git a/pyproject.toml b/pyproject.toml index 293759f3..2d872aa8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "foursight" -version = "4.0.0.1b2" # TODO: To become 4.1.0 +version = "4.0.0.1b3" # TODO: To become 4.1.0 description = "Serverless Chalice Application for Monitoring" authors = ["4DN-DCIC Team "] license = "MIT" @@ -12,7 +12,7 @@ packages = [ python = ">=3.8,<3.12" cron-descriptor = "^1.4.0" click = "^7.1.2" -dcicutils = "7.12.0.2b9" # This one has sheet_utils; 8.0.0 does not. +dcicutils = "^8.0.0" PyJWT = "^2.5.0" Jinja2 = "^3.1.2" MarkupSafe = "^2.1.3" @@ -24,10 +24,10 @@ elasticsearch = "7.13.4" elasticsearch-dsl = "^7.0.0" gitpython = "^3.1.2" pytz = "^2020.1" -tibanna-ff = "^2.0.0" +tibanna-ff = "^3.1.1" ## adding foursight-core # use below for deployment -foursight-core = "^5.0.0" +foursight-core = "5.0.0.1b3" # use below for tests but not for deployment # foursight-core = { git = "https://github.com/4dn-dcic/foursight-core.git", branch="master" } # Need pytest-redis 3.0.2 or higher for pytest 7.4.2 (or higher). From a6fec70e71fbace2e671b77cf2546caeff7ea3a4 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Wed, 11 Oct 2023 15:42:19 -0400 Subject: [PATCH 03/21] Version update --- poetry.lock | 8 ++++---- pyproject.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index 7ffb728f..c0219689 100644 --- a/poetry.lock +++ b/poetry.lock @@ -569,13 +569,13 @@ files = [ [[package]] name = "foursight-core" -version = "5.0.0.1b3" +version = "5.0.0.1b4" description = "Serverless Chalice Application for Monitoring" optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "foursight_core-5.0.0.1b3-py3-none-any.whl", hash = "sha256:130d9cabe3db4f62cc0d7dd1be8e5c5994422e51868a8483e02d40cbdf5498a5"}, - {file = "foursight_core-5.0.0.1b3.tar.gz", hash = "sha256:b3d88ce5ca203e313679f34dacc1d9bad5b705f54a86bd92829ea0d9dd6494d4"}, + {file = "foursight_core-5.0.0.1b4-py3-none-any.whl", hash = "sha256:b4bcc9fbb31a9c509acdbf9fc17a9e1149bbed386826e878455e49918f7df0e6"}, + {file = "foursight_core-5.0.0.1b4.tar.gz", hash = "sha256:927af68c612dd8dd8e3b4ec987f5e756ed32808934c867b488436df6088731f4"}, ] [package.dependencies] @@ -1987,4 +1987,4 @@ test = ["pytest (>=6.0.0)", "setuptools (>=65)"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.12" -content-hash = "57d050bd1919a8708a78e816032776878057b38f185dcaf1addb46e230f5b0f2" +content-hash = "9c51dcce1424c338274aa75178936224443b55021e430ec7c87ba92d1774a915" diff --git a/pyproject.toml b/pyproject.toml index 2d872aa8..c91b7142 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "foursight" -version = "4.0.0.1b3" # TODO: To become 4.1.0 +version = "4.0.0.1b4" # TODO: To become 4.1.0 description = "Serverless Chalice Application for Monitoring" authors = ["4DN-DCIC Team "] license = "MIT" @@ -27,7 +27,7 @@ pytz = "^2020.1" tibanna-ff = "^3.1.1" ## adding foursight-core # use below for deployment -foursight-core = "5.0.0.1b3" +foursight-core = "5.0.0.1b4" # use below for tests but not for deployment # foursight-core = { git = "https://github.com/4dn-dcic/foursight-core.git", branch="master" } # Need pytest-redis 3.0.2 or higher for pytest 7.4.2 (or higher). From 15843d7c7e7e25901cab51301e958d802666a01e Mon Sep 17 00:00:00 2001 From: David Michaels Date: Mon, 16 Oct 2023 09:04:17 -0400 Subject: [PATCH 04/21] Version update --- poetry.lock | 8 ++++---- pyproject.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index c0219689..49d92abb 100644 --- a/poetry.lock +++ b/poetry.lock @@ -569,13 +569,13 @@ files = [ [[package]] name = "foursight-core" -version = "5.0.0.1b4" +version = "5.0.0.1b5" description = "Serverless Chalice Application for Monitoring" optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "foursight_core-5.0.0.1b4-py3-none-any.whl", hash = "sha256:b4bcc9fbb31a9c509acdbf9fc17a9e1149bbed386826e878455e49918f7df0e6"}, - {file = "foursight_core-5.0.0.1b4.tar.gz", hash = "sha256:927af68c612dd8dd8e3b4ec987f5e756ed32808934c867b488436df6088731f4"}, + {file = "foursight_core-5.0.0.1b5-py3-none-any.whl", hash = "sha256:3daf2b5bc56bf53c72f7355bd0559673a065cf63ee31fa760d94416ec9a7be91"}, + {file = "foursight_core-5.0.0.1b5.tar.gz", hash = "sha256:afbf6ef7cdd0ddeb6772cb22396efbc26054fb98d25ec3225ec55c941d0aa334"}, ] [package.dependencies] @@ -1987,4 +1987,4 @@ test = ["pytest (>=6.0.0)", "setuptools (>=65)"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.12" -content-hash = "9c51dcce1424c338274aa75178936224443b55021e430ec7c87ba92d1774a915" +content-hash = "ab6dae1257fc96a0bc6f118b966f83eb2c4b4272360c1a078b33ee31cdbebb6b" diff --git a/pyproject.toml b/pyproject.toml index c91b7142..418f42ff 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "foursight" -version = "4.0.0.1b4" # TODO: To become 4.1.0 +version = "4.0.0.1b5" # TODO: To become 4.1.0 description = "Serverless Chalice Application for Monitoring" authors = ["4DN-DCIC Team "] license = "MIT" @@ -27,7 +27,7 @@ pytz = "^2020.1" tibanna-ff = "^3.1.1" ## adding foursight-core # use below for deployment -foursight-core = "5.0.0.1b4" +foursight-core = "5.0.0.1b5" # use below for tests but not for deployment # foursight-core = { git = "https://github.com/4dn-dcic/foursight-core.git", branch="master" } # Need pytest-redis 3.0.2 or higher for pytest 7.4.2 (or higher). From 70d35e55e2dfacf14c43e161866d5f392fc53aae Mon Sep 17 00:00:00 2001 From: David Michaels Date: Mon, 16 Oct 2023 12:07:08 -0400 Subject: [PATCH 05/21] Version update --- poetry.lock | 8 ++++---- pyproject.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index 49d92abb..25e4c63a 100644 --- a/poetry.lock +++ b/poetry.lock @@ -569,13 +569,13 @@ files = [ [[package]] name = "foursight-core" -version = "5.0.0.1b5" +version = "5.0.0.1b6" description = "Serverless Chalice Application for Monitoring" optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "foursight_core-5.0.0.1b5-py3-none-any.whl", hash = "sha256:3daf2b5bc56bf53c72f7355bd0559673a065cf63ee31fa760d94416ec9a7be91"}, - {file = "foursight_core-5.0.0.1b5.tar.gz", hash = "sha256:afbf6ef7cdd0ddeb6772cb22396efbc26054fb98d25ec3225ec55c941d0aa334"}, + {file = "foursight_core-5.0.0.1b6-py3-none-any.whl", hash = "sha256:5eb462f530037ff6552554de7b682524554c4dc70d9166faa021afca3cd8a844"}, + {file = "foursight_core-5.0.0.1b6.tar.gz", hash = "sha256:04f35eca74a0c45bae1cf10f3e15016771bbe82c0fb4b6faa9e09d8064506b1d"}, ] [package.dependencies] @@ -1987,4 +1987,4 @@ test = ["pytest (>=6.0.0)", "setuptools (>=65)"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.12" -content-hash = "ab6dae1257fc96a0bc6f118b966f83eb2c4b4272360c1a078b33ee31cdbebb6b" +content-hash = "d302a739431b835e5877dc3b5fa9effcc57a2d402488119cb9a382e95612d2ea" diff --git a/pyproject.toml b/pyproject.toml index 418f42ff..393a4bf6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "foursight" -version = "4.0.0.1b5" # TODO: To become 4.1.0 +version = "4.0.0.1b6" # TODO: To become 4.1.0 description = "Serverless Chalice Application for Monitoring" authors = ["4DN-DCIC Team "] license = "MIT" @@ -27,7 +27,7 @@ pytz = "^2020.1" tibanna-ff = "^3.1.1" ## adding foursight-core # use below for deployment -foursight-core = "5.0.0.1b5" +foursight-core = "5.0.0.1b6" # use below for tests but not for deployment # foursight-core = { git = "https://github.com/4dn-dcic/foursight-core.git", branch="master" } # Need pytest-redis 3.0.2 or higher for pytest 7.4.2 (or higher). From 6dea1b75e7c4490f0f787ffb816cded7919ee221 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Mon, 16 Oct 2023 12:45:38 -0400 Subject: [PATCH 06/21] Version update --- poetry.lock | 8 ++++---- pyproject.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index 25e4c63a..2d44b66e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -569,13 +569,13 @@ files = [ [[package]] name = "foursight-core" -version = "5.0.0.1b6" +version = "5.0.0.1b8" description = "Serverless Chalice Application for Monitoring" optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "foursight_core-5.0.0.1b6-py3-none-any.whl", hash = "sha256:5eb462f530037ff6552554de7b682524554c4dc70d9166faa021afca3cd8a844"}, - {file = "foursight_core-5.0.0.1b6.tar.gz", hash = "sha256:04f35eca74a0c45bae1cf10f3e15016771bbe82c0fb4b6faa9e09d8064506b1d"}, + {file = "foursight_core-5.0.0.1b8-py3-none-any.whl", hash = "sha256:74b955bf935f5c88497b15c7df74dd071deeb709eea0d073c66dffb53e5ce903"}, + {file = "foursight_core-5.0.0.1b8.tar.gz", hash = "sha256:7753337ee1299ffd3b8d94a0d6e5a965f98f41de0ac70d8cb194503a58107551"}, ] [package.dependencies] @@ -1987,4 +1987,4 @@ test = ["pytest (>=6.0.0)", "setuptools (>=65)"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.12" -content-hash = "d302a739431b835e5877dc3b5fa9effcc57a2d402488119cb9a382e95612d2ea" +content-hash = "8f76718b2ea4efe4c153a998e8278de3b4fa234815852cf7f1b03de784919c64" diff --git a/pyproject.toml b/pyproject.toml index 393a4bf6..8fa61dd0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "foursight" -version = "4.0.0.1b6" # TODO: To become 4.1.0 +version = "4.0.0.1b8" # TODO: To become 4.1.0 description = "Serverless Chalice Application for Monitoring" authors = ["4DN-DCIC Team "] license = "MIT" @@ -27,7 +27,7 @@ pytz = "^2020.1" tibanna-ff = "^3.1.1" ## adding foursight-core # use below for deployment -foursight-core = "5.0.0.1b6" +foursight-core = "5.0.0.1b8" # use below for tests but not for deployment # foursight-core = { git = "https://github.com/4dn-dcic/foursight-core.git", branch="master" } # Need pytest-redis 3.0.2 or higher for pytest 7.4.2 (or higher). From 56c3cf9dde8a0cd68b4550353d8272587a5ce1e1 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Tue, 17 Oct 2023 14:27:49 -0400 Subject: [PATCH 07/21] Version update --- poetry.lock | 8 ++++---- pyproject.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index 2d44b66e..a6d8d1c4 100644 --- a/poetry.lock +++ b/poetry.lock @@ -569,13 +569,13 @@ files = [ [[package]] name = "foursight-core" -version = "5.0.0.1b8" +version = "5.0.0.1b9" description = "Serverless Chalice Application for Monitoring" optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "foursight_core-5.0.0.1b8-py3-none-any.whl", hash = "sha256:74b955bf935f5c88497b15c7df74dd071deeb709eea0d073c66dffb53e5ce903"}, - {file = "foursight_core-5.0.0.1b8.tar.gz", hash = "sha256:7753337ee1299ffd3b8d94a0d6e5a965f98f41de0ac70d8cb194503a58107551"}, + {file = "foursight_core-5.0.0.1b9-py3-none-any.whl", hash = "sha256:471aea583102ef0f241bbad2cb491b304fb00e0fd5226be3881d30ba1419bef9"}, + {file = "foursight_core-5.0.0.1b9.tar.gz", hash = "sha256:8c6810725111061637d413a356fe0c148ca257fd7637f76f61b939c10cac1399"}, ] [package.dependencies] @@ -1987,4 +1987,4 @@ test = ["pytest (>=6.0.0)", "setuptools (>=65)"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.12" -content-hash = "8f76718b2ea4efe4c153a998e8278de3b4fa234815852cf7f1b03de784919c64" +content-hash = "a5019a76a0b07d86d97a295853f518c582445cde268ea39bfd8652eee2b53ead" diff --git a/pyproject.toml b/pyproject.toml index 8fa61dd0..5e87938b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "foursight" -version = "4.0.0.1b8" # TODO: To become 4.1.0 +version = "4.0.0.1b9" # TODO: To become 4.1.0 description = "Serverless Chalice Application for Monitoring" authors = ["4DN-DCIC Team "] license = "MIT" @@ -27,7 +27,7 @@ pytz = "^2020.1" tibanna-ff = "^3.1.1" ## adding foursight-core # use below for deployment -foursight-core = "5.0.0.1b8" +foursight-core = "5.0.0.1b9" # use below for tests but not for deployment # foursight-core = { git = "https://github.com/4dn-dcic/foursight-core.git", branch="master" } # Need pytest-redis 3.0.2 or higher for pytest 7.4.2 (or higher). From 69f610f8aee87347ba95e44dc2f2ae640f80b741 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Thu, 19 Oct 2023 14:15:38 -0400 Subject: [PATCH 08/21] Version update --- poetry.lock | 106 ++++--------------------------------------------- pyproject.toml | 4 +- 2 files changed, 10 insertions(+), 100 deletions(-) diff --git a/poetry.lock b/poetry.lock index a6d8d1c4..585d38a0 100644 --- a/poetry.lock +++ b/poetry.lock @@ -569,37 +569,16 @@ files = [ [[package]] name = "foursight-core" -version = "5.0.0.1b9" +version = "5.0.0.1b10" description = "Serverless Chalice Application for Monitoring" optional = false -python-versions = ">=3.8,<3.12" -files = [ - {file = "foursight_core-5.0.0.1b9-py3-none-any.whl", hash = "sha256:471aea583102ef0f241bbad2cb491b304fb00e0fd5226be3881d30ba1419bef9"}, - {file = "foursight_core-5.0.0.1b9.tar.gz", hash = "sha256:8c6810725111061637d413a356fe0c148ca257fd7637f76f61b939c10cac1399"}, -] +python-versions = "*" +files = [] +develop = true -[package.dependencies] -boto3 = ">=1.28.62,<2.0.0" -botocore = ">=1.31.62,<2.0.0" -click = ">=7.1.2,<8.0.0" -cron-descriptor = ">=1.2.31,<2.0.0" -cryptography = "39.0.2" -dcicutils = ">=8.0.0,<9.0.0" -elasticsearch = "7.13.4" -elasticsearch-dsl = ">=7.0.0,<8.0.0" -geocoder = "1.38.1" -gitpython = ">=3.1.2,<4.0.0" -google = ">=3.0.0,<4.0.0" -google-api-python-client = ">=1.12.5,<2.0.0" -google-auth-oauthlib = ">=0.7.0,<0.8.0" -Jinja2 = ">=3.1.2,<4.0.0" -MarkupSafe = ">=2.1.3,<3.0.0" -pyDes = ">=2.0.1,<3.0.0" -PyJWT = ">=2.5.0,<3.0.0" -pytz = ">=2020.1" -redis = ">=4.5.1,<5.0.0" -toml = ">=0.10.2,<1" -tzlocal = ">=5.0.1,<6.0.0" +[package.source] +type = "directory" +url = "../foursight-core" [[package]] name = "future" @@ -660,20 +639,6 @@ gitdb = ">=4.0.1,<5" [package.extras] test = ["black", "coverage[toml]", "ddt (>=1.1.1,!=1.4.3)", "mypy", "pre-commit", "pytest", "pytest-cov", "pytest-sugar"] -[[package]] -name = "google" -version = "3.0.0" -description = "Python bindings to the Google search engine." -optional = false -python-versions = "*" -files = [ - {file = "google-3.0.0-py2.py3-none-any.whl", hash = "sha256:889cf695f84e4ae2c55fbc0cfdaf4c1e729417fa52ab1db0485202ba173e4935"}, - {file = "google-3.0.0.tar.gz", hash = "sha256:143530122ee5130509ad5e989f0512f7cb218b2d4eddbafbad40fd10e8d8ccbe"}, -] - -[package.dependencies] -beautifulsoup4 = "*" - [[package]] name = "google-analytics-data" version = "0.17.1" @@ -723,25 +688,6 @@ grpc = ["grpcio (>=1.33.2,<2.0dev)", "grpcio (>=1.49.1,<2.0dev)", "grpcio-status grpcgcp = ["grpcio-gcp (>=0.2.2,<1.0.dev0)"] grpcio-gcp = ["grpcio-gcp (>=0.2.2,<1.0.dev0)"] -[[package]] -name = "google-api-python-client" -version = "1.12.11" -description = "Google API Client Library for Python" -optional = false -python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*" -files = [ - {file = "google-api-python-client-1.12.11.tar.gz", hash = "sha256:1b4bd42a46321e13c0542a9e4d96fa05d73626f07b39f83a73a947d70ca706a9"}, - {file = "google_api_python_client-1.12.11-py2.py3-none-any.whl", hash = "sha256:7e0a1a265c8d3088ee1987778c72683fcb376e32bada8d7767162bd9c503fd9b"}, -] - -[package.dependencies] -google-api-core = {version = ">=1.21.0,<3dev", markers = "python_version >= \"3\""} -google-auth = {version = ">=1.16.0,<3dev", markers = "python_version >= \"3\""} -google-auth-httplib2 = ">=0.0.3" -httplib2 = ">=0.15.0,<1dev" -six = ">=1.13.0,<2dev" -uritemplate = ">=3.0.0,<4dev" - [[package]] name = "google-auth" version = "2.23.3" @@ -765,21 +711,6 @@ pyopenssl = ["cryptography (>=38.0.3)", "pyopenssl (>=20.0.0)"] reauth = ["pyu2f (>=0.1.5)"] requests = ["requests (>=2.20.0,<3.0.0.dev0)"] -[[package]] -name = "google-auth-httplib2" -version = "0.1.1" -description = "Google Authentication Library: httplib2 transport" -optional = false -python-versions = "*" -files = [ - {file = "google-auth-httplib2-0.1.1.tar.gz", hash = "sha256:c64bc555fdc6dd788ea62ecf7bccffcf497bf77244887a3f3d7a5a02f8e3fc29"}, - {file = "google_auth_httplib2-0.1.1-py2.py3-none-any.whl", hash = "sha256:42c50900b8e4dcdf8222364d1f0efe32b8421fb6ed72f2613f12f75cc933478c"}, -] - -[package.dependencies] -google-auth = "*" -httplib2 = ">=0.19.0" - [[package]] name = "google-auth-oauthlib" version = "0.7.1" @@ -1297,16 +1228,6 @@ files = [ {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, ] -[[package]] -name = "pydes" -version = "2.0.1" -description = "Pure python implementation of DES and TRIPLE DES encryption algorithm" -optional = false -python-versions = "*" -files = [ - {file = "pyDes-2.0.1.tar.gz", hash = "sha256:e2ab8e21d2b83e90d90dbfdcb6fb8ac0000b813238b7ecaede04f8435c389012"}, -] - [[package]] name = "pyjwt" version = "2.8.0" @@ -1865,17 +1786,6 @@ tzdata = {version = "*", markers = "platform_system == \"Windows\""} [package.extras] devenv = ["black", "check-manifest", "flake8", "pyroma", "pytest (>=4.3)", "pytest-cov", "pytest-mock (>=3.3)", "zest.releaser"] -[[package]] -name = "uritemplate" -version = "3.0.1" -description = "URI templates" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -files = [ - {file = "uritemplate-3.0.1-py2.py3-none-any.whl", hash = "sha256:07620c3f3f8eed1f12600845892b0e036a2420acf513c53f7de0abd911a5894f"}, - {file = "uritemplate-3.0.1.tar.gz", hash = "sha256:5af8ad10cec94f215e3f48112de2022e1d5a37ed427fbd88652fa908f2ab7cae"}, -] - [[package]] name = "urllib3" version = "1.26.17" @@ -1987,4 +1897,4 @@ test = ["pytest (>=6.0.0)", "setuptools (>=65)"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.12" -content-hash = "a5019a76a0b07d86d97a295853f518c582445cde268ea39bfd8652eee2b53ead" +content-hash = "8df025092527841c468b11052daeacf0caf2b8df52d5e02ccd85dea974911e5d" diff --git a/pyproject.toml b/pyproject.toml index 5e87938b..2c162e39 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "foursight" -version = "4.0.0.1b9" # TODO: To become 4.1.0 +version = "4.0.0.1b10" # TODO: To become 4.1.0 description = "Serverless Chalice Application for Monitoring" authors = ["4DN-DCIC Team "] license = "MIT" @@ -27,7 +27,7 @@ pytz = "^2020.1" tibanna-ff = "^3.1.1" ## adding foursight-core # use below for deployment -foursight-core = "5.0.0.1b9" +foursight-core = "5.0.0.1b10" # use below for tests but not for deployment # foursight-core = { git = "https://github.com/4dn-dcic/foursight-core.git", branch="master" } # Need pytest-redis 3.0.2 or higher for pytest 7.4.2 (or higher). From ddbff4fdc32d20c1d4d5d0033bde16d0d7e9bbc1 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Mon, 23 Oct 2023 14:28:37 -0400 Subject: [PATCH 09/21] Version update --- poetry.lock | 106 +++++++++++++++++++++++++++++++++++++++++++++---- pyproject.toml | 4 +- 2 files changed, 100 insertions(+), 10 deletions(-) diff --git a/poetry.lock b/poetry.lock index 585d38a0..06c0944c 100644 --- a/poetry.lock +++ b/poetry.lock @@ -569,16 +569,37 @@ files = [ [[package]] name = "foursight-core" -version = "5.0.0.1b10" +version = "5.0.0.1b11" description = "Serverless Chalice Application for Monitoring" optional = false -python-versions = "*" -files = [] -develop = true +python-versions = ">=3.8,<3.12" +files = [ + {file = "foursight_core-5.0.0.1b11-py3-none-any.whl", hash = "sha256:9ba118a2dc0fcee84306962303c6d331f7c0512650a316159e1e8900ca2062c3"}, + {file = "foursight_core-5.0.0.1b11.tar.gz", hash = "sha256:468741f3099ee67975f7daf10f930dfe382007e19d8dafa141cd8b76b35304c2"}, +] -[package.source] -type = "directory" -url = "../foursight-core" +[package.dependencies] +boto3 = ">=1.28.62,<2.0.0" +botocore = ">=1.31.62,<2.0.0" +click = ">=7.1.2,<8.0.0" +cron-descriptor = ">=1.2.31,<2.0.0" +cryptography = "39.0.2" +dcicutils = ">=8.0.0,<9.0.0" +elasticsearch = "7.13.4" +elasticsearch-dsl = ">=7.0.0,<8.0.0" +geocoder = "1.38.1" +gitpython = ">=3.1.2,<4.0.0" +google = ">=3.0.0,<4.0.0" +google-api-python-client = ">=1.12.5,<2.0.0" +google-auth-oauthlib = ">=0.7.0,<0.8.0" +Jinja2 = ">=3.1.2,<4.0.0" +MarkupSafe = ">=2.1.3,<3.0.0" +pyDes = ">=2.0.1,<3.0.0" +PyJWT = ">=2.5.0,<3.0.0" +pytz = ">=2020.1" +redis = ">=4.5.1,<5.0.0" +toml = ">=0.10.2,<1" +tzlocal = ">=5.0.1,<6.0.0" [[package]] name = "future" @@ -639,6 +660,20 @@ gitdb = ">=4.0.1,<5" [package.extras] test = ["black", "coverage[toml]", "ddt (>=1.1.1,!=1.4.3)", "mypy", "pre-commit", "pytest", "pytest-cov", "pytest-sugar"] +[[package]] +name = "google" +version = "3.0.0" +description = "Python bindings to the Google search engine." +optional = false +python-versions = "*" +files = [ + {file = "google-3.0.0-py2.py3-none-any.whl", hash = "sha256:889cf695f84e4ae2c55fbc0cfdaf4c1e729417fa52ab1db0485202ba173e4935"}, + {file = "google-3.0.0.tar.gz", hash = "sha256:143530122ee5130509ad5e989f0512f7cb218b2d4eddbafbad40fd10e8d8ccbe"}, +] + +[package.dependencies] +beautifulsoup4 = "*" + [[package]] name = "google-analytics-data" version = "0.17.1" @@ -688,6 +723,25 @@ grpc = ["grpcio (>=1.33.2,<2.0dev)", "grpcio (>=1.49.1,<2.0dev)", "grpcio-status grpcgcp = ["grpcio-gcp (>=0.2.2,<1.0.dev0)"] grpcio-gcp = ["grpcio-gcp (>=0.2.2,<1.0.dev0)"] +[[package]] +name = "google-api-python-client" +version = "1.12.11" +description = "Google API Client Library for Python" +optional = false +python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*" +files = [ + {file = "google-api-python-client-1.12.11.tar.gz", hash = "sha256:1b4bd42a46321e13c0542a9e4d96fa05d73626f07b39f83a73a947d70ca706a9"}, + {file = "google_api_python_client-1.12.11-py2.py3-none-any.whl", hash = "sha256:7e0a1a265c8d3088ee1987778c72683fcb376e32bada8d7767162bd9c503fd9b"}, +] + +[package.dependencies] +google-api-core = {version = ">=1.21.0,<3dev", markers = "python_version >= \"3\""} +google-auth = {version = ">=1.16.0,<3dev", markers = "python_version >= \"3\""} +google-auth-httplib2 = ">=0.0.3" +httplib2 = ">=0.15.0,<1dev" +six = ">=1.13.0,<2dev" +uritemplate = ">=3.0.0,<4dev" + [[package]] name = "google-auth" version = "2.23.3" @@ -711,6 +765,21 @@ pyopenssl = ["cryptography (>=38.0.3)", "pyopenssl (>=20.0.0)"] reauth = ["pyu2f (>=0.1.5)"] requests = ["requests (>=2.20.0,<3.0.0.dev0)"] +[[package]] +name = "google-auth-httplib2" +version = "0.1.1" +description = "Google Authentication Library: httplib2 transport" +optional = false +python-versions = "*" +files = [ + {file = "google-auth-httplib2-0.1.1.tar.gz", hash = "sha256:c64bc555fdc6dd788ea62ecf7bccffcf497bf77244887a3f3d7a5a02f8e3fc29"}, + {file = "google_auth_httplib2-0.1.1-py2.py3-none-any.whl", hash = "sha256:42c50900b8e4dcdf8222364d1f0efe32b8421fb6ed72f2613f12f75cc933478c"}, +] + +[package.dependencies] +google-auth = "*" +httplib2 = ">=0.19.0" + [[package]] name = "google-auth-oauthlib" version = "0.7.1" @@ -1228,6 +1297,16 @@ files = [ {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, ] +[[package]] +name = "pydes" +version = "2.0.1" +description = "Pure python implementation of DES and TRIPLE DES encryption algorithm" +optional = false +python-versions = "*" +files = [ + {file = "pyDes-2.0.1.tar.gz", hash = "sha256:e2ab8e21d2b83e90d90dbfdcb6fb8ac0000b813238b7ecaede04f8435c389012"}, +] + [[package]] name = "pyjwt" version = "2.8.0" @@ -1786,6 +1865,17 @@ tzdata = {version = "*", markers = "platform_system == \"Windows\""} [package.extras] devenv = ["black", "check-manifest", "flake8", "pyroma", "pytest (>=4.3)", "pytest-cov", "pytest-mock (>=3.3)", "zest.releaser"] +[[package]] +name = "uritemplate" +version = "3.0.1" +description = "URI templates" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +files = [ + {file = "uritemplate-3.0.1-py2.py3-none-any.whl", hash = "sha256:07620c3f3f8eed1f12600845892b0e036a2420acf513c53f7de0abd911a5894f"}, + {file = "uritemplate-3.0.1.tar.gz", hash = "sha256:5af8ad10cec94f215e3f48112de2022e1d5a37ed427fbd88652fa908f2ab7cae"}, +] + [[package]] name = "urllib3" version = "1.26.17" @@ -1897,4 +1987,4 @@ test = ["pytest (>=6.0.0)", "setuptools (>=65)"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.12" -content-hash = "8df025092527841c468b11052daeacf0caf2b8df52d5e02ccd85dea974911e5d" +content-hash = "00acb5342d951246e24fd69a5f6452dc6a9354def5e25945042c8ff9b97f001d" diff --git a/pyproject.toml b/pyproject.toml index 2c162e39..1e7cc20b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "foursight" -version = "4.0.0.1b10" # TODO: To become 4.1.0 +version = "4.0.0.1b11" # TODO: To become 4.1.0 description = "Serverless Chalice Application for Monitoring" authors = ["4DN-DCIC Team "] license = "MIT" @@ -27,7 +27,7 @@ pytz = "^2020.1" tibanna-ff = "^3.1.1" ## adding foursight-core # use below for deployment -foursight-core = "5.0.0.1b10" +foursight-core = "5.0.0.1b11" # use below for tests but not for deployment # foursight-core = { git = "https://github.com/4dn-dcic/foursight-core.git", branch="master" } # Need pytest-redis 3.0.2 or higher for pytest 7.4.2 (or higher). From ada0375de64ff2fd33e9f3598989e89d727a62e5 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Mon, 23 Oct 2023 16:54:43 -0400 Subject: [PATCH 10/21] Version update --- poetry.lock | 8 ++++---- pyproject.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index 06c0944c..908a57a0 100644 --- a/poetry.lock +++ b/poetry.lock @@ -569,13 +569,13 @@ files = [ [[package]] name = "foursight-core" -version = "5.0.0.1b11" +version = "5.0.0.1b12" description = "Serverless Chalice Application for Monitoring" optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "foursight_core-5.0.0.1b11-py3-none-any.whl", hash = "sha256:9ba118a2dc0fcee84306962303c6d331f7c0512650a316159e1e8900ca2062c3"}, - {file = "foursight_core-5.0.0.1b11.tar.gz", hash = "sha256:468741f3099ee67975f7daf10f930dfe382007e19d8dafa141cd8b76b35304c2"}, + {file = "foursight_core-5.0.0.1b12-py3-none-any.whl", hash = "sha256:091eb97d74977921d8b010575742bd8731ed176af1c69f390d0074516922209f"}, + {file = "foursight_core-5.0.0.1b12.tar.gz", hash = "sha256:44810fea7d6ec455ab85117ad0c534259195be4241b91dcc78884df155165fb8"}, ] [package.dependencies] @@ -1987,4 +1987,4 @@ test = ["pytest (>=6.0.0)", "setuptools (>=65)"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.12" -content-hash = "00acb5342d951246e24fd69a5f6452dc6a9354def5e25945042c8ff9b97f001d" +content-hash = "a64c8c95db5dc240652e3a368e033c110f7d4c47f9ba4145a75ff9a36caa5cff" diff --git a/pyproject.toml b/pyproject.toml index 1e7cc20b..a1789820 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "foursight" -version = "4.0.0.1b11" # TODO: To become 4.1.0 +version = "4.0.0.1b12" # TODO: To become 4.1.0 description = "Serverless Chalice Application for Monitoring" authors = ["4DN-DCIC Team "] license = "MIT" @@ -27,7 +27,7 @@ pytz = "^2020.1" tibanna-ff = "^3.1.1" ## adding foursight-core # use below for deployment -foursight-core = "5.0.0.1b11" +foursight-core = "5.0.0.1b12" # use below for tests but not for deployment # foursight-core = { git = "https://github.com/4dn-dcic/foursight-core.git", branch="master" } # Need pytest-redis 3.0.2 or higher for pytest 7.4.2 (or higher). From 1f468a87e145f9fde4884ecb77ddbc3891c7d68a Mon Sep 17 00:00:00 2001 From: David Michaels Date: Tue, 24 Oct 2023 13:22:43 -0400 Subject: [PATCH 11/21] Update versions --- poetry.lock | 8 ++++---- pyproject.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index 908a57a0..a063816a 100644 --- a/poetry.lock +++ b/poetry.lock @@ -569,13 +569,13 @@ files = [ [[package]] name = "foursight-core" -version = "5.0.0.1b12" +version = "5.0.0.1b13" description = "Serverless Chalice Application for Monitoring" optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "foursight_core-5.0.0.1b12-py3-none-any.whl", hash = "sha256:091eb97d74977921d8b010575742bd8731ed176af1c69f390d0074516922209f"}, - {file = "foursight_core-5.0.0.1b12.tar.gz", hash = "sha256:44810fea7d6ec455ab85117ad0c534259195be4241b91dcc78884df155165fb8"}, + {file = "foursight_core-5.0.0.1b13-py3-none-any.whl", hash = "sha256:56050bdbb7f4f759b809a0868448e8d68e80eabb641a4ea90d1eb8a51e75a14e"}, + {file = "foursight_core-5.0.0.1b13.tar.gz", hash = "sha256:3898ecabbca48fa7342bf2be8516e35ae51f4a538f751aea9b874df6c605f2c8"}, ] [package.dependencies] @@ -1987,4 +1987,4 @@ test = ["pytest (>=6.0.0)", "setuptools (>=65)"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.12" -content-hash = "a64c8c95db5dc240652e3a368e033c110f7d4c47f9ba4145a75ff9a36caa5cff" +content-hash = "188e25cfa15ec75262c4ad1f481a993ed2d10c8c3a8dbfcbeac704006444fbe7" diff --git a/pyproject.toml b/pyproject.toml index a1789820..ace3361e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "foursight" -version = "4.0.0.1b12" # TODO: To become 4.1.0 +version = "4.0.0.1b13" # TODO: To become 4.1.0 description = "Serverless Chalice Application for Monitoring" authors = ["4DN-DCIC Team "] license = "MIT" @@ -27,7 +27,7 @@ pytz = "^2020.1" tibanna-ff = "^3.1.1" ## adding foursight-core # use below for deployment -foursight-core = "5.0.0.1b12" +foursight-core = "5.0.0.1b13" # use below for tests but not for deployment # foursight-core = { git = "https://github.com/4dn-dcic/foursight-core.git", branch="master" } # Need pytest-redis 3.0.2 or higher for pytest 7.4.2 (or higher). From ee3eb0d578ea0821822b4e9e617595f490678db6 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Wed, 25 Oct 2023 07:40:09 -0400 Subject: [PATCH 12/21] Update versions --- poetry.lock | 8 ++++---- pyproject.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index a063816a..b40a742a 100644 --- a/poetry.lock +++ b/poetry.lock @@ -569,13 +569,13 @@ files = [ [[package]] name = "foursight-core" -version = "5.0.0.1b13" +version = "5.0.0.1b14" description = "Serverless Chalice Application for Monitoring" optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "foursight_core-5.0.0.1b13-py3-none-any.whl", hash = "sha256:56050bdbb7f4f759b809a0868448e8d68e80eabb641a4ea90d1eb8a51e75a14e"}, - {file = "foursight_core-5.0.0.1b13.tar.gz", hash = "sha256:3898ecabbca48fa7342bf2be8516e35ae51f4a538f751aea9b874df6c605f2c8"}, + {file = "foursight_core-5.0.0.1b14-py3-none-any.whl", hash = "sha256:2c527f948a97b66e74c20f1c5a643dd74de2216581914251df4194c68020e963"}, + {file = "foursight_core-5.0.0.1b14.tar.gz", hash = "sha256:96d71db65fae4bab8b23a8e4cab20c2b6d269b434644913fa281dc2dc72bd14d"}, ] [package.dependencies] @@ -1987,4 +1987,4 @@ test = ["pytest (>=6.0.0)", "setuptools (>=65)"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.12" -content-hash = "188e25cfa15ec75262c4ad1f481a993ed2d10c8c3a8dbfcbeac704006444fbe7" +content-hash = "0f157bdfb4580676f870d91a095f7a9ee7325b4a466fc515f23f01fe6b785fae" diff --git a/pyproject.toml b/pyproject.toml index ace3361e..8c9879b0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "foursight" -version = "4.0.0.1b13" # TODO: To become 4.1.0 +version = "4.0.0.1b14" # TODO: To become 4.1.0 description = "Serverless Chalice Application for Monitoring" authors = ["4DN-DCIC Team "] license = "MIT" @@ -27,7 +27,7 @@ pytz = "^2020.1" tibanna-ff = "^3.1.1" ## adding foursight-core # use below for deployment -foursight-core = "5.0.0.1b13" +foursight-core = "5.0.0.1b14" # use below for tests but not for deployment # foursight-core = { git = "https://github.com/4dn-dcic/foursight-core.git", branch="master" } # Need pytest-redis 3.0.2 or higher for pytest 7.4.2 (or higher). From fbca4a31b57ee68b861190dfef8bb1d4d9a8f518 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Wed, 25 Oct 2023 14:34:08 -0400 Subject: [PATCH 13/21] Update versions --- poetry.lock | 8 ++++---- pyproject.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index b40a742a..62fe28e0 100644 --- a/poetry.lock +++ b/poetry.lock @@ -569,13 +569,13 @@ files = [ [[package]] name = "foursight-core" -version = "5.0.0.1b14" +version = "5.0.0.1b15" description = "Serverless Chalice Application for Monitoring" optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "foursight_core-5.0.0.1b14-py3-none-any.whl", hash = "sha256:2c527f948a97b66e74c20f1c5a643dd74de2216581914251df4194c68020e963"}, - {file = "foursight_core-5.0.0.1b14.tar.gz", hash = "sha256:96d71db65fae4bab8b23a8e4cab20c2b6d269b434644913fa281dc2dc72bd14d"}, + {file = "foursight_core-5.0.0.1b15-py3-none-any.whl", hash = "sha256:e7a1c25fd9c80234cf5d8886fa38498f6c8fcc935403a7e60784a170c11c0cd0"}, + {file = "foursight_core-5.0.0.1b15.tar.gz", hash = "sha256:26cfad88a9547cfcba755fdd12208738ff13710e69f2e31b1153eef7684db723"}, ] [package.dependencies] @@ -1987,4 +1987,4 @@ test = ["pytest (>=6.0.0)", "setuptools (>=65)"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.12" -content-hash = "0f157bdfb4580676f870d91a095f7a9ee7325b4a466fc515f23f01fe6b785fae" +content-hash = "a931e4d5d2b79dc5f365c4b2fa40394d463636aebf6b13b25653505c2cee835c" diff --git a/pyproject.toml b/pyproject.toml index 8c9879b0..ebdd9820 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "foursight" -version = "4.0.0.1b14" # TODO: To become 4.1.0 +version = "4.0.0.1b15" # TODO: To become 4.1.0 description = "Serverless Chalice Application for Monitoring" authors = ["4DN-DCIC Team "] license = "MIT" @@ -27,7 +27,7 @@ pytz = "^2020.1" tibanna-ff = "^3.1.1" ## adding foursight-core # use below for deployment -foursight-core = "5.0.0.1b14" +foursight-core = "5.0.0.1b15" # use below for tests but not for deployment # foursight-core = { git = "https://github.com/4dn-dcic/foursight-core.git", branch="master" } # Need pytest-redis 3.0.2 or higher for pytest 7.4.2 (or higher). From ee3663bfd3375a071270fb96fdd449dd2a246709 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Thu, 26 Oct 2023 17:20:16 -0400 Subject: [PATCH 14/21] Update versions --- poetry.lock | 8 ++++---- pyproject.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index 62fe28e0..b3c54de5 100644 --- a/poetry.lock +++ b/poetry.lock @@ -569,13 +569,13 @@ files = [ [[package]] name = "foursight-core" -version = "5.0.0.1b15" +version = "5.0.0.1b16" description = "Serverless Chalice Application for Monitoring" optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "foursight_core-5.0.0.1b15-py3-none-any.whl", hash = "sha256:e7a1c25fd9c80234cf5d8886fa38498f6c8fcc935403a7e60784a170c11c0cd0"}, - {file = "foursight_core-5.0.0.1b15.tar.gz", hash = "sha256:26cfad88a9547cfcba755fdd12208738ff13710e69f2e31b1153eef7684db723"}, + {file = "foursight_core-5.0.0.1b16-py3-none-any.whl", hash = "sha256:9d7c4fa01e80a49b563f457deab395b1debd62bb1710cab86a00949913dc02ee"}, + {file = "foursight_core-5.0.0.1b16.tar.gz", hash = "sha256:718d8426dde0cd1e16d45cb0aaea79d948048b0da08306b5142db1d8b5da394a"}, ] [package.dependencies] @@ -1987,4 +1987,4 @@ test = ["pytest (>=6.0.0)", "setuptools (>=65)"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.12" -content-hash = "a931e4d5d2b79dc5f365c4b2fa40394d463636aebf6b13b25653505c2cee835c" +content-hash = "b7b93ecbe313c363fbe70c7450e2f64a4c30e02fa9ef231d0575d16c7fdc36e7" diff --git a/pyproject.toml b/pyproject.toml index ebdd9820..7f0ff236 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "foursight" -version = "4.0.0.1b15" # TODO: To become 4.1.0 +version = "4.0.0.1b16" # TODO: To become 4.1.0 description = "Serverless Chalice Application for Monitoring" authors = ["4DN-DCIC Team "] license = "MIT" @@ -27,7 +27,7 @@ pytz = "^2020.1" tibanna-ff = "^3.1.1" ## adding foursight-core # use below for deployment -foursight-core = "5.0.0.1b15" +foursight-core = "5.0.0.1b16" # use below for tests but not for deployment # foursight-core = { git = "https://github.com/4dn-dcic/foursight-core.git", branch="master" } # Need pytest-redis 3.0.2 or higher for pytest 7.4.2 (or higher). From 6b941027c3a16e67ea4317a937214d4fca9bb2d6 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Wed, 1 Nov 2023 12:20:02 -0400 Subject: [PATCH 15/21] update versions --- poetry.lock | 8 ++++---- pyproject.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index b3c54de5..e4b21528 100644 --- a/poetry.lock +++ b/poetry.lock @@ -569,13 +569,13 @@ files = [ [[package]] name = "foursight-core" -version = "5.0.0.1b16" +version = "5.0.0.1b18" description = "Serverless Chalice Application for Monitoring" optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "foursight_core-5.0.0.1b16-py3-none-any.whl", hash = "sha256:9d7c4fa01e80a49b563f457deab395b1debd62bb1710cab86a00949913dc02ee"}, - {file = "foursight_core-5.0.0.1b16.tar.gz", hash = "sha256:718d8426dde0cd1e16d45cb0aaea79d948048b0da08306b5142db1d8b5da394a"}, + {file = "foursight_core-5.0.0.1b18-py3-none-any.whl", hash = "sha256:88f39486913a4b12031f39eda0a3146659e8360ef540f423d977585dc9269cda"}, + {file = "foursight_core-5.0.0.1b18.tar.gz", hash = "sha256:e303fd18db6ec9ecf3935a799498eed9035669fa9b7d50e6e547d6a34eea356f"}, ] [package.dependencies] @@ -1987,4 +1987,4 @@ test = ["pytest (>=6.0.0)", "setuptools (>=65)"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.12" -content-hash = "b7b93ecbe313c363fbe70c7450e2f64a4c30e02fa9ef231d0575d16c7fdc36e7" +content-hash = "24706a611ac28261620403105a47d59a5066ddd82f33df1691469213ff3b3913" diff --git a/pyproject.toml b/pyproject.toml index 7f0ff236..0fb01813 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "foursight" -version = "4.0.0.1b16" # TODO: To become 4.1.0 +version = "4.0.0.1b18" # TODO: To become 4.1.0 description = "Serverless Chalice Application for Monitoring" authors = ["4DN-DCIC Team "] license = "MIT" @@ -27,7 +27,7 @@ pytz = "^2020.1" tibanna-ff = "^3.1.1" ## adding foursight-core # use below for deployment -foursight-core = "5.0.0.1b16" +foursight-core = "5.0.0.1b18" # use below for tests but not for deployment # foursight-core = { git = "https://github.com/4dn-dcic/foursight-core.git", branch="master" } # Need pytest-redis 3.0.2 or higher for pytest 7.4.2 (or higher). From d5f7265a7ceb4111700bc6a0dd112431cec5e1ea Mon Sep 17 00:00:00 2001 From: David Michaels Date: Wed, 1 Nov 2023 15:10:25 -0400 Subject: [PATCH 16/21] update versions --- poetry.lock | 8 ++++---- pyproject.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index e4b21528..36476a5f 100644 --- a/poetry.lock +++ b/poetry.lock @@ -569,13 +569,13 @@ files = [ [[package]] name = "foursight-core" -version = "5.0.0.1b18" +version = "5.0.0.1b19" description = "Serverless Chalice Application for Monitoring" optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "foursight_core-5.0.0.1b18-py3-none-any.whl", hash = "sha256:88f39486913a4b12031f39eda0a3146659e8360ef540f423d977585dc9269cda"}, - {file = "foursight_core-5.0.0.1b18.tar.gz", hash = "sha256:e303fd18db6ec9ecf3935a799498eed9035669fa9b7d50e6e547d6a34eea356f"}, + {file = "foursight_core-5.0.0.1b19-py3-none-any.whl", hash = "sha256:383a700817d195c27ec1fce324a80cb3eea926d5d581e34c326fac10ca814547"}, + {file = "foursight_core-5.0.0.1b19.tar.gz", hash = "sha256:04d715d84611abe7e622f7556c00515d18b2915eeee8bee640d1605a3fcdace6"}, ] [package.dependencies] @@ -1987,4 +1987,4 @@ test = ["pytest (>=6.0.0)", "setuptools (>=65)"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.12" -content-hash = "24706a611ac28261620403105a47d59a5066ddd82f33df1691469213ff3b3913" +content-hash = "94e491daad3a1775dcf9c42631ff6c7aeaf620a0db3a1f9ec04394f377079473" diff --git a/pyproject.toml b/pyproject.toml index 0fb01813..c6a5c374 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "foursight" -version = "4.0.0.1b18" # TODO: To become 4.1.0 +version = "4.0.0.1b19" # TODO: To become 4.1.0 description = "Serverless Chalice Application for Monitoring" authors = ["4DN-DCIC Team "] license = "MIT" @@ -27,7 +27,7 @@ pytz = "^2020.1" tibanna-ff = "^3.1.1" ## adding foursight-core # use below for deployment -foursight-core = "5.0.0.1b18" +foursight-core = "5.0.0.1b19" # use below for tests but not for deployment # foursight-core = { git = "https://github.com/4dn-dcic/foursight-core.git", branch="master" } # Need pytest-redis 3.0.2 or higher for pytest 7.4.2 (or higher). From f24b110cfed0b412aa2259062e76e05192fdc5e3 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Thu, 2 Nov 2023 07:43:06 -0400 Subject: [PATCH 17/21] update versions --- poetry.lock | 8 ++++---- pyproject.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index 36476a5f..13bbd3ab 100644 --- a/poetry.lock +++ b/poetry.lock @@ -569,13 +569,13 @@ files = [ [[package]] name = "foursight-core" -version = "5.0.0.1b19" +version = "5.0.0.1b20" description = "Serverless Chalice Application for Monitoring" optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "foursight_core-5.0.0.1b19-py3-none-any.whl", hash = "sha256:383a700817d195c27ec1fce324a80cb3eea926d5d581e34c326fac10ca814547"}, - {file = "foursight_core-5.0.0.1b19.tar.gz", hash = "sha256:04d715d84611abe7e622f7556c00515d18b2915eeee8bee640d1605a3fcdace6"}, + {file = "foursight_core-5.0.0.1b20-py3-none-any.whl", hash = "sha256:0eae6d061c7f33d433d8e699ee68d7786ab7f880179811e8d128dfa5d26285f8"}, + {file = "foursight_core-5.0.0.1b20.tar.gz", hash = "sha256:d3468f1b217999c9be576fcf43b4b3a8df4aefc889308625b7b06a8791768f60"}, ] [package.dependencies] @@ -1987,4 +1987,4 @@ test = ["pytest (>=6.0.0)", "setuptools (>=65)"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.12" -content-hash = "94e491daad3a1775dcf9c42631ff6c7aeaf620a0db3a1f9ec04394f377079473" +content-hash = "cdb7400d12ea60026579020f7644e56e87fa11578436570b080da951a9b187e3" diff --git a/pyproject.toml b/pyproject.toml index c6a5c374..b2713e62 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "foursight" -version = "4.0.0.1b19" # TODO: To become 4.1.0 +version = "4.0.0.1b20" # TODO: To become 4.1.0 description = "Serverless Chalice Application for Monitoring" authors = ["4DN-DCIC Team "] license = "MIT" @@ -27,7 +27,7 @@ pytz = "^2020.1" tibanna-ff = "^3.1.1" ## adding foursight-core # use below for deployment -foursight-core = "5.0.0.1b19" +foursight-core = "5.0.0.1b20" # use below for tests but not for deployment # foursight-core = { git = "https://github.com/4dn-dcic/foursight-core.git", branch="master" } # Need pytest-redis 3.0.2 or higher for pytest 7.4.2 (or higher). From de6e0924e0848397391e8b87e599aa27755690bc Mon Sep 17 00:00:00 2001 From: David Michaels Date: Fri, 3 Nov 2023 13:41:28 -0400 Subject: [PATCH 18/21] update versions --- poetry.lock | 8 ++++---- pyproject.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index 13bbd3ab..db4c1fe3 100644 --- a/poetry.lock +++ b/poetry.lock @@ -569,13 +569,13 @@ files = [ [[package]] name = "foursight-core" -version = "5.0.0.1b20" +version = "5.0.0.1b21" description = "Serverless Chalice Application for Monitoring" optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "foursight_core-5.0.0.1b20-py3-none-any.whl", hash = "sha256:0eae6d061c7f33d433d8e699ee68d7786ab7f880179811e8d128dfa5d26285f8"}, - {file = "foursight_core-5.0.0.1b20.tar.gz", hash = "sha256:d3468f1b217999c9be576fcf43b4b3a8df4aefc889308625b7b06a8791768f60"}, + {file = "foursight_core-5.0.0.1b21-py3-none-any.whl", hash = "sha256:9fdd9ca16a4c41b50ad3201996e695acffc34e16f28b3e9d006bef620a0dc5d1"}, + {file = "foursight_core-5.0.0.1b21.tar.gz", hash = "sha256:e82cad548de91703d1eff3954a72ceb707590190ecfefb0d80c878b0a6783f71"}, ] [package.dependencies] @@ -1987,4 +1987,4 @@ test = ["pytest (>=6.0.0)", "setuptools (>=65)"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.12" -content-hash = "cdb7400d12ea60026579020f7644e56e87fa11578436570b080da951a9b187e3" +content-hash = "e4258dfd0406cf263dea1b203b0ebd434d99b8121b80c536dbdf101bdf835f1e" diff --git a/pyproject.toml b/pyproject.toml index b2713e62..a7dde987 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "foursight" -version = "4.0.0.1b20" # TODO: To become 4.1.0 +version = "4.0.0.1b21" # TODO: To become 4.1.0 description = "Serverless Chalice Application for Monitoring" authors = ["4DN-DCIC Team "] license = "MIT" @@ -27,7 +27,7 @@ pytz = "^2020.1" tibanna-ff = "^3.1.1" ## adding foursight-core # use below for deployment -foursight-core = "5.0.0.1b20" +foursight-core = "5.0.0.1b21" # use below for tests but not for deployment # foursight-core = { git = "https://github.com/4dn-dcic/foursight-core.git", branch="master" } # Need pytest-redis 3.0.2 or higher for pytest 7.4.2 (or higher). From a125cc23b8a8a9acef481aeb0430891570d35cc8 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Mon, 27 Nov 2023 09:20:58 -0500 Subject: [PATCH 19/21] Update to foursight-core 5.1.0. --- CHANGELOG.rst | 2 +- poetry.lock | 8 ++++---- pyproject.toml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 77641973..e511b3f9 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -11,7 +11,7 @@ Change Log 4.1.0 ===== -* New Portal Reindex page. +* New Portal Reindex page; foursight-core 5.1.0. * Update poetry to 1.4.2. 4.0.0 diff --git a/poetry.lock b/poetry.lock index db4c1fe3..f6784227 100644 --- a/poetry.lock +++ b/poetry.lock @@ -569,13 +569,13 @@ files = [ [[package]] name = "foursight-core" -version = "5.0.0.1b21" +version = "5.1.0" description = "Serverless Chalice Application for Monitoring" optional = false python-versions = ">=3.8,<3.12" files = [ - {file = "foursight_core-5.0.0.1b21-py3-none-any.whl", hash = "sha256:9fdd9ca16a4c41b50ad3201996e695acffc34e16f28b3e9d006bef620a0dc5d1"}, - {file = "foursight_core-5.0.0.1b21.tar.gz", hash = "sha256:e82cad548de91703d1eff3954a72ceb707590190ecfefb0d80c878b0a6783f71"}, + {file = "foursight_core-5.1.0-py3-none-any.whl", hash = "sha256:255c4748f27cfc4592685747eb06d147323909d34cb90ff4a3dc139b51ec1dd5"}, + {file = "foursight_core-5.1.0.tar.gz", hash = "sha256:f2aed7a0ad48fb18f53707470bb3b03b4e086d2fc01cc6dbdef0d224db7106d5"}, ] [package.dependencies] @@ -1987,4 +1987,4 @@ test = ["pytest (>=6.0.0)", "setuptools (>=65)"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.12" -content-hash = "e4258dfd0406cf263dea1b203b0ebd434d99b8121b80c536dbdf101bdf835f1e" +content-hash = "97216be3028869c859af149f0405b39bf16cc6b75c5aee2b5524be2b237de1e0" diff --git a/pyproject.toml b/pyproject.toml index a7dde987..b59925ee 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "foursight" -version = "4.0.0.1b21" # TODO: To become 4.1.0 +version = "4.1.0" description = "Serverless Chalice Application for Monitoring" authors = ["4DN-DCIC Team "] license = "MIT" @@ -27,7 +27,7 @@ pytz = "^2020.1" tibanna-ff = "^3.1.1" ## adding foursight-core # use below for deployment -foursight-core = "5.0.0.1b21" +foursight-core = "5.1.0" # use below for tests but not for deployment # foursight-core = { git = "https://github.com/4dn-dcic/foursight-core.git", branch="master" } # Need pytest-redis 3.0.2 or higher for pytest 7.4.2 (or higher). From e3b1eae702203142faba06692dd8e17f96f27333 Mon Sep 17 00:00:00 2001 From: David Michaels Date: Tue, 28 Nov 2023 09:50:36 -0500 Subject: [PATCH 20/21] change foursight-core from 5.1.0 to ^5.1.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b59925ee..0c40ca9f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,7 @@ pytz = "^2020.1" tibanna-ff = "^3.1.1" ## adding foursight-core # use below for deployment -foursight-core = "5.1.0" +foursight-core = "^5.1.0" # use below for tests but not for deployment # foursight-core = { git = "https://github.com/4dn-dcic/foursight-core.git", branch="master" } # Need pytest-redis 3.0.2 or higher for pytest 7.4.2 (or higher). From 0cb7ddc827caf0fb4eb62ff2da30909bfbf0345c Mon Sep 17 00:00:00 2001 From: David Michaels Date: Tue, 28 Nov 2023 09:51:57 -0500 Subject: [PATCH 21/21] change foursight-core from 5.1.0 to ^5.1.0 --- poetry.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/poetry.lock b/poetry.lock index f6784227..2e098d94 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1987,4 +1987,4 @@ test = ["pytest (>=6.0.0)", "setuptools (>=65)"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.12" -content-hash = "97216be3028869c859af149f0405b39bf16cc6b75c5aee2b5524be2b237de1e0" +content-hash = "4b048dcbad25c6d16c6fb01ab0d7a787ae7e1fda59ae701a53460a6292d60fee"