aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Xithrius <[email protected]>2023-04-20 18:56:06 -0700
committerGravatar GitHub <[email protected]>2023-04-20 18:56:06 -0700
commite820003a3bad42953499cacc3b70d3a8517bcad4 (patch)
tree8f6880710fad3a7300076a3104f8dacb05248807
parentImplement grammar fix (diff)
parentMerge pull request #946 from python-discord/dependabot/pip/sentry-sdk-1.20.0 (diff)
Merge branch 'main' into staff-app-readme
-rw-r--r--.github/workflows/lint-test.yaml2
-rw-r--r--poetry.lock8
-rw-r--r--pydis_site/apps/api/views.py6
-rw-r--r--pydis_site/apps/content/resources/rules.md2
-rw-r--r--pydis_site/apps/resources/resources/python_graph_gallery.yaml17
-rw-r--r--pyproject.toml2
6 files changed, 27 insertions, 10 deletions
diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
index 45c733b2..a5fa71b9 100644
--- a/.github/workflows/lint-test.yaml
+++ b/.github/workflows/lint-test.yaml
@@ -54,7 +54,7 @@ jobs:
# This step will publish the coverage reports coveralls.io and
# link the report to the commit
- name: Publish Coverage Report
- uses: coverallsapp/[email protected]
+ uses: coverallsapp/[email protected]
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
file: ./coverage.lcov
diff --git a/poetry.lock b/poetry.lock
index 93a5d792..42668e41 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1286,14 +1286,14 @@ use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"]
[[package]]
name = "sentry-sdk"
-version = "1.19.1"
+version = "1.20.0"
description = "Python client for Sentry (https://sentry.io)"
category = "main"
optional = false
python-versions = "*"
files = [
- {file = "sentry-sdk-1.19.1.tar.gz", hash = "sha256:7ae78bd921981a5010ab540d6bdf3b793659a4db8cccf7f16180702d48a80d84"},
- {file = "sentry_sdk-1.19.1-py2.py3-none-any.whl", hash = "sha256:885a11c69df23e53eb281d003b9ff15a5bdfa43d8a2a53589be52104a1b4582f"},
+ {file = "sentry-sdk-1.20.0.tar.gz", hash = "sha256:a3410381ae769a436c0852cce140a5e5e49f566a07fb7c2ab445af1302f6ad89"},
+ {file = "sentry_sdk-1.20.0-py2.py3-none-any.whl", hash = "sha256:0ad6bbbe78057b8031a07de7aca6d2a83234e51adc4d436eaf8d8c697184db71"},
]
[package.dependencies]
@@ -1504,4 +1504,4 @@ brotli = ["Brotli"]
[metadata]
lock-version = "2.0"
python-versions = "3.10.*"
-content-hash = "1acc2e05d9a07531fb787020c3810fef95d913741e576b7b70057c6c66ff83d4"
+content-hash = "943735812db5292fcd271189ce56b8e61c10031742d4733479a4c77561d59397"
diff --git a/pydis_site/apps/api/views.py b/pydis_site/apps/api/views.py
index 20431a61..54fbf809 100644
--- a/pydis_site/apps/api/views.py
+++ b/pydis_site/apps/api/views.py
@@ -149,9 +149,9 @@ class RulesView(APIView):
["english", "language"]
),
(
- "Do not provide or request help on projects that may break laws, "
- "breach terms of services, or are malicious or inappropriate.",
- ["infraction", "tos", "breach", "malicious", "inappropriate"]
+ "Do not provide or request help on projects that may violate terms of service, "
+ "or that may be deemed inappropriate, malicious, or illegal.",
+ ["infraction", "tos", "breach", "malicious", "inappropriate", "illegal"]
),
(
"Do not post unapproved advertising.",
diff --git a/pydis_site/apps/content/resources/rules.md b/pydis_site/apps/content/resources/rules.md
index 803c8041..a0bdb38d 100644
--- a/pydis_site/apps/content/resources/rules.md
+++ b/pydis_site/apps/content/resources/rules.md
@@ -9,7 +9,7 @@ We have a small but strict set of rules on our server. Please read over them and
> 2. Follow the [Discord Community Guidelines](https://discordapp.com/guidelines) and [Terms of Service](https://discordapp.com/terms).
> 3. Respect staff members and listen to their instructions.
> 4. Use English to the best of your ability. Be polite if someone speaks English imperfectly.
-> 5. Do not provide or request help on projects that may break laws, breach terms of services, or are malicious or inappropriate.
+> 5. Do not provide or request help on projects that may violate terms of service, or that may be deemed inappropriate, malicious, or illegal.
> 6. Do not post unapproved advertising.
> 7. Keep discussions relevant to the channel topic. Each channel's description tells you the topic.
> 8. Do not help with ongoing exams. When helping with homework, help people learn how to do the assignment without doing it for them.
diff --git a/pydis_site/apps/resources/resources/python_graph_gallery.yaml b/pydis_site/apps/resources/resources/python_graph_gallery.yaml
new file mode 100644
index 00000000..b8aaeb4d
--- /dev/null
+++ b/pydis_site/apps/resources/resources/python_graph_gallery.yaml
@@ -0,0 +1,17 @@
+description: A collection of hundreds of charts made with Python with their associated reproducible code.
+name: Python Graph Gallery
+title_url: https://www.python-graph-gallery.com/
+urls:
+ - icon: branding/github
+ url: https://github.com/holtzy/The-Python-Graph-Gallery
+ color: black
+tags:
+ topics:
+ - data science
+ payment_tiers:
+ - free
+ difficulty:
+ - beginner
+ - intermediate
+ type:
+ - tutorial
diff --git a/pyproject.toml b/pyproject.toml
index 8df11a99..04d055bd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -23,7 +23,7 @@ PyJWT = {version = "2.6.0", extras = ["crypto"]}
pymdown-extensions = "9.11"
python-frontmatter = "1.0.0"
pyyaml = "6.0"
-sentry-sdk = "1.19.1"
+sentry-sdk = "1.20.0"
whitenoise = "6.4.0"
[tool.poetry.group.dev.dependencies]