diff options
| author |  Hassan Abouelela <[email protected]> | 2021-03-15 02:26:51 +0300 |
|---|---|---|
| committer | Hassan Abouelela <[email protected]> | 2021-03-15 02:28:46 +0300 |
| commit | 817d16a911fb64847d03c1b35d194d98fad89c43 (patch) | |
| tree | 56e305ae50bbe1a04b0654340ac3038bc8bac006 | |
| parent | Merge branch 'main' into dependabot/pip/sentry-sdk-0.20.3 (diff) | |
| parent | Merge pull request #70 from python-discord/dependabot/pip/deepmerge-0.2.1 (diff) | |
Merge branch 'main' into dependabot/pip/sentry-sdk-0.20.3
Signed-off-by: Hassan Abouelela <[email protected]>
# Conflicts:
# poetry.lock
# pyproject.toml
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | backend/constants.py | 2 | ||||
| -rw-r--r-- | poetry.lock | 14 | ||||
| -rw-r--r-- | pyproject.toml | 2 |
4 files changed, 10 insertions, 9 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..176a458 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto diff --git a/backend/constants.py b/backend/constants.py index 4bb7fd1..d90fd9a 100644 --- a/backend/constants.py +++ b/backend/constants.py @@ -13,7 +13,7 @@ MONGO_DATABASE = os.getenv("MONGO_DATABASE", "pydis_forms") SNEKBOX_URL = os.getenv("SNEKBOX_URL", "http://snekbox.default.svc.cluster.local/eval") PRODUCTION = os.getenv("PRODUCTION", "True").lower() != "false" -PRODUCTION_URL = "https://forms.pythondiscord.com/" +PRODUCTION_URL = "https://forms.pythondiscord.com" OAUTH2_CLIENT_ID = os.getenv("OAUTH2_CLIENT_ID") OAUTH2_CLIENT_SECRET = os.getenv("OAUTH2_CLIENT_SECRET") diff --git a/poetry.lock b/poetry.lock index 54f5b14..537841b 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 @@ -70,15 +70,15 @@ tornado = ["tornado (>=0.2)"] [[package]] name = "h11" -version = "0.11.0" +version = "0.12.0" description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1" category = "main" optional = false -python-versions = "*" +python-versions = ">=3.6" [[package]] name = "httpcore" -version = "0.12.2" +version = "0.12.3" description = "A minimal low-level HTTP client." category = "main" optional = false @@ -390,7 +390,7 @@ python-versions = ">=3.6.1" [metadata] lock-version = "1.1" python-versions = "^3.9" -content-hash = "cba71873f66411d6632caf6ddfdf63eae694594ab9e991bf8806ccee6fca477a" +content-hash = "d0626fd229fe456b415413f0ace77aae277df1f46b3864b66e616f486a9463b7" [metadata.files] certifi = [ @@ -406,8 +406,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 4ea0099..97ee75e 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.20.3" [tool.poetry.dev-dependencies] |