aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Hassan Abouelela <[email protected]>2021-03-15 02:22:10 +0300
committerGravatar GitHub <[email protected]>2021-03-15 02:22:10 +0300
commit742eed932c43636bb4484ffc4f4e4c31a711399c (patch)
treecdfac8fbb8cb98864d251917ea1c2854a6c3257e
parentUse .gitattributes to normalise line endings (diff)
parentMerge branch 'main' into dependabot/pip/deepmerge-0.2.1 (diff)
Merge pull request #70 from python-discord/dependabot/pip/deepmerge-0.2.1
Bump deepmerge from 0.1.1 to 0.2.1
-rw-r--r--poetry.lock8
-rw-r--r--pyproject.toml2
2 files changed, 5 insertions, 5 deletions
diff --git a/poetry.lock b/poetry.lock
index 4940b36..00b87b8 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -24,7 +24,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
[[package]]
name = "deepmerge"
-version = "0.1.1"
+version = "0.2.1"
description = "a toolset to deeply merge python dictionaries."
category = "main"
optional = false
@@ -385,7 +385,7 @@ python-versions = ">=3.6.1"
[metadata]
lock-version = "1.1"
python-versions = "^3.9"
-content-hash = "eff5ef112799e98ea12825a2f732eb50eefb4d1d0f7ee074181599ce696786d0"
+content-hash = "8c1d8b6baf25a4b5c68c1d11557d9c84b361c3ed090e1c8fe5e9f7656d35bdae"
[metadata.files]
certifi = [
@@ -401,8 +401,8 @@ colorama = [
{file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"},
]
deepmerge = [
- {file = "deepmerge-0.1.1-py2.py3-none-any.whl", hash = "sha256:190e133a6657303db37f9bb302aa853d8d2b15a0e055d41b99a362598e79206a"},
- {file = "deepmerge-0.1.1.tar.gz", hash = "sha256:fa1d44269786bcc12d30a7471b0b39478aa37a43703b134d7f12649792f92c1f"},
+ {file = "deepmerge-0.2.1-py2.py3-none-any.whl", hash = "sha256:8270901f85fbe249686236cb18bf4bccc69775da2c2e1fa35de3714d5d9d01b3"},
+ {file = "deepmerge-0.2.1.tar.gz", hash = "sha256:5fbd777507dd86c767048bddb2c50adf7da30f7688fe3f3f4e6ede6226dd4b20"},
]
flake8 = [
{file = "flake8-3.8.4-py2.py3-none-any.whl", hash = "sha256:749dbbd6bfd0cf1318af27bf97a14e28e5ff548ef8e5b1566ccfb25a11e7c839"},
diff --git a/pyproject.toml b/pyproject.toml
index 6be4c08..3e3984d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -17,7 +17,7 @@ httpx = "^0.17.0"
gunicorn = "^20.0.4"
pydantic = "^1.8.1"
spectree = "^0.4.0"
-deepmerge = "^0.1.1"
+deepmerge = "^0.2.1"
sentry-sdk = "^0.19.5"
[tool.poetry.dev-dependencies]