diff --git a/poetry.lock b/poetry.lock index 5ce53999..4845ce4a 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-api-core" version = "2.12.0" @@ -753,24 +718,6 @@ files = [ google-auth = "*" httplib2 = ">=0.19.0" -[[package]] -name = "google-auth-oauthlib" -version = "0.7.1" -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"}, -] - -[package.dependencies] -google-auth = ">=2.14.0" -requests-oauthlib = ">=0.7.0" - -[package.extras] -tool = ["click (>=6.0.0)"] - [[package]] name = "googleapis-common-protos" version = "1.60.0" @@ -981,22 +928,6 @@ files = [ [package.dependencies] psutil = {version = ">=4.0.0", markers = "sys_platform != \"cygwin\""} -[[package]] -name = "oauthlib" -version = "3.2.2" -description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic" -optional = false -python-versions = ">=3.6" -files = [ - {file = "oauthlib-3.2.2-py3-none-any.whl", hash = "sha256:8139f29aac13e25d502680e9e19963e83f16838d48a0d71c287fe40e7067fbca"}, - {file = "oauthlib-3.2.2.tar.gz", hash = "sha256:9859c40929662bec5d64f34d01c99e093149682a3f38915dc0655d5a633dd918"}, -] - -[package.extras] -rsa = ["cryptography (>=3.0.0)"] -signals = ["blinker (>=1.4.0)"] -signedtoken = ["cryptography (>=3.0.0)", "pyjwt (>=2.0.0,<3)"] - [[package]] name = "opensearch-py" version = "2.3.2" @@ -1153,16 +1084,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" @@ -1459,24 +1380,6 @@ urllib3 = ">=1.21.1,<1.27" socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] use-chardet-on-py3 = ["chardet (>=3.0.2,<5)"] -[[package]] -name = "requests-oauthlib" -version = "1.3.1" -description = "OAuthlib authentication support for Requests." -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -files = [ - {file = "requests-oauthlib-1.3.1.tar.gz", hash = "sha256:75beac4a47881eeb94d5ea5d6ad31ef88856affe2332b9aafb52c6452ccf0d7a"}, - {file = "requests_oauthlib-1.3.1-py2.py3-none-any.whl", hash = "sha256:2577c501a2fb8d05a304c09d090d6e47c306fef15809d102b327cf8364bddab5"}, -] - -[package.dependencies] -oauthlib = ">=3.0.0" -requests = ">=2.0.0" - -[package.extras] -rsa = ["oauthlib[signedtoken] (>=3.0.0)"] - [[package]] name = "rfc3986" version = "1.5.0" @@ -1843,4 +1746,4 @@ test = ["pytest (>=6.0.0)", "setuptools (>=65)"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.12" -content-hash = "8179dc08dbaa6361d1efae03e2040e11336da152bfcf908a2384b62a61449033" +content-hash = "db5b4ae988f83f01bb1bb36d5dec2cf23bbdbf4fc8c98998977f32135f2345e4" diff --git a/pyproject.toml b/pyproject.toml index c332092b..16994db0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "foursight-cgap" -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" magma-suite = "^2.0.0" tibanna-ff = "^3.1.1" MarkupSafe = "^2.1.3" -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="core2" } #portal-pipeline-utils = "2.1.0.1b1"