diff --git a/.github/actions/waffles/requirements.txt b/.github/actions/waffles/requirements.txt index 97b23217..093ca332 100644 --- a/.github/actions/waffles/requirements.txt +++ b/.github/actions/waffles/requirements.txt @@ -1,4 +1,4 @@ docopt==0.6.2 Flask==2.3.3 markupsafe==2.1.5 -git+https://github.com/cds-snc/notifier-utils.git@52.2.2#egg=notifications-utils +git+https://github.com/cds-snc/notifier-utils.git@52.2.3#egg=notifications-utils diff --git a/poetry.lock b/poetry.lock index d0b9a83c..b7dbf7ee 100644 --- a/poetry.lock +++ b/poetry.lock @@ -13,30 +13,17 @@ files = [ [[package]] name = "awscli" -<<<<<<< Updated upstream version = "1.32.100" -======= -version = "1.32.99" ->>>>>>> Stashed changes description = "Universal Command Line Environment for AWS." optional = false python-versions = ">=3.8" files = [ -<<<<<<< Updated upstream {file = "awscli-1.32.100-py3-none-any.whl", hash = "sha256:46e4a44dafeffe63980ab2cd0240aa15a4879cf5d84f210c9eb0facc05e7bf0a"}, {file = "awscli-1.32.100.tar.gz", hash = "sha256:7bd06388d7853508f96a91291c28b0745ac0a5ac73276cb7db48478d6d3c2a70"}, ] [package.dependencies] botocore = "1.34.100" -======= - {file = "awscli-1.32.99-py3-none-any.whl", hash = "sha256:23cf12da832472cd979efb12f86a4455e4366f6065a40ff9c821a351bdf7f09e"}, - {file = "awscli-1.32.99.tar.gz", hash = "sha256:4ff59f69c5faf1d469905e259296c65a858dd564f8e8fa5a8f502b213d8b438e"}, -] - -[package.dependencies] -botocore = "1.34.99" ->>>>>>> Stashed changes colorama = ">=0.2.5,<0.4.7" docutils = ">=0.10,<0.17" PyYAML = ">=3.10,<6.1" @@ -141,30 +128,17 @@ files = [ [[package]] name = "boto3" -<<<<<<< Updated upstream version = "1.34.100" -======= -version = "1.34.99" ->>>>>>> Stashed changes description = "The AWS SDK for Python" optional = false python-versions = ">=3.8" files = [ -<<<<<<< Updated upstream {file = "boto3-1.34.100-py3-none-any.whl", hash = "sha256:bbe2bb0dfcd92380da2a2fa2c2f586ba06c118b796380b2d0f3d0ebd103ec28d"}, {file = "boto3-1.34.100.tar.gz", hash = "sha256:016f6d66900bb1a835dea2063f1e91fc7057dbf7fb7df8add0706f0da9492631"}, ] [package.dependencies] botocore = ">=1.34.100,<1.35.0" -======= - {file = "boto3-1.34.99-py3-none-any.whl", hash = "sha256:b54084d000483b578757df03ce39a819fbba47071c9aa98611beb8806bcecd45"}, - {file = "boto3-1.34.99.tar.gz", hash = "sha256:6f600b3fe0bda53476395c902d9af5a47294c93ec52a9cdc2b926a9dc705ce79"}, -] - -[package.dependencies] -botocore = ">=1.34.99,<1.35.0" ->>>>>>> Stashed changes jmespath = ">=0.7.1,<2.0.0" s3transfer = ">=0.10.0,<0.11.0" @@ -173,22 +147,13 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -<<<<<<< Updated upstream version = "1.34.100" -======= -version = "1.34.99" ->>>>>>> Stashed changes description = "Low-level, data-driven core of boto 3." optional = false python-versions = ">=3.8" files = [ -<<<<<<< Updated upstream {file = "botocore-1.34.100-py3-none-any.whl", hash = "sha256:ee516fb9e9e906d311f2a9921afaf79c594db239a5b4b626e89e6960401aad0b"}, {file = "botocore-1.34.100.tar.gz", hash = "sha256:513bea60c6531af8e1ae1fdb2947e3ef99712f39c58f4656b5efef9cb6f75a13"}, -======= - {file = "botocore-1.34.99-py3-none-any.whl", hash = "sha256:18c68bdeb0ffb73290912b0c96204fc36d3128f00a00b5cdc35ac34d66225f1c"}, - {file = "botocore-1.34.99.tar.gz", hash = "sha256:cafe569e2136cb33cb0e5dd32fb1c0e1503ddc1413d3be215df8ddf05e69137a"}, ->>>>>>> Stashed changes ] [package.dependencies] @@ -1580,8 +1545,4 @@ watchdog = ["watchdog (>=2.3)"] [metadata] lock-version = "2.0" python-versions = "~3.10.9" -<<<<<<< Updated upstream content-hash = "240ce31147011d5c72d09e44a817eee2d60ce36a2c89ddc0d65c185dc8ae0a3f" -======= -content-hash = "70d90e54fcf2328284ba649c940be3836ed4620c4ec4270473e040b4f0b54c15" ->>>>>>> Stashed changes diff --git a/pyproject.toml b/pyproject.toml index c316f418..af0d9e33 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ include = '(notifications_utils|tests)/.*\.pyi?$' [tool.poetry] name = "notifications-utils" -version = "52.2.2" +version = "52.2.3" description = "Shared python code for Notification - Provides logging utils etc." authors = ["Canadian Digital Service"] license = "MIT license" @@ -13,7 +13,7 @@ readme = "README.md" packages = [] [build-system] -requires = ["poetry>=1.3.2"] +requires = ["poetry-core>=1.3.2"] build-backend = "poetry.core.masonry.api" [tool.poetry.dependencies] @@ -36,18 +36,13 @@ smartypants = "2.0.1" pypdf2 = "1.28.6" py_w3c = "0.3.1" # required by both api and admin -<<<<<<< Updated upstream awscli = "1.32.100" boto3 = "1.34.100" -======= -awscli = "1.32.99" -boto3 = "1.34.99" ->>>>>>> Stashed changes werkzeug = "2.3.7" itsdangerous = "2.1.2" # Pinned dependencies -certifi = "^2023.7.22" # pinned for security reasons: https://github.com/cds-snc/notification-utils/security/dependabot/22 +certifi = "^2023.7.22" # pinned for security reasons: https://github.com/cds-snc/notification-utils/security/dependabot/22 cryptography = "^42.0.3" # https://github.com/cds-snc/notification-utils/security/dependabot/31 [tool.poetry.group.test.dependencies]