Merge branch 'stable'

This commit is contained in:
jo 2023-06-12 09:44:19 +02:00
commit 08a503b08e
No known key found for this signature in database
GPG key ID: B2FEC9B22722B984
7 changed files with 11 additions and 11 deletions

View file

@ -36,7 +36,7 @@ repos:
exclude: ^legacy/public(?!/js/airtime) exclude: ^legacy/public(?!/js/airtime)
- repo: https://github.com/asottile/pyupgrade - repo: https://github.com/asottile/pyupgrade
rev: v3.4.0 rev: v3.6.0
hooks: hooks:
- id: pyupgrade - id: pyupgrade
args: [--py38-plus] args: [--py38-plus]

View file

@ -31,7 +31,7 @@ setup(
"types-requests>=2.31.0,<2.32", "types-requests>=2.31.0,<2.32",
], ],
"sentry": [ "sentry": [
"sentry-sdk>=1.15.0,<1.25", "sentry-sdk>=1.15.0,<1.26",
], ],
}, },
zip_safe=False, zip_safe=False,

View file

@ -21,7 +21,7 @@ setup(
], ],
extras_require={ extras_require={
"dev": [ "dev": [
"requests-mock>=1.10.0,<1.11", "requests-mock>=1.10.0,<1.12",
"types-python-dateutil>=2.8.1,<2.9", "types-python-dateutil>=2.8.1,<2.9",
"types-requests>=2.31.0,<2.32", "types-requests>=2.31.0,<2.32",
], ],

View file

@ -41,14 +41,14 @@ setup(
"django-coverage-plugin>=3.0.0,<3.1", "django-coverage-plugin>=3.0.0,<3.1",
"django-stubs>=1.14.0,<4.3", "django-stubs>=1.14.0,<4.3",
"djangorestframework-stubs>=1.8.0,<3.15", "djangorestframework-stubs>=1.8.0,<3.15",
"model_bakery>=1.10.1,<1.12", "model_bakery>=1.10.1,<1.13",
"psycopg[binary]>=3.1.8,<3.2", "psycopg[binary]>=3.1.8,<3.2",
"pylint-django>=2.5.3,<2.6", "pylint-django>=2.5.3,<2.6",
"pytest-django>=4.5.2,<4.6", "pytest-django>=4.5.2,<4.6",
"requests-mock>=1.10.0,<1.11", "requests-mock>=1.10.0,<1.12",
], ],
"sentry": [ "sentry": [
"sentry-sdk[django]>=1.15.0,<1.25", "sentry-sdk[django]>=1.15.0,<1.26",
], ],
}, },
) )

View file

@ -12,7 +12,7 @@ services:
test: pg_isready -U libretime test: pg_isready -U libretime
rabbitmq: rabbitmq:
image: rabbitmq:3.11-alpine image: rabbitmq:3.12-alpine
environment: environment:
RABBITMQ_DEFAULT_VHOST: ${RABBITMQ_DEFAULT_VHOST:-/libretime} RABBITMQ_DEFAULT_VHOST: ${RABBITMQ_DEFAULT_VHOST:-/libretime}
RABBITMQ_DEFAULT_USER: ${RABBITMQ_DEFAULT_USER:-libretime} RABBITMQ_DEFAULT_USER: ${RABBITMQ_DEFAULT_USER:-libretime}

View file

@ -35,14 +35,14 @@ setup(
extras_require={ extras_require={
"dev": [ "dev": [
"distro>=1.8.0,<1.9", "distro>=1.8.0,<1.9",
"requests-mock>=1.10.0,<1.11", "requests-mock>=1.10.0,<1.12",
"syrupy>=4.0.0,<4.1", "syrupy>=4.0.0,<4.1",
"types-backports>=0.1.3,<0.2", "types-backports>=0.1.3,<0.2",
"types-python-dateutil>=2.8.1,<2.9", "types-python-dateutil>=2.8.1,<2.9",
"types-requests>=2.31.0,<2.32", "types-requests>=2.31.0,<2.32",
], ],
"sentry": [ "sentry": [
"sentry-sdk>=1.15.0,<1.25", "sentry-sdk>=1.15.0,<1.26",
], ],
}, },
zip_safe=False, zip_safe=False,

View file

@ -22,11 +22,11 @@ setup(
], ],
extras_require={ extras_require={
"dev": [ "dev": [
"requests-mock>=1.10.0,<1.11", "requests-mock>=1.10.0,<1.12",
"types-requests>=2.31.0,<2.32", "types-requests>=2.31.0,<2.32",
], ],
"sentry": [ "sentry": [
"sentry-sdk>=1.15.0,<1.25", "sentry-sdk>=1.15.0,<1.26",
], ],
}, },
zip_safe=False, zip_safe=False,