Skip to content

Commit

Permalink
Fix drf version (#138)
Browse files Browse the repository at this point in the history
* updated drf dependency

* bumped version

* removed run on self-hosted command

* ran poetry lock

* type fix

* updated redis default port

---------

Co-authored-by: Salaah Amin <salaah01@users.noreply.github.com>
  • Loading branch information
Salaah01 and Salaah01 authored Dec 22, 2024
1 parent 33bfb4e commit b5cb757
Show file tree
Hide file tree
Showing 9 changed files with 1,084 additions and 896 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- master
jobs:
setup:
runs-on: [self-hosted, ubuntu-latest]
runs-on: [ubuntu-latest]

steps:
- name: Checkout code
Expand All @@ -20,7 +20,7 @@ jobs:

test:
needs: setup
runs-on: [self-hosted, ubuntu-latest]
runs-on: [ubuntu-latest]
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
type-check:
needs: setup
runs-on: [self-hosted, ubuntu-latest]
runs-on: [ubuntu-latest]

steps:
- name: Checkout code
Expand All @@ -75,7 +75,7 @@ jobs:
lint:
needs: setup
runs-on: [self-hosted, ubuntu-latest]
runs-on: [ubuntu-latest]

steps:
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-cov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
RABBIT_MQ_HOST: localhost
RABBIT_MQ_PORT: 5680
KAFKA_CONN_DETAILS: '{"bootstrap_servers": "localhost:9092"}'
REDIS_PORT: 6379
REDIS_PORT: 6380
run: |
make test-cov
Expand Down
2 changes: 1 addition & 1 deletion action_triggers/webhooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def get_fn_kwargs(self) -> dict:

return fn_kwargs

def get_headers(self) -> dict:
def get_headers(self) -> _t.Optional[dict]:
"""Returns the headers to use for the webhook.
:return: The headers to use for the webhook.
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ services:
redis:
image: redis:7.4.0-alpine
ports:
- "6379:6379"
- "6380:6379"
restart: always

localstack:
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
author = "Salaah01"

# The short X.Y version
version = "0.5.1"
version = "0.5.2"
# The full version, including alpha/beta/rc tags
release = "0.5.1"
release = "0.5.2"


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion playground/playground/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"

REDIS_HOST = os.getenv("REDIS_HOST", "localhost")
REDIS_PORT = os.getenv("REDIS_PORT", 6379)
REDIS_PORT = os.getenv("REDIS_PORT", 6380)

# Action triggers configuration
ACTION_TRIGGERS = {
Expand Down
1,954 changes: 1,071 additions & 883 deletions poetry.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "django-action-triggers"
version = "0.5.1"
version = "0.5.2"
description = "A Django library for asynchronously triggering actions in response to database changes. It supports integration with webhooks, message brokers (e.g., Kafka, RabbitMQ), and can trigger other processes, including AWS Lambda functions."
authors = ["Salaah Amin <salaah01@users.noreply.github.com>"]
readme = "README.md"
Expand Down Expand Up @@ -65,7 +65,7 @@ omit = ["action_triggers/migrations/*"]
[tool.poetry.dependencies]
python = ">=3.8,<3.13"
django = ">=3.2,<5.1"
djangorestframework = "^3.15.2"
djangorestframework = ">=3.0.0,<3.15.2"
psycopg2 = { version = "^2.9.9", optional = true }
aio-pika = { version = "^9.4.3", optional = true }
aiokafka = { version = "^0.11.0", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion tests/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
or DEFAULT_KAFKA_CONN_DETAILS
)
REDIS_HOST = os.getenv("REDIS_HOST", "localhost")
REDIS_PORT = os.getenv("REDIS_PORT", 6379)
REDIS_PORT = os.getenv("REDIS_PORT", 6380)

AWS_ENDPOINT = os.getenv("AWS_ENDPOINT", "http://localhost:4566")
AWS_REGION = os.getenv("AWS_REGION", "us-east-1")
Expand Down

0 comments on commit b5cb757

Please sign in to comment.