diff --git a/release_changed/models.py b/release_changed/models.py index 563d9f9..2288bc1 100644 --- a/release_changed/models.py +++ b/release_changed/models.py @@ -14,18 +14,6 @@ # with this program. If not, see . from django.db import models -from .conf import settings # noqa - -# This is needed due to: -# -# AppConf classes depend on being imported during startup of the Django -# process. Even though there are multiple modules loaded automatically, only -# the models modules (usually the models.py file of your app) are guaranteed -# to be loaded at startup. Therefore it’s recommended to put your AppConf -# subclass(es) there, too. -# -# https://django-appconf.readthedocs.io/en/latest/ - class ReleaseChanged(models.Model): VMTYPE_CHOICES = (("CE", "spce"), ("PRO", "sppro"), ("CARRIER", "carrier")) diff --git a/release_dashboard/utils/__init__.py b/release_dashboard/utils/__init__.py index 952c33b..423420c 100644 --- a/release_dashboard/utils/__init__.py +++ b/release_dashboard/utils/__init__.py @@ -1,19 +1,18 @@ -# Copyright (C) 2017 The Sipwise Team - http://sipwise.com - +# Copyright (C) 2017-2022 The Sipwise Team - http://sipwise.com +# # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the Free # Software Foundation, either version 3 of the License, or (at your option) # any later version. - +# # This program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # more details. - +# # You should have received a copy of the GNU General Public License along # with this program. If not, see . - -from release_dashboard.models import Project +from ..models import Project def get_tags(projectname, regex=None): diff --git a/release_dashboard/utils/build.py b/release_dashboard/utils/build.py index e196883..75e27f1 100644 --- a/release_dashboard/utils/build.py +++ b/release_dashboard/utils/build.py @@ -1,12 +1,15 @@ -# Copyright (C) 2015 The Sipwise Team - http://sipwise.com +# Copyright (C) 2015-2022 The Sipwise Team - http://sipwise.com +# # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the Free # Software Foundation, either version 3 of the License, or (at your option) # any later version. +# # This program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # more details. +# # You should have received a copy of the GNU General Public License along # with this program. If not, see . import logging diff --git a/release_dashboard/views/__init__.py b/release_dashboard/views/__init__.py index 7a86da8..010d1b8 100644 --- a/release_dashboard/views/__init__.py +++ b/release_dashboard/views/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2017 The Sipwise Team - http://sipwise.com +# Copyright (C) 2017-2022 The Sipwise Team - http://sipwise.com # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the Free @@ -18,8 +18,8 @@ from django.views.generic.base import TemplateView from natsort import humansorted from ..conf import settings -from release_dashboard.utils import get_branches -from release_dashboard.utils import get_tags +from ..utils import get_branches +from ..utils import get_tags regex_hotfix = re.compile(r"^mr[0-9]+\.[0-9]+\.[0-9]+$") regex_mr = re.compile(r"^mr.+$") diff --git a/release_dashboard/views/docker.py b/release_dashboard/views/docker.py index 1b3cdd6..a5b3bfc 100644 --- a/release_dashboard/views/docker.py +++ b/release_dashboard/views/docker.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 The Sipwise Team - http://sipwise.com +# Copyright (C) 2015-2022 The Sipwise Team - http://sipwise.com # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the Free @@ -28,14 +28,14 @@ from . import _common_versions from . import _hash_versions from . import _projects_versions from . import regex_mr +from .. import serializers +from .. import tasks from ..conf import settings -from release_dashboard import serializers -from release_dashboard import tasks -from release_dashboard.forms.docker import BuildDockerForm -from release_dashboard.models import DockerImage -from release_dashboard.models import DockerTag -from release_dashboard.models import Project -from release_dashboard.utils import docker +from ..forms.docker import BuildDockerForm +from ..models import DockerImage +from ..models import DockerTag +from ..models import Project +from ..utils import docker logger = logging.getLogger(__name__) diff --git a/repoapi/models/jbi.py b/repoapi/models/jbi.py index 3b6a408..8a46ca8 100644 --- a/repoapi/models/jbi.py +++ b/repoapi/models/jbi.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015-2020 The Sipwise Team - http://sipwise.com +# Copyright (C) 2015-2022 The Sipwise Team - http://sipwise.com # # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the Free @@ -26,8 +26,8 @@ from django.db import models from django.db.models import Q from django.forms.models import model_to_dict +from ..conf import settings from debian import deb822 -from repoapi.conf import settings logger = structlog.get_logger(__name__) workfront_re = re.compile(r"TT#(\d+)") diff --git a/repoapi/serializers.py b/repoapi/serializers.py index 3702d16..1066136 100644 --- a/repoapi/serializers.py +++ b/repoapi/serializers.py @@ -1,24 +1,23 @@ -# Copyright (C) 2015 The Sipwise Team - http://sipwise.com - +# Copyright (C) 2015-2022 The Sipwise Team - http://sipwise.com +# # This program is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the Free # Software Foundation, either version 3 of the License, or (at your option) # any later version. - +# # This program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # more details. - +# # You should have received a copy of the GNU General Public License along # with this program. If not, see . - from rest_framework import serializers -import repoapi.models as models +from . import models -class JenkinsBuildInfoSerializer(serializers.HyperlinkedModelSerializer): +class JenkinsBuildInfoSerializer(serializers.HyperlinkedModelSerializer): class Meta: model = models.JenkinsBuildInfo - fields = '__all__' + fields = "__all__"