diff --git a/.flake b/.flake
new file mode 100644
index 0000000..bfead2c
--- /dev/null
+++ b/.flake
@@ -0,0 +1,2 @@
+[flake8]
+max-line-length = 79
diff --git a/panel/templates/panel/base.html b/panel/templates/panel/base.html
index 6641419..593563e 100644
--- a/panel/templates/panel/base.html
+++ b/panel/templates/panel/base.html
@@ -1,5 +1,5 @@
-{% load staticfiles %}
+{% load static %}
diff --git a/panel/templates/panel/project.html b/panel/templates/panel/project.html
index ba26fa3..46f7bd2 100644
--- a/panel/templates/panel/project.html
+++ b/panel/templates/panel/project.html
@@ -1,5 +1,5 @@
{% extends "panel/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% block title %}{{ project }}{% endblock %}
{% block navlist%}
Panel
diff --git a/panel/templates/panel/project_uuid.html b/panel/templates/panel/project_uuid.html
index 85b6cee..fda01b5 100644
--- a/panel/templates/panel/project_uuid.html
+++ b/panel/templates/panel/project_uuid.html
@@ -1,6 +1,6 @@
{% extends "panel/base.html" %}
{% load jsonify %}
-{% load staticfiles %}
+{% load static %}
{% block title %}{{ project }}{% endblock %}
{% block navlist %}
diff --git a/panel/templates/panel/release.html b/panel/templates/panel/release.html
index c695b99..e469c5e 100644
--- a/panel/templates/panel/release.html
+++ b/panel/templates/panel/release.html
@@ -1,6 +1,6 @@
{% extends "panel/base.html" %}
{% load jsonify %}
-{% load staticfiles %}
+{% load static %}
{% block title %}{{ release }}{% endblock %}
{% block navlist %}
Panel
diff --git a/panel/templates/panel/release_uuid.html b/panel/templates/panel/release_uuid.html
index 98ea89e..1c328a9 100644
--- a/panel/templates/panel/release_uuid.html
+++ b/panel/templates/panel/release_uuid.html
@@ -1,6 +1,6 @@
{% extends "panel/base.html" %}
{% load jsonify %}
-{% load staticfiles %}
+{% load static %}
{% block title %}{{ release }}{% endblock %}
{% block navlist %}
Panel
diff --git a/release_dashboard/templates/release_dashboard/build.html b/release_dashboard/templates/release_dashboard/build.html
index a872e14..d66cf29 100644
--- a/release_dashboard/templates/release_dashboard/build.html
+++ b/release_dashboard/templates/release_dashboard/build.html
@@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% block title %}Build release{% endblock %}
{% block navlist %}
Release Dashboard
diff --git a/release_dashboard/templates/release_dashboard/build_deps.html b/release_dashboard/templates/release_dashboard/build_deps.html
index 0d69021..c6f317a 100644
--- a/release_dashboard/templates/release_dashboard/build_deps.html
+++ b/release_dashboard/templates/release_dashboard/build_deps.html
@@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% block title %}Build dependences{% endblock %}
{% block navlist %}
Release Dashboard
diff --git a/release_dashboard/templates/release_dashboard/build_docker.html b/release_dashboard/templates/release_dashboard/build_docker.html
index 2da703c..2c98562 100644
--- a/release_dashboard/templates/release_dashboard/build_docker.html
+++ b/release_dashboard/templates/release_dashboard/build_docker.html
@@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% block title %}Build docker images per project{% endblock %}
{% block navlist %}
Release Dashboard
diff --git a/release_dashboard/templates/release_dashboard/build_release.html b/release_dashboard/templates/release_dashboard/build_release.html
index b6eda16..86de5cc 100644
--- a/release_dashboard/templates/release_dashboard/build_release.html
+++ b/release_dashboard/templates/release_dashboard/build_release.html
@@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% block title %}Build release{% endblock %}
{% block navlist %}
Release Dashboard
diff --git a/release_dashboard/templates/release_dashboard/build_result.html b/release_dashboard/templates/release_dashboard/build_result.html
index ca68d1d..cbb5449 100644
--- a/release_dashboard/templates/release_dashboard/build_result.html
+++ b/release_dashboard/templates/release_dashboard/build_result.html
@@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% block title %}Build release{% endblock %}
{% block navlist %}
Release Dashboard
diff --git a/release_dashboard/templates/release_dashboard/build_supported_releases.html b/release_dashboard/templates/release_dashboard/build_supported_releases.html
index 84daffa..240e3d9 100644
--- a/release_dashboard/templates/release_dashboard/build_supported_releases.html
+++ b/release_dashboard/templates/release_dashboard/build_supported_releases.html
@@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% block title %}Build release{% endblock %}
{% block navlist %}
Release Dashboard
diff --git a/release_dashboard/templates/release_dashboard/build_tag.html b/release_dashboard/templates/release_dashboard/build_tag.html
index bb2d3f8..11e810c 100644
--- a/release_dashboard/templates/release_dashboard/build_tag.html
+++ b/release_dashboard/templates/release_dashboard/build_tag.html
@@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% block title %}Build release{% endblock %}
{% block navlist %}
Release Dashboard
diff --git a/release_dashboard/templates/release_dashboard/build_trunk.html b/release_dashboard/templates/release_dashboard/build_trunk.html
index e4a9ff6..ffd5156 100644
--- a/release_dashboard/templates/release_dashboard/build_trunk.html
+++ b/release_dashboard/templates/release_dashboard/build_trunk.html
@@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% block title %}Build release{% endblock %}
{% block navlist %}
Release Dashboard
diff --git a/release_dashboard/templates/release_dashboard/build_trunk_deps.html b/release_dashboard/templates/release_dashboard/build_trunk_deps.html
index d7ee4d2..ebaf827 100644
--- a/release_dashboard/templates/release_dashboard/build_trunk_deps.html
+++ b/release_dashboard/templates/release_dashboard/build_trunk_deps.html
@@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% block title %}Build dependences{% endblock %}
{% block navlist %}
Release Dashboard
diff --git a/release_dashboard/templates/release_dashboard/docker_image.html b/release_dashboard/templates/release_dashboard/docker_image.html
index 8b69be5..2db4f27 100644
--- a/release_dashboard/templates/release_dashboard/docker_image.html
+++ b/release_dashboard/templates/release_dashboard/docker_image.html
@@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% block title %}Build docker images per project{% endblock %}
{% block navlist %}
Release Dashboard
diff --git a/release_dashboard/templates/release_dashboard/docker_images.html b/release_dashboard/templates/release_dashboard/docker_images.html
index 78cfdef..83d56e3 100644
--- a/release_dashboard/templates/release_dashboard/docker_images.html
+++ b/release_dashboard/templates/release_dashboard/docker_images.html
@@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% block title %}Build docker images per project{% endblock %}
{% block navlist %}
Release Dashboard
diff --git a/release_dashboard/templates/release_dashboard/hotfix.html b/release_dashboard/templates/release_dashboard/hotfix.html
index 859b716..a7b01b4 100644
--- a/release_dashboard/templates/release_dashboard/hotfix.html
+++ b/release_dashboard/templates/release_dashboard/hotfix.html
@@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% block title %}Hotfixes{% endblock %}
{% block navlist %}
Release Dashboard
diff --git a/release_dashboard/templates/release_dashboard/refresh.html b/release_dashboard/templates/release_dashboard/refresh.html
index 7d37160..a5e8b7c 100644
--- a/release_dashboard/templates/release_dashboard/refresh.html
+++ b/release_dashboard/templates/release_dashboard/refresh.html
@@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% block title %}Refresh GIT{% endblock %}
{% block navlist %}
Release Dashboard
diff --git a/release_dashboard/templates/release_dashboard/refresh_docker.html b/release_dashboard/templates/release_dashboard/refresh_docker.html
index eed49ad..9139b08 100644
--- a/release_dashboard/templates/release_dashboard/refresh_docker.html
+++ b/release_dashboard/templates/release_dashboard/refresh_docker.html
@@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %}
-{% load staticfiles %}
+{% load static %}
{% block title %}Refresh Docker{% endblock %}
{% block navlist %}
Release Dashboard
diff --git a/repoapi/settings/common.py b/repoapi/settings/common.py
index b92e6ec..990ca02 100644
--- a/repoapi/settings/common.py
+++ b/repoapi/settings/common.py
@@ -51,7 +51,6 @@ MIDDLEWARE = (
"django.middleware.common.CommonMiddleware",
"django.middleware.csrf.CsrfViewMiddleware",
"django.contrib.auth.middleware.AuthenticationMiddleware",
- "django.contrib.auth.middleware.SessionAuthenticationMiddleware",
"django.contrib.messages.middleware.MessageMiddleware",
"django.middleware.clickjacking.XFrameOptionsMiddleware",
"django.middleware.security.SecurityMiddleware",
@@ -109,7 +108,11 @@ STATIC_ROOT = os.path.join(BASE_DIR, "static_media/")
REST_FRAMEWORK = {
"PAGE_SIZE": 10,
- "DEFAULT_FILTER_BACKENDS": ("rest_framework.filters.DjangoFilterBackend",),
+ "DEFAULT_PAGINATION_CLASS": "rest_framework"
+ ".pagination.LimitOffsetPagination",
+ "DEFAULT_FILTER_BACKENDS": (
+ "django_filters.rest_framework.DjangoFilterBackend",
+ ),
}
SWAGGER_SETTINGS = {
diff --git a/requirements/common.txt b/requirements/common.txt
index ca08df7..dfdcf4e 100644
--- a/requirements/common.txt
+++ b/requirements/common.txt
@@ -1,18 +1,18 @@
-celery>4.4,<5.0
-Django==1.11.29
+celery
+Django==3.0.14
django-appconf
django-assets
-django-celery-beat<2.0
+django-celery-beat
django-celery-results
django-export
-django-extensions<3.0
-django-filter<2.3
+django-extensions
+django-filter
django-jsonify
django-object-tools
django-rest-swagger
django-structlog
-django-timezone-field>=3.1,<4.0 # last version supporting django 1.11
-djangorestframework>=3.6,<3.7
+django-timezone-field
+djangorestframework>=3.6
drfapikey
flower>=0.9.5
markdown
diff --git a/t/Dockerfile b/t/Dockerfile
index 2b83215..b85985d 100644
--- a/t/Dockerfile
+++ b/t/Dockerfile
@@ -1,20 +1,13 @@
-# DOCKER_NAME=repoapi-buster
-FROM docker.mgm.sipwise.com/sipwise-buster:latest
+# DOCKER_NAME=repoapi-bullseye
+FROM docker.mgm.sipwise.com/sipwise-bullseye:latest
# Important! Update this no-op ENV variable when this Dockerfile
# is updated with the current date. It will force refresh of all
# of the base images and things like `apt-get update` won't be using
# old cached versions when the Dockerfile is built.
-ENV REFRESHED_AT 2020-10-25
+ENV REFRESHED_AT 2022-01-13
-# test execution; we need the backport of python3-junitxml from our own
-# repository since it's not part of Debian/buster
-# files that get-code generates
-COPY t/sources.list.d/builddeps.list /etc/apt/sources.list.d/
-COPY t/sources.list.d/preferences /etc/apt/preferences.d/
-
-RUN apt-get update
-RUN apt-get install --assume-yes python3 python3-dev \
+RUN apt-get update && apt-get install --assume-yes python3 python3-dev \
python3-pytest python3-pytest-django python3-pytest-pep8 \
python3-pytest-pylint python3-pytest-cov python3-junitxml \
python3-pip python3-virtualenv virtualenv sqlite3 git tmux
@@ -33,12 +26,12 @@ WORKDIR /code/
# Instructions for usage
# ----------------------
# When you want to build the base image from scratch (jump to the next section if you don't want to build yourself!):
-# % docker build --tag="repoapi-buster" -f t/Dockerfile .
-# % docker run --rm -i -t -v $(pwd):/code:rw repoapi-buster:latest bash
+# % docker build --tag="repoapi-bullseye" -f t/Dockerfile .
+# % docker run --rm -i -t -v $(pwd):/code:rw repoapi-bullseye:latest bash
#
# Use the existing docker image:
-# % docker pull docker.mgm.sipwise.com/repoapi-buster
-# % docker run --rm -i -t -v $(pwd):/code:rw docker.mgm.sipwise.com/repoapi-buster:latest bash
+# % docker pull docker.mgm.sipwise.com/repoapi-bullseye
+# % docker run --rm -i -t -v $(pwd):/code:rw docker.mgm.sipwise.com/repoapi-bullseye:latest bash
#
# Inside docker (the command is in history, just press UP button):
# ./t/testrunner
diff --git a/t/sources.list.d/builddeps.list b/t/sources.list.d/builddeps.list
deleted file mode 100644
index e69de29..0000000
diff --git a/t/sources.list.d/preferences b/t/sources.list.d/preferences
deleted file mode 100644
index e69de29..0000000