Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ services:
postgresql:
image: postgres:11
ports:
- 5435:5432
- 5436:5432
env_file:
- env-postgresql.env
healthcheck:
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies = [
"aiohttp-remotes==1.0.0",
# Database
"asyncpgsa==0.27.1",
"sqlalchemy==1.3.23",
"sqlalchemy==1.3.23", # Limited by asyncpgsa compatibility (no SQLAlchemy 1.4+ support)
"psycopg2-binary==2.9.10",
"alembic==1.5.8",
# Cache/Redis
Expand All @@ -25,7 +25,7 @@ dependencies = [
"uvloop==0.21.0",
# Utilities
"marshmallow==3.22.0",
"sentry-sdk==1.0.0",
"sentry-sdk==2.37.1",
"pyyaml==6.0.2",
"urllib3<2.0",
]
Expand Down
2 changes: 1 addition & 1 deletion pyslackersweb/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

async def index(request: web.Request) -> web.HTTPFound:
location = request.app["subapps"]["website"].router["index"].url_for()
return web.HTTPFound(location=location)
raise web.HTTPFound(location=location)


async def app_factory(*args) -> web.Application:
Expand Down
2 changes: 1 addition & 1 deletion pyslackersweb/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


DATABASE_URL = os.getenv(
"DATABASE_URL", "postgres://pyslackersweb:pyslackersweb@localhost:5435/pyslackersweb_dev"
"DATABASE_URL", "postgres://pyslackersweb:pyslackersweb@localhost:5436/pyslackersweb_dev"
)

REDIS_URL = os.getenv("REDIS_URL", "redis://127.0.0.1:6379/0")
Expand Down
8 changes: 1 addition & 7 deletions tests/test_website.py
Original file line number Diff line number Diff line change
Expand Up @@ -242,13 +242,7 @@ async def test_invite_use_legacy_client(client):
r = await client.post(path="/web/slack", data=data)
assert r.status == 200

# Remove the slack client to test error handling
# Need to remove from both root and subapp since they might have separate copies
if "slack_client_legacy" in client.app:
del client.app["slack_client_legacy"]
if "subapps" in client.app and "website" in client.app["subapps"]:
if "slack_client_legacy" in client.app["subapps"]["website"]:
del client.app["subapps"]["website"]["slack_client_legacy"]
client.app["slack_client_legacy"].query.side_effect = KeyError("slack_client_legacy")

r = await client.post(path="/web/slack", data=data)
assert r.status == 500
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ passenv =
DATABASE_URL
REDIS_URL
setenv =
DATABASE_URL = postgresql://pyslackers:pyslackers@db:5432/pyslackers
REDIS_URL = redis://localhost:6379/0
DATABASE_URL = postgres://pyslackersweb:pyslackersweb@postgresql:5432/pyslackersweb_dev
REDIS_URL = redis://redis:6379/0
commands =
docker compose --project-name pyslackersweb-test up --build -d postgresql redis
docker compose --project-name pyslackersweb-test exec postgresql bash -c 'until pg_isready -U pyslackersweb; do sleep 1; done;'
Expand Down
3,427 changes: 1,713 additions & 1,714 deletions uv.lock

Large diffs are not rendered by default.

Loading