Skip to content

Commit

Permalink
Fix merge issue that unbumped waffles and utils version
Browse files Browse the repository at this point in the history
  • Loading branch information
whabanks committed May 15, 2024
1 parent 298d2fe commit 0cfe545
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 48 deletions.
2 changes: 1 addition & 1 deletion .github/actions/waffles/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
docopt==0.6.2
Flask==2.3.3
markupsafe==2.1.5
git+https://github.com/cds-snc/[email protected].2#egg=notifications-utils
git+https://github.com/cds-snc/[email protected].3#egg=notifications-utils
39 changes: 0 additions & 39 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 3 additions & 8 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ 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"
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]
Expand All @@ -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]
Expand Down

0 comments on commit 0cfe545

Please sign in to comment.