sipwise
/
repoapi
mirror of https://github.com/sipwise/repoapi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

TT#121955 update django to 3.0

Browse Source 
- Features deprecated in 2.1:
  * {% load staticfiles %} and {% load admin_static %} are deprecated in
    favor of {% load static %}, which works the same.

- Features deprecated in 1.10:
  * Session verification will be enabled regardless of whether or not
    'django.contrib.auth.middleware.SessionAuthenticationMiddleware' is
    in MIDDLEWARE_CLASSES.

- django-filters:
  * https://django-filter.readthedocs.io/en/stable/guide/rest_framework.html

- django-rest-framework:
  https://www.django-rest-framework.org/api-guide/pagination/
  "Note that you need to set both the pagination class, and the page size that
  should be used. Both DEFAULT_PAGINATION_CLASS and PAGE_SIZE are None by default."

- t/Dockerfile: migrate to bullseye

Change-Id: Ia225eba15ca46446700fa2699e89d7e4601bf1a2
pull/4/head
Victor Seva 3 years ago
parent ca54503eaf
commit c0d0206cf2
25 changed files with 41 additions and 43 deletions
Show Stats Download Patch File Download Diff File

2
.flake
Unescape View File

@ -0,0 +1,2 @@
[flake8]
max-line-length = 79

2
panel/templates/panel/base.html
Unescape View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
{% load staticfiles %} {% load static %}
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">

2
panel/templates/panel/project.html
Unescape View File

@ -1,5 +1,5 @@
{% extends "panel/base.html" %} {% extends "panel/base.html" %}
{% load staticfiles %} {% load static %}
{% block title %}{{ project }}{% endblock %} {% block title %}{{ project }}{% endblock %}
{% block navlist%} {% block navlist%}
<li><a href="{% url 'panel:index' %}">Panel</a></li> <li><a href="{% url 'panel:index' %}">Panel</a></li>

2
panel/templates/panel/project_uuid.html
Unescape View File

@ -1,6 +1,6 @@
{% extends "panel/base.html" %} {% extends "panel/base.html" %}
{% load jsonify %} {% load jsonify %}
{% load staticfiles %} {% load static %}
{% block title %}{{ project }}{% endblock %} {% block title %}{{ project }}{% endblock %}
{% block navlist %} {% block navlist %}
<!-- hello --> <!-- hello -->

2
panel/templates/panel/release.html
Unescape View File

@ -1,6 +1,6 @@
{% extends "panel/base.html" %} {% extends "panel/base.html" %}
{% load jsonify %} {% load jsonify %}
{% load staticfiles %} {% load static %}
{% block title %}{{ release }}{% endblock %} {% block title %}{{ release }}{% endblock %}
{% block navlist %} {% block navlist %}
<li><a href="{% url 'panel:index' %}">Panel</a></li> <li><a href="{% url 'panel:index' %}">Panel</a></li>

2
panel/templates/panel/release_uuid.html
Unescape View File

@ -1,6 +1,6 @@
{% extends "panel/base.html" %} {% extends "panel/base.html" %}
{% load jsonify %} {% load jsonify %}
{% load staticfiles %} {% load static %}
{% block title %}{{ release }}{% endblock %} {% block title %}{{ release }}{% endblock %}
{% block navlist %} {% block navlist %}
<li><a href="{% url 'panel:index' %}">Panel</a></li> <li><a href="{% url 'panel:index' %}">Panel</a></li>

2
release_dashboard/templates/release_dashboard/build.html
Unescape View File

@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %} {% extends "release_dashboard/base.html" %}
{% load staticfiles %} {% load static %}
{% block title %}Build release{% endblock %} {% block title %}Build release{% endblock %}
{% block navlist %} {% block navlist %}
<li><a href="{% url 'release_dashboard:index_old'%}">Release Dashboard</a></li> <li><a href="{% url 'release_dashboard:index_old'%}">Release Dashboard</a></li>

2
release_dashboard/templates/release_dashboard/build_deps.html
Unescape View File

@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %} {% extends "release_dashboard/base.html" %}
{% load staticfiles %} {% load static %}
{% block title %}Build dependences{% endblock %} {% block title %}Build dependences{% endblock %}
{% block navlist %} {% block navlist %}
<li><a href="{% url 'release_dashboard:index_old'%}">Release Dashboard</a></li> <li><a href="{% url 'release_dashboard:index_old'%}">Release Dashboard</a></li>

2
release_dashboard/templates/release_dashboard/build_docker.html
Unescape View File

@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %} {% extends "release_dashboard/base.html" %}
{% load staticfiles %} {% load static %}
{% block title %}Build docker images per project{% endblock %} {% block title %}Build docker images per project{% endblock %}
{% block navlist %} {% block navlist %}
<li><a href="{% url 'release_dashboard:index'%}">Release Dashboard</a></li> <li><a href="{% url 'release_dashboard:index'%}">Release Dashboard</a></li>

2
release_dashboard/templates/release_dashboard/build_release.html
Unescape View File

@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %} {% extends "release_dashboard/base.html" %}
{% load staticfiles %} {% load static %}
{% block title %}Build release{% endblock %} {% block title %}Build release{% endblock %}
{% block navlist %} {% block navlist %}
<li><a href="{% url 'release_dashboard:index'%}">Release Dashboard</a></li> <li><a href="{% url 'release_dashboard:index'%}">Release Dashboard</a></li>

2
release_dashboard/templates/release_dashboard/build_result.html
Unescape View File

@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %} {% extends "release_dashboard/base.html" %}
{% load staticfiles %} {% load static %}
{% block title %}Build release{% endblock %} {% block title %}Build release{% endblock %}
{% block navlist %} {% block navlist %}
<li><a href="{% url 'release_dashboard:index'%}">Release Dashboard</a></li> <li><a href="{% url 'release_dashboard:index'%}">Release Dashboard</a></li>

2
release_dashboard/templates/release_dashboard/build_supported_releases.html
Unescape View File

@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %} {% extends "release_dashboard/base.html" %}
{% load staticfiles %} {% load static %}
{% block title %}Build release{% endblock %} {% block title %}Build release{% endblock %}
{% block navlist %} {% block navlist %}
<li><a href="{% url 'release_dashboard:index'%}">Release Dashboard</a></li> <li><a href="{% url 'release_dashboard:index'%}">Release Dashboard</a></li>

2
release_dashboard/templates/release_dashboard/build_tag.html
Unescape View File

@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %} {% extends "release_dashboard/base.html" %}
{% load staticfiles %} {% load static %}
{% block title %}Build release{% endblock %} {% block title %}Build release{% endblock %}
{% block navlist %} {% block navlist %}
<li><a href="{% url 'release_dashboard:index_old'%}">Release Dashboard</a></li> <li><a href="{% url 'release_dashboard:index_old'%}">Release Dashboard</a></li>

2
release_dashboard/templates/release_dashboard/build_trunk.html
Unescape View File

@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %} {% extends "release_dashboard/base.html" %}
{% load staticfiles %} {% load static %}
{% block title %}Build release{% endblock %} {% block title %}Build release{% endblock %}
{% block navlist %} {% block navlist %}
<li><a href="{% url 'release_dashboard:index_old'%}">Release Dashboard</a></li> <li><a href="{% url 'release_dashboard:index_old'%}">Release Dashboard</a></li>

2
release_dashboard/templates/release_dashboard/build_trunk_deps.html
Unescape View File

@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %} {% extends "release_dashboard/base.html" %}
{% load staticfiles %} {% load static %}
{% block title %}Build dependences{% endblock %} {% block title %}Build dependences{% endblock %}
{% block navlist %} {% block navlist %}
<li><a href="{% url 'release_dashboard:index_old'%}">Release Dashboard</a></li> <li><a href="{% url 'release_dashboard:index_old'%}">Release Dashboard</a></li>

2
release_dashboard/templates/release_dashboard/docker_image.html
Unescape View File

@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %} {% extends "release_dashboard/base.html" %}
{% load staticfiles %} {% load static %}
{% block title %}Build docker images per project{% endblock %} {% block title %}Build docker images per project{% endblock %}
{% block navlist %} {% block navlist %}
<li><a href="{% url 'release_dashboard:index'%}">Release Dashboard</a></li> <li><a href="{% url 'release_dashboard:index'%}">Release Dashboard</a></li>

2
release_dashboard/templates/release_dashboard/docker_images.html
Unescape View File

@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %} {% extends "release_dashboard/base.html" %}
{% load staticfiles %} {% load static %}
{% block title %}Build docker images per project{% endblock %} {% block title %}Build docker images per project{% endblock %}
{% block navlist %} {% block navlist %}
<li><a href="{% url 'release_dashboard:index'%}">Release Dashboard</a></li> <li><a href="{% url 'release_dashboard:index'%}">Release Dashboard</a></li>

2
release_dashboard/templates/release_dashboard/hotfix.html
Unescape View File

@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %} {% extends "release_dashboard/base.html" %}
{% load staticfiles %} {% load static %}
{% block title %}Hotfixes{% endblock %} {% block title %}Hotfixes{% endblock %}
{% block navlist %} {% block navlist %}
<li><a href="{% url 'release_dashboard:index'%}">Release Dashboard</a></li> <li><a href="{% url 'release_dashboard:index'%}">Release Dashboard</a></li>

2
release_dashboard/templates/release_dashboard/refresh.html
Unescape View File

@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %} {% extends "release_dashboard/base.html" %}
{% load staticfiles %} {% load static %}
{% block title %}Refresh GIT{% endblock %} {% block title %}Refresh GIT{% endblock %}
{% block navlist %} {% block navlist %}
<li><a href="{% url 'release_dashboard:index'%}">Release Dashboard</a></li> <li><a href="{% url 'release_dashboard:index'%}">Release Dashboard</a></li>

2
release_dashboard/templates/release_dashboard/refresh_docker.html
Unescape View File

@ -1,5 +1,5 @@
{% extends "release_dashboard/base.html" %} {% extends "release_dashboard/base.html" %}
{% load staticfiles %} {% load static %}
{% block title %}Refresh Docker{% endblock %} {% block title %}Refresh Docker{% endblock %}
{% block navlist %} {% block navlist %}
<li><a href="{% url 'release_dashboard:index'%}">Release Dashboard</a></li> <li><a href="{% url 'release_dashboard:index'%}">Release Dashboard</a></li>

7
repoapi/settings/common.py
Unescape View File

@ -51,7 +51,6 @@ MIDDLEWARE = (
"django.middleware.common.CommonMiddleware", "django.middleware.common.CommonMiddleware",
"django.middleware.csrf.CsrfViewMiddleware", "django.middleware.csrf.CsrfViewMiddleware",
"django.contrib.auth.middleware.AuthenticationMiddleware", "django.contrib.auth.middleware.AuthenticationMiddleware",
"django.contrib.auth.middleware.SessionAuthenticationMiddleware",
"django.contrib.messages.middleware.MessageMiddleware", "django.contrib.messages.middleware.MessageMiddleware",
"django.middleware.clickjacking.XFrameOptionsMiddleware", "django.middleware.clickjacking.XFrameOptionsMiddleware",
"django.middleware.security.SecurityMiddleware", "django.middleware.security.SecurityMiddleware",
@ -109,7 +108,11 @@ STATIC_ROOT = os.path.join(BASE_DIR, "static_media/")
REST_FRAMEWORK = { REST_FRAMEWORK = {
"PAGE_SIZE": 10, "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 = { SWAGGER_SETTINGS = {

14
requirements/common.txt
Unescape View File

@ -1,18 +1,18 @@
celery>4.4,<5.0 celery
Django==1.11.29 Django==3.0.14
django-appconf django-appconf
django-assets django-assets
django-celery-beat<2.0 django-celery-beat
django-celery-results django-celery-results
django-export django-export
django-extensions<3.0 django-extensions
django-filter<2.3 django-filter
django-jsonify django-jsonify
django-object-tools django-object-tools
django-rest-swagger django-rest-swagger
django-structlog django-structlog
django-timezone-field>=3.1,<4.0 # last version supporting django 1.11 django-timezone-field
djangorestframework>=3.6,<3.7 djangorestframework>=3.6
drfapikey drfapikey
flower>=0.9.5 flower>=0.9.5
markdown markdown

23
t/Dockerfile
Unescape View File

@ -1,20 +1,13 @@
# DOCKER_NAME=repoapi-buster # DOCKER_NAME=repoapi-bullseye
FROM docker.mgm.sipwise.com/sipwise-buster:latest FROM docker.mgm.sipwise.com/sipwise-bullseye:latest
# Important! Update this no-op ENV variable when this Dockerfile # Important! Update this no-op ENV variable when this Dockerfile
# is updated with the current date. It will force refresh of all # 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 # of the base images and things like `apt-get update` won't be using
# old cached versions when the Dockerfile is built. # 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 RUN apt-get update && apt-get install --assume-yes python3 python3-dev \
# 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 \
python3-pytest python3-pytest-django python3-pytest-pep8 \ python3-pytest python3-pytest-django python3-pytest-pep8 \
python3-pytest-pylint python3-pytest-cov python3-junitxml \ python3-pytest-pylint python3-pytest-cov python3-junitxml \
python3-pip python3-virtualenv virtualenv sqlite3 git tmux python3-pip python3-virtualenv virtualenv sqlite3 git tmux
@ -33,12 +26,12 @@ WORKDIR /code/
# Instructions for usage # 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!): # 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 build --tag="repoapi-bullseye" -f t/Dockerfile .
# % docker run --rm -i -t -v $(pwd):/code:rw repoapi-buster:latest bash # % docker run --rm -i -t -v $(pwd):/code:rw repoapi-bullseye:latest bash
# #
# Use the existing docker image: # Use the existing docker image:
# % docker pull docker.mgm.sipwise.com/repoapi-buster # % docker pull docker.mgm.sipwise.com/repoapi-bullseye
# % docker run --rm -i -t -v $(pwd):/code:rw docker.mgm.sipwise.com/repoapi-buster:latest bash # % 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): # Inside docker (the command is in history, just press UP button):
# ./t/testrunner # ./t/testrunner

0
t/sources.list.d/builddeps.list
Unescape View File

0
t/sources.list.d/preferences
Unescape View File

Write Preview
Loading…
Cancel
Save