Skip to content

Commit b28fb3e

Browse files
committed
Merge branch 'master' into dp/add-docker-configs
2 parents 9ce2a39 + 97c22e6 commit b28fb3e

File tree

7 files changed

+39
-12
lines changed

7 files changed

+39
-12
lines changed

.dockerignore

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Ignore common files generated during the build process
2+
*.pyc
3+
*.pyo
4+
__pycache__/
5+
*.egg-info/
6+
*.egg
7+
*.egg-info
8+
9+
# Ignore development environment files
10+
*.env
11+
*.log
12+
.env
13+
.venv/
14+
.idea/
15+
.vscode/
16+
.cache/
17+
.coverage
18+
htmlcov/
19+
20+
# Ignore scripts
21+
scripts/
22+
23+
# Ignore non-essential files and directories
24+
CODE_OF_CONDUCT.md
25+
CONTRIBUTING.md
26+
LICENSE.txt
27+
README.md
28+
requirements-dev.txt

.github/workflows/pre-commit.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ jobs:
99
pre-commit:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v2
13-
- uses: actions/setup-python@v2
14-
- uses: pre-commit/action@v2.0.3
12+
- uses: actions/checkout@v3
13+
- uses: actions/setup-python@v4.5.0
14+
- uses: pre-commit/action@v3.0.0

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.2.0
3+
rev: v4.4.0
44
hooks:
55
- id: check-added-large-files
66
- id: check-ast
@@ -27,12 +27,12 @@ repos:
2727
- id: trailing-whitespace
2828

2929
- repo: https://github.com/psf/black
30-
rev: 22.3.0
30+
rev: 23.1.0
3131
hooks:
3232
- id: black
3333
name: format code with black
3434

3535
- repo: https://github.com/pycqa/isort
36-
rev: 5.5.2
36+
rev: 5.12.0
3737
hooks:
3838
- id: isort

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
# base image for python
22
FROM python:3.10-alpine3.16
33

4+
# working directory
5+
WORKDIR /app
6+
47
# set the required dependencies
58
COPY requirements.txt requirements.txt
6-
COPY requirements-dev.txt requirements-dev.txt
79

810
# install dependencies
911
RUN pip install -r requirements.txt
10-
RUN pip install -r requirements-dev.txt
1112

1213
# copy the content of the local src directory to the working directory
1314
COPY . .

bot/cogs/daily_report.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ async def report(self) -> None:
4949
current_time = datetime.now()
5050
msg = ""
5151
if query_log != [] and current_time.hour == 19:
52-
5352
for info in query_log:
5453
msg += f"**{info.mentor_id}** atribuiu a **{info.ninja_id}** o cinturão {info.belt_attributed} - {datetime.fromtimestamp(info.timestamp)}\n"
5554

bot/cogs/help.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ def __init__(self, client: commands.Bot):
88

99
@commands.command(name="help")
1010
async def help(self, ctx: discord.ext.commands.Context) -> None:
11-
1211
# Embed sent by the bot
1312
embed = discord.Embed(
1413
title="Comandos: [Obrigatório] <Opcional> (alias)", color=0x3489EB

requirements-dev.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
black==22.6.0
1+
black==23.1.0
22
ipython==8.4.0
33
isort==5.12.0
44
mypy==0.971
55
mypy-extensions==0.4.3
6-
pre-commit==2.20.0
6+
pre-commit==3.2.0
77
pylint==2.14.5
88
python-dotenv==0.20.0

0 commit comments

Comments
 (0)