Skip to content

Commit

Permalink
Merge pull request #66 from juntossomosmais/feat/update-september
Browse files Browse the repository at this point in the history
feat: update packages and included lint and docker helper services
  • Loading branch information
MatheusGeiger authored Sep 9, 2024
2 parents 48dca73 + 098c7f1 commit 640f071
Show file tree
Hide file tree
Showing 29 changed files with 1,479 additions and 1,476 deletions.
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/.github @juntossomosmais/core
* @juntossomosmais/loyalty-backends
* @juntossomosmais/loja-virtual-backends
22 changes: 22 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
version: 2
updates:
- package-ecosystem: "pip"
directory: "/"
schedule:
interval: "weekly"
time: "08:00"
day: "sunday"
target-branch: "main"
reviewers:
- "juntossomosmais/loyalty"
- "juntossomosmais/loja-virtual"
- package-ecosystem: "docker"
directory: "/"
schedule:
interval: "monthly"
time: "08:00"
day: "sunday"
target-branch: "main"
reviewers:
- "juntossomosmais/loyalty"
- "juntossomosmais/loja-virtual"
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ db.sqlite3
media
tests-reports/
.DS_Store
Pipfile
Pipfile.lock
requirements.txt
.pypirc
.python-version

# If your build process includes running collectstatic, then you probably don't need or want to include staticfiles/
# in your Git repository. Update and uncomment the following line accordingly.
Expand Down
3 changes: 0 additions & 3 deletions .isort.cfg

This file was deleted.

1 change: 0 additions & 1 deletion .mdlrc

This file was deleted.

29 changes: 29 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
repos:
- repo: https://github.com/pycqa/flake8
rev: 7.1.0
hooks:
- id: flake8
additional_dependencies: [
'flake8-bugbear',
'flake8-comprehensions',
'flake8-debugger',
]
- repo: https://github.com/pycqa/autoflake
rev: v2.3.1
hooks:
- id: autoflake
args: ['--in-place', '--remove-all-unused-imports', '--recursive', '--ignore-init-module-imports']
- repo: https://github.com/psf/black
rev: 24.4.2
hooks:
- id: black
- repo: https://github.com/pycqa/isort
rev: 5.13.2
hooks:
- id: isort
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.10.1
hooks:
- id: mypy
additional_dependencies: ["types-requests"]
exclude: tests/
27 changes: 0 additions & 27 deletions Pipfile

This file was deleted.

866 changes: 0 additions & 866 deletions Pipfile.lock

This file was deleted.

2 changes: 0 additions & 2 deletions django_stomp/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,3 @@ class DjangoStompIncorrectUse(Exception):
Raised when Django stomp has been invoked in a wrong manner such as
less arguments than it needs, etc.
"""

pass
1 change: 1 addition & 0 deletions django_stomp/management/commands/ack_all_messages.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.core.management.base import BaseCommand

from django_stomp.exceptions import DjangoStompIncorrectUse
from django_stomp.execution import clean_messages_on_destination_by_acking

Expand Down
1 change: 1 addition & 0 deletions django_stomp/management/commands/move_messages.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from django.core.management import CommandError
from django.core.management.base import BaseCommand

from django_stomp.execution import send_message_from_one_destination_to_another


Expand Down
1 change: 1 addition & 0 deletions django_stomp/management/commands/pubsub.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.core.management.base import BaseCommand

from django_stomp.execution import start_processing


Expand Down
68 changes: 67 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,88 @@
services:
lint-formatter:
build: .
volumes:
- .:/app
command: [ "./scripts/start-formatter-lint.sh" ]
networks:
- djangostompnetwork

integration-tests:
build: .
volumes:
- .:/app
depends_on:
broker-rabbitmq:
condition: service_healthy
command: ["./scripts/start-tests.sh"]
environment:
STOMP_SERVER_HOST: "broker-rabbitmq"
STOMP_SERVER_PORT: 61613
STOMP_SERVER_GUI_PORT: 15672
networks:
- djangostompnetwork

integration-tests-active-mq:
build: .
volumes:
- .:/app
depends_on:
- broker-activemq
command: ["./scripts/start-tests.sh"]
environment:
STOMP_SERVER_HOST: "broker-activemq"
STOMP_SERVER_PORT: 61613
STOMP_SERVER_GUI_PORT: 8161
networks:
- djangostompnetwork

integration-tests-tox:
build:
context: .
dockerfile: Dockerfile.tox-tests
volumes:
- .:/app
depends_on:
broker-rabbitmq:
condition: service_healthy
command: ["./scripts/start-tox-tests.sh"]
networks:
- djangostompnetwork

broker-activemq:
image: rmohr/activemq:latest
ports:
- 8161:8161
- 61613:61613
volumes:
- ./tests/resources/custom-activemq-conf:/opt/apache-activemq-5.15.6/conf
networks:
- djangostompnetwork

another-broker-activemq:
image: rmohr/activemq:latest
ports:
- 8162:8161
- 61614:61613
volumes:
- ./tests/resources/custom-activemq-conf:/opt/apache-activemq-5.15.6/conf
networks:
- djangostompnetwork

broker-rabbitmq:
image: rabbitmq:3-management
ports:
- 61613:61613
- 15672:15672
volumes:
- ./tests/resources/custom-rabbitmq-conf:/etc/rabbitmq/
- ./tests/resources/custom-rabbitmq-conf:/etc/rabbitmq/
healthcheck:
test: rabbitmq-diagnostics -q ping
interval: 10s
timeout: 5s
retries: 5
networks:
- djangostompnetwork

networks:
djangostompnetwork:
Loading

0 comments on commit 640f071

Please sign in to comment.