Skip to content
Snippets Groups Projects
Commit fd042d82 authored by jan.bednarik's avatar jan.bednarik
Browse files

Merge branch 'test' into 'main'

Update requirements

See merge request !1
parents 0d9ecc08 9f4f1e29
Branches
No related tags found
1 merge request!1Update requirements
Pipeline #14673 passed
...@@ -170,7 +170,3 @@ if SENTRY_DSN: ...@@ -170,7 +170,3 @@ if SENTRY_DSN:
# CUSTOM SETTINGS # CUSTOM SETTINGS
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
PORTAINER_API_URL = env.str("PORTAINER_API_URL")
PORTAINER_TOKEN = env.str("PORTAINER_TOKEN")
PORTAINER_ENVIRONMENT_ID = 2
from django.conf import settings from django.conf import settings
from django.contrib import admin from django.contrib import admin
from django.urls import include, path from django.urls import path
from django.views.generic.base import RedirectView from django.views.generic.base import RedirectView
from pirates.urls import urlpatterns as pirates_urlpatterns from pirates.urls import urlpatterns as pirates_urlpatterns
import portainer.urls
urlpatterns = [ urlpatterns = [
path("admin/", admin.site.urls), path("admin/", admin.site.urls),
path("portainer/", include(portainer.urls)),
path("", RedirectView.as_view(url="/admin/")), path("", RedirectView.as_view(url="/admin/")),
] + pirates_urlpatterns ] + pirates_urlpatterns
......
...@@ -4,16 +4,10 @@ ...@@ -4,16 +4,10 @@
# #
# pip-compile base.in # pip-compile base.in
# #
anyio==3.7.1 anyio==4.0.0
# via httpcore # via httpcore
asgiref==3.7.2 asgiref==3.7.2
# via django # via django
attrs==23.1.0
# via glom
boltons==23.0.0
# via
# face
# glom
certifi==2023.7.22 certifi==2023.7.22
# via # via
# httpcore # httpcore
...@@ -31,28 +25,24 @@ cryptography==41.0.3 ...@@ -31,28 +25,24 @@ cryptography==41.0.3
# josepy # josepy
# mozilla-django-oidc # mozilla-django-oidc
# pyopenssl # pyopenssl
django==4.2.4 django==4.2.5
# via # via
# -r base.in # -r base.in
# django-extensions # django-extensions
# mozilla-django-oidc # mozilla-django-oidc
django-environ==0.10.0 django-environ==0.11.2
# via -r base.in # via -r base.in
django-extensions==3.2.3 django-extensions==3.2.3
# via -r base.in # via -r base.in
exceptiongroup==1.1.3 exceptiongroup==1.1.3
# via anyio # via anyio
face==20.1.1
# via glom
glom==23.3.0
# via -r base.in
h11==0.14.0 h11==0.14.0
# via # via
# httpcore # httpcore
# uvicorn # uvicorn
httpcore==0.17.3 httpcore==0.18.0
# via httpx # via httpx
httpx==0.24.1 httpx==0.25.0
# via -r base.in # via -r base.in
idna==3.4 idna==3.4
# via # via
...@@ -71,14 +61,10 @@ pycparser==2.21 ...@@ -71,14 +61,10 @@ pycparser==2.21
# via cffi # via cffi
pyopenssl==23.2.0 pyopenssl==23.2.0
# via josepy # via josepy
python-dateutil==2.8.2
# via -r base.in
requests==2.31.0 requests==2.31.0
# via mozilla-django-oidc # via mozilla-django-oidc
sentry-sdk==1.29.2 sentry-sdk==1.31.0
# via -r base.in # via -r base.in
six==1.16.0
# via python-dateutil
sniffio==1.3.0 sniffio==1.3.0
# via # via
# anyio # anyio
...@@ -86,7 +72,7 @@ sniffio==1.3.0 ...@@ -86,7 +72,7 @@ sniffio==1.3.0
# httpx # httpx
sqlparse==0.4.4 sqlparse==0.4.4
# via django # via django
typing-extensions==4.7.1 typing-extensions==4.8.0
# via # via
# asgiref # asgiref
# uvicorn # uvicorn
......
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
# #
asgiref==3.7.2 asgiref==3.7.2
# via django # via django
coverage[toml]==7.3.0 coverage[toml]==7.3.1
# via pytest-cov # via pytest-cov
django==4.2.4 django==4.2.5
# via django-debug-toolbar # via django-debug-toolbar
django-debug-toolbar==4.2.0 django-debug-toolbar==4.2.0
# via -r dev.in # via -r dev.in
...@@ -18,7 +18,7 @@ execnet==2.0.2 ...@@ -18,7 +18,7 @@ execnet==2.0.2
# via pytest-xdist # via pytest-xdist
factory-boy==3.3.0 factory-boy==3.3.0
# via pytest-factoryboy # via pytest-factoryboy
faker==19.3.0 faker==19.6.1
# via factory-boy # via factory-boy
freezegun==1.2.2 freezegun==1.2.2
# via pytest-freezegun # via pytest-freezegun
...@@ -30,9 +30,9 @@ packaging==23.1 ...@@ -30,9 +30,9 @@ packaging==23.1
# via # via
# pytest # pytest
# pytest-sugar # pytest-sugar
pluggy==1.2.0 pluggy==1.3.0
# via pytest # via pytest
pytest==7.4.0 pytest==7.4.2
# via # via
# -r dev.in # -r dev.in
# pytest-cov # pytest-cov
...@@ -72,7 +72,7 @@ tomli==2.0.1 ...@@ -72,7 +72,7 @@ tomli==2.0.1
# via # via
# coverage # coverage
# pytest # pytest
typing-extensions==4.7.1 typing-extensions==4.8.0
# via # via
# asgiref # asgiref
# pytest-factoryboy # pytest-factoryboy
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment