Skip to content

Commit 60cf1df

Browse files
authored
Merge branch 'main' into ForumTwo
2 parents ac54b52 + 6655cff commit 60cf1df

37 files changed

Lines changed: 2382 additions & 1493 deletions

.github/workflows/ci.yml

Lines changed: 0 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -61,87 +61,3 @@ jobs:
6161
- uses: actions/checkout@v3
6262
- name: Build the Docker image
6363
run: make establish_config && docker build -f Dockerfile . -t techsupportbot:$(date +%s)
64-
65-
close_pyTest:
66-
if: github.event_name == 'pull_request' && github.actor == 'dependabot[bot]'
67-
runs-on: ubuntu-latest
68-
needs:
69-
- codeValidation
70-
permissions:
71-
contents: write
72-
pull-requests: write
73-
steps:
74-
- name: Dependabot metadata
75-
id: dependabot-metadata
76-
uses: dependabot/fetch-metadata@v2
77-
with:
78-
github-token: "${{ secrets.GITHUB_TOKEN }}"
79-
- name: Merge PR
80-
if: steps.dependabot-metadata.outputs.update-type == 'version-update:semver-patch' && steps.dependabot-metadata.outputs.dependency-names == 'pytest'
81-
run: gh pr merge --auto --merge "$PR_URL"
82-
env:
83-
PR_URL: ${{github.event.pull_request.html_url}}
84-
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
85-
86-
close_pyLint:
87-
if: github.event_name == 'pull_request' && github.actor == 'dependabot[bot]'
88-
runs-on: ubuntu-latest
89-
needs:
90-
- codeValidation
91-
permissions:
92-
contents: write
93-
pull-requests: write
94-
steps:
95-
- name: Dependabot metadata
96-
id: dependabot-metadata
97-
uses: dependabot/fetch-metadata@v2
98-
with:
99-
github-token: "${{ secrets.GITHUB_TOKEN }}"
100-
- name: Merge PR
101-
if: steps.dependabot-metadata.outputs.update-type == 'version-update:semver-patch' && steps.dependabot-metadata.outputs.dependency-names == 'pylint'
102-
run: gh pr merge --auto --merge "$PR_URL"
103-
env:
104-
PR_URL: ${{github.event.pull_request.html_url}}
105-
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
106-
107-
close_flake8:
108-
if: github.event_name == 'pull_request' && github.actor == 'dependabot[bot]'
109-
runs-on: ubuntu-latest
110-
needs:
111-
- codeValidation
112-
permissions:
113-
contents: write
114-
pull-requests: write
115-
steps:
116-
- name: Dependabot metadata
117-
id: dependabot-metadata
118-
uses: dependabot/fetch-metadata@v2
119-
with:
120-
github-token: "${{ secrets.GITHUB_TOKEN }}"
121-
- name: Merge PR
122-
if: steps.dependabot-metadata.outputs.update-type == 'version-update:semver-patch' && steps.dependabot-metadata.outputs.dependency-names == 'flake8'
123-
run: gh pr merge --auto --merge "$PR_URL"
124-
env:
125-
PR_URL: ${{github.event.pull_request.html_url}}
126-
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
127-
128-
close_isort:
129-
if: github.event_name == 'pull_request' && github.actor == 'dependabot[bot]'
130-
runs-on: ubuntu-latest
131-
needs:
132-
- codeValidation
133-
permissions:
134-
contents: write
135-
pull-requests: write
136-
steps:
137-
- name: Dependabot metadata
138-
id: dependabot-metadata
139-
uses: dependabot/fetch-metadata@v2
140-
with:
141-
github-token: "${{ secrets.GITHUB_TOKEN }}"
142-
- name: Merge PR
143-
if: steps.dependabot-metadata.outputs.update-type == 'version-update:semver-patch' && steps.dependabot-metadata.outputs.dependency-names == 'isort'
144-
run: gh pr merge --auto --merge "$PR_URL"
145-
env:
146-
PR_URL: ${{github.event.pull_request.html_url}}
147-
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}

Pipfile

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,34 @@ verify_ssl = true
66
[packages]
77
aiocron = "==2.1"
88
bidict = "==0.23.1"
9-
black = "==25.1.0"
10-
dateparser = "1.2.1"
11-
"discord.py" = "==2.5.2"
12-
emoji = "==2.14.1"
9+
black = "==26.3.1"
10+
dateparser = "1.2.2"
11+
"discord.py" = "==2.6.4"
12+
emoji = "==2.15.0"
1313
expiringdict = "==1.2.2"
14-
flake8 = "==7.2.0"
15-
flake8-annotations = "==3.1.1"
16-
flake8-bugbear = "==24.12.12"
14+
flake8 = "==7.3.0"
15+
flake8-annotations = "==3.2.0"
16+
flake8-bugbear = "==25.11.29"
1717
flake8-docstrings-complete = "==1.4.1"
1818
flake8-modern-annotations = "==1.6.0"
1919
flake8-variables-names = "==0.0.6"
2020
gino = "==1.0.1"
21-
gitpython = "==3.1.44"
22-
hypothesis = "==6.135.13"
21+
gitpython = "==3.1.46"
22+
hypothesis = "==6.151.13"
2323
inflect = "==7.5.0"
2424
irc = "==20.5.0"
25-
isort = "==6.0.1"
25+
isort = "==7.0.0"
2626
munch = "==4.0.0"
27-
typing_extensions = "==4.8.0"
28-
pip = "==25.1.1"
29-
pipenv = "==2025.0.3"
30-
pydantic = "==2.9.2"
31-
pydoclint = "==0.6.6"
32-
pylint = "==3.3.7"
33-
pynacl = "==1.5.0"
34-
pytest = "==8.4.0"
35-
pytest-asyncio = "==1.0.0"
36-
pyyaml = "==6.0.1"
27+
typing_extensions = "==4.15.0"
28+
pip = "==26.0.1"
29+
pipenv = "==2026.0.3"
30+
pydantic = "==2.12.5"
31+
pydoclint = "==0.8.3"
32+
pylint = "==4.0.5"
33+
pynacl = "==1.6.2"
34+
pytest = "==9.0.3"
35+
pytest-asyncio = "==1.3.0"
36+
pyyaml = "==6.0.3"
3737
unidecode = "==1.4.0"
3838

3939
[requires]

0 commit comments

Comments
 (0)