Skip to content

Commit

Permalink
Merge branch 'master' into dp/add-docker-configs
Browse files Browse the repository at this point in the history
  • Loading branch information
danielsp45 committed Mar 19, 2023
2 parents 9ce2a39 + 97c22e6 commit b28fb3e
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 12 deletions.
28 changes: 28 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Ignore common files generated during the build process
*.pyc
*.pyo
__pycache__/
*.egg-info/
*.egg
*.egg-info

# Ignore development environment files
*.env
*.log
.env
.venv/
.idea/
.vscode/
.cache/
.coverage
htmlcov/

# Ignore scripts
scripts/

# Ignore non-essential files and directories
CODE_OF_CONDUCT.md
CONTRIBUTING.md
LICENSE.txt
README.md
requirements-dev.txt
6 changes: 3 additions & 3 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: pre-commit/action@v2.0.3
- uses: actions/checkout@v3
- uses: actions/setup-python@v4.5.0
- uses: pre-commit/action@v3.0.0
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.2.0
rev: v4.4.0
hooks:
- id: check-added-large-files
- id: check-ast
Expand All @@ -27,12 +27,12 @@ repos:
- id: trailing-whitespace

- repo: https://github.com/psf/black
rev: 22.3.0
rev: 23.1.0
hooks:
- id: black
name: format code with black

- repo: https://github.com/pycqa/isort
rev: 5.5.2
rev: 5.12.0
hooks:
- id: isort
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
# base image for python
FROM python:3.10-alpine3.16

# working directory
WORKDIR /app

# set the required dependencies
COPY requirements.txt requirements.txt
COPY requirements-dev.txt requirements-dev.txt

# install dependencies
RUN pip install -r requirements.txt
RUN pip install -r requirements-dev.txt

# copy the content of the local src directory to the working directory
COPY . .
Expand Down
1 change: 0 additions & 1 deletion bot/cogs/daily_report.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ async def report(self) -> None:
current_time = datetime.now()
msg = ""
if query_log != [] and current_time.hour == 19:

for info in query_log:
msg += f"**{info.mentor_id}** atribuiu a **{info.ninja_id}** o cinturão {info.belt_attributed} - {datetime.fromtimestamp(info.timestamp)}\n"

Expand Down
1 change: 0 additions & 1 deletion bot/cogs/help.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ def __init__(self, client: commands.Bot):

@commands.command(name="help")
async def help(self, ctx: discord.ext.commands.Context) -> None:

# Embed sent by the bot
embed = discord.Embed(
title="Comandos: [Obrigatório] <Opcional> (alias)", color=0x3489EB
Expand Down
4 changes: 2 additions & 2 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
black==22.6.0
black==23.1.0
ipython==8.4.0
isort==5.12.0
mypy==0.971
mypy-extensions==0.4.3
pre-commit==2.20.0
pre-commit==3.2.0
pylint==2.14.5
python-dotenv==0.20.0

0 comments on commit b28fb3e

Please sign in to comment.