diff --git a/kaehmy/views.py b/kaehmy/views.py index aff149b..cc00cc7 100644 --- a/kaehmy/views.py +++ b/kaehmy/views.py @@ -1,15 +1,11 @@ from django.db.models import Count from django.shortcuts import render, redirect -from django.contrib.auth import login, logout, authenticate from django.views.decorators.http import require_http_methods from django.views.decorators.csrf import ensure_csrf_cookie -from django.http import HttpResponse, HttpResponseRedirect -from django.contrib.auth.decorators import permission_required, login_required -from django.conf import settings +from django.http import HttpResponseRedirect +from django.contrib.auth.decorators import login_required import logging -import requests -from dealer.git import git from sikweb.settings import URL from members.views.utils import * diff --git a/poetry.lock b/poetry.lock index 87dc4b8..92b7679 100644 --- a/poetry.lock +++ b/poetry.lock @@ -94,14 +94,6 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4" [package.extras] toml = ["toml"] -[[package]] -name = "dealer" -version = "2.1.0" -description = "Dealer -- SCM (Git, Mercurial) watcher" -category = "main" -optional = false -python-versions = "*" - [[package]] name = "decorator" version = "4.4.2" @@ -775,11 +767,11 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" [[package]] name = "tomli" -version = "1.2.3" +version = "2.0.1" description = "A lil' TOML parser" category = "dev" optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" [[package]] name = "typing-extensions" @@ -836,7 +828,7 @@ testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest- [metadata] lock-version = "1.1" python-versions = "^3.9" -content-hash = "d60c069f5750479f25ba70e46406001f60cb85733df7c25115c745bd98dd8e0c" +content-hash = "88bdaaa66bdcd3e1b59a1615b200c73587807ac8639cc32b8f56b5142c35aa14" [metadata.files] attrs = [ @@ -942,10 +934,6 @@ coverage = [ {file = "coverage-5.5-pp37-none-any.whl", hash = "sha256:2a3859cb82dcbda1cfd3e6f71c27081d18aa251d20a17d87d26d4cd216fb0af4"}, {file = "coverage-5.5.tar.gz", hash = "sha256:ebe78fe9a0e874362175b02371bdfbee64d8edc42a044253ddf4ee7d3c15212c"}, ] -dealer = [ - {file = "dealer-2.1.0-py2.py3-none-any.whl", hash = "sha256:0956771907702bf84c39513c5343cca1268ee9858a9fe3635303173114347dcf"}, - {file = "dealer-2.1.0.tar.gz", hash = "sha256:1929ebb09449b576d4488b1322fabca2ba75c82f602e64c9f0b5ad58bff020c4"}, -] decorator = [ {file = "decorator-4.4.2-py2.py3-none-any.whl", hash = "sha256:41fa54c2a0cc4ba648be4fd43cff00aedf5b9465c9bf18d64325bc225f08f760"}, {file = "decorator-4.4.2.tar.gz", hash = "sha256:e3a62f0520172440ca0dcc823749319382e377f37f140a0b99ef45fecb84bfe7"}, @@ -1291,8 +1279,8 @@ toml = [ {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"}, ] tomli = [ - {file = "tomli-1.2.3-py3-none-any.whl", hash = "sha256:e3069e4be3ead9668e21cb9b074cd948f7b3113fd9c8bba083f48247aab8b11c"}, - {file = "tomli-1.2.3.tar.gz", hash = "sha256:05b6166bff487dc068d322585c7ea4ef78deed501cc124060e0f238e89a9231f"}, + {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"}, + {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, ] typing-extensions = [ {file = "typing_extensions-4.2.0-py3-none-any.whl", hash = "sha256:6657594ee297170d19f67d55c05852a874e7eb634f4f753dbd667855e07c1708"}, diff --git a/pyproject.toml b/pyproject.toml index b8b2137..afa6dae 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,6 @@ django-nose = "^1.4.5" psycopg2-binary = "2.8.6" django-bootstrap3 = "^11.1.0" django-tables2 = "^1.6.1" -dealer = "^2.0.5" django-modeltranslation = "^0.13b1" django-auditlog = "^0.4.5" django-phonenumber-field = {version = "^4.0.0", extras = ["phonenumbers"]} diff --git a/sikweb/base.py b/sikweb/base.py index 3f24aaf..d7ca7f6 100644 --- a/sikweb/base.py +++ b/sikweb/base.py @@ -145,7 +145,6 @@ TEMPLATES = [ "django.contrib.auth.context_processors.auth", "django.contrib.messages.context_processors.messages", "django.template.context_processors.static", - "dealer.contrib.django.context_processor", ], }, }, diff --git a/webapp/urls.py b/webapp/urls.py index 1056b9f..adb7af4 100644 --- a/webapp/urls.py +++ b/webapp/urls.py @@ -3,9 +3,6 @@ from django.conf.urls import url, include from rest_framework import routers from rest_framework_jwt.views import obtain_jwt_token, verify_jwt_token -from webapp.views import about_view, nginx_jwt_resp - - from webapp.views import * @@ -26,7 +23,5 @@ urlpatterns = [ url(r"^api/", include(router.urls)), url(r"^api/api-token-auth/", obtain_jwt_token), url(r"^api/api-token-verify/", verify_jwt_token), - # git revision - url(r"^about", about_view), url(r"^jwt_nginx", nginx_jwt_resp), ] diff --git a/webapp/views.py b/webapp/views.py index a157d7a..6bbe0f9 100644 --- a/webapp/views.py +++ b/webapp/views.py @@ -3,10 +3,9 @@ from jwt import decode from jwt.exceptions import InvalidSignatureError from django.utils import timezone -from dealer.git import git from django.conf import settings from django.http import HttpResponse, JsonResponse -from django.shortcuts import render, get_object_or_404 +from django.shortcuts import get_object_or_404 from django.views.decorators.http import require_http_methods from django_filters import rest_framework as filters from django.db.models import Prefetch @@ -336,27 +335,6 @@ class JobAdViewSet(ModelViewSet): return JsonResponse(status=404, data={"error": f"Job Ad {pk} not found"}) -@require_http_methods(["GET"]) -def about_view(request, *args, **kwargs): - """Render about page.""" - latest_commit = "Not found" - latest_date = "Not found" - latest_tag = "Not found" - try: - repo = git.init_repo() - latest_commit = repo.git("rev-parse HEAD").decode("utf-8") - latest_date = repo.git("show -s --format=%ci " + latest_commit).decode("utf-8") - latest_tag = repo.git( - "describe --tags " - + repo.git("rev-list --tags --max-count=1").decode("utf-8") - ).decode("utf-8") - except Exception as e: - print(f"Git failed:\n{e}") - - context = {"commit": latest_commit, "date": latest_date, "tag": latest_tag} - return render(request, "about.html", context) - - @require_http_methods(["GET"]) def nginx_jwt_resp(request, *args, **kwargs): cookie = request.COOKIES.get("jwt", None)