Skip to content

Commit 7eff901

Browse files
committed
Revert "Merge branch 'main' into Fixes#927"
This reverts commit f35b22c, reversing changes made to 4c97cad.
1 parent f35b22c commit 7eff901

File tree

116 files changed

+3160
-6877
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+3160
-6877
lines changed

.flake8

Lines changed: 0 additions & 4 deletions
This file was deleted.

.github/workflows/black.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ jobs:
2222
pip install black==$BLACK_VERSION
2323
- name: Analysing the code with black
2424
run: |
25-
black $(git rev-parse --show-toplevel) --check
25+
black $(git rev-parse --show-toplevel) --check

.github/workflows/flake8.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

.github/workflows/isort.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ jobs:
2222
pip install isort==$ISORT_VERSION
2323
- name: Analysing the code with isort
2424
run: |
25-
isort --check-only $(git rev-parse --show-toplevel)/ --profile black
25+
isort --check-only $(git rev-parse --show-toplevel)/ --profile black

.pylintrc

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,16 +75,12 @@ disable=C0103,
7575
R0914,
7676
R0915,
7777
R0916,
78-
R0917,
7978
W0201,
8079
W0231,
8180
W0406,
8281
W0613,
8382
W0622,
84-
W0718,
85-
W0221,
86-
E1135,
87-
E1136
83+
W0718
8884

8985
# Enable the message, report, category or checker with the given id(s). You can
9086
# either give multiple identifier separated by comma (,) or put this option

Pipfile

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,31 @@ url = "https://pypi.org/simple"
44
verify_ssl = true
55

66
[packages]
7-
aiocron = "==2.1"
8-
bidict = "==0.23.1"
9-
black = "==25.1.0"
7+
aiocron = "==1.8"
8+
bidict = "==0.22.1"
9+
black = "==24.4.0"
1010
dateparser = "1.2.0"
11-
"discord.py" = "==2.5.2"
12-
emoji = "==2.14.1"
11+
"discord.py" = "==2.3.2"
12+
emoji = "==2.11.0"
1313
expiringdict = "==1.2.2"
14-
flake8 = "==7.2.0"
15-
flake8-annotations = "==3.1.1"
16-
flake8-bugbear = "==24.12.12"
17-
flake8-docstrings-complete = "==1.4.1"
18-
flake8-modern-annotations = "==1.6.0"
19-
flake8-variables-names = "==0.0.6"
2014
gino = "==1.0.1"
21-
gitpython = "==3.1.44"
22-
hypothesis = "==6.131.9"
23-
inflect = "==7.5.0"
24-
irc = "==20.5.0"
25-
isort = "==6.0.1"
15+
gitpython = "==3.1.43"
16+
hypothesis = "==6.100.1"
17+
ib3 = "==0.2.0"
18+
inflect = "==7.2.0"
19+
irc = "==20.1.0"
20+
isort = "==5.13.2"
2621
munch = "==4.0.0"
2722
typing_extensions = "==4.8.0"
28-
pip = "==25.1"
29-
pipenv = "==2025.0.1"
30-
pydantic = "==2.9.2"
31-
pydoclint = "==0.6.6"
32-
pylint = "==3.3.6"
23+
pip = "==24.0"
24+
pipenv = "==2023.12.1"
25+
pydantic = "==2.7.0"
26+
pylint = "==3.1.0"
3327
pynacl = "==1.5.0"
34-
pytest = "==8.3.5"
35-
pytest-asyncio = "==0.26.0"
28+
pytest = "==8.1.1"
29+
pytest-asyncio = "==0.23.6"
3630
pyyaml = "==6.0.1"
37-
unidecode = "==1.4.0"
31+
unidecode = "==1.3.8"
3832

3933
[requires]
4034
python_version = "3.11"

Pipfile.lock

Lines changed: 930 additions & 1140 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config.default.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ bot_config:
66
disabled_extensions: ["kanye"]
77
default_prefix: "."
88
global_alerts_channel: ""
9-
override_owner: ""
109
modmail_config:
1110
enable_modmail: False
1211
disable_thread_creation: False

default.env

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
POSTGRES_DB_NAME=
22
POSTGRES_DB_PASSWORD=
33
POSTGRES_DB_USER=
4-
DEBUG=0
5-
CONFIG_YML=./config.yml
4+
DEBUG=

0 commit comments

Comments
 (0)