Skip to content

Commit

Permalink
Isort linting
Browse files Browse the repository at this point in the history
  • Loading branch information
fauust committed Apr 26, 2024
1 parent 4ef0fb0 commit 5562df8
Show file tree
Hide file tree
Showing 20 changed files with 52 additions and 40 deletions.
3 changes: 2 additions & 1 deletion buildbot.tac
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import os

from twisted.application import service

from buildbot.master import BuildMaster

basedir = "."
Expand All @@ -22,8 +23,8 @@ if basedir == ".":
# note: this line is matched against to check that this is a buildmaster
# directory; do not edit it.
application = service.Application("buildmaster")
from twisted.python.log import FileLogObserver, ILogObserver
from twisted.python.logfile import LogFile
from twisted.python.log import ILogObserver, FileLogObserver

logfile = LogFile.fromFullPath(
os.path.join(log_basedir, "%s"),
Expand Down
6 changes: 2 additions & 4 deletions ci_build_images/buildbot.tac
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@ import fnmatch
import os
import sys

from twisted.application import service
from twisted.python.log import FileLogObserver
from twisted.python.log import ILogObserver

from buildbot_worker.bot import Worker
from twisted.application import service
from twisted.python.log import FileLogObserver, ILogObserver

# setup worker
basedir = os.path.abspath(os.path.dirname(__file__))
Expand Down
15 changes: 8 additions & 7 deletions common_factories.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
from twisted.internet import defer

from buildbot.plugins import *
from buildbot.process import results
from buildbot.process.properties import Property, Properties
from buildbot.steps.package.rpm.rpmlint import RpmLint
from buildbot.steps.shell import ShellCommand, Compile, Test, SetPropertyFromCommand
from buildbot.process.properties import Properties, Property
from buildbot.process.remotecommand import RemoteCommand
from buildbot.steps.mtrlogobserver import MTR, MtrLogObserver
from buildbot.steps.package.rpm.rpmlint import RpmLint
from buildbot.steps.shell import (Compile, SetPropertyFromCommand,
ShellCommand, Test)
from buildbot.steps.source.github import GitHub
from buildbot.process.remotecommand import RemoteCommand
from twisted.internet import defer

from utils import *
from constants import *
from utils import *


# TODO for FetchTestData/getLastNFailedBuildsFactory
Expand Down
2 changes: 1 addition & 1 deletion cross-reference/crossreference/cr/admin.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from django.contrib import admin
from cr.models import TestFailure, TestRun
from django.contrib import admin

admin.site.register(TestFailure)
admin.site.register(TestRun)
Expand Down
8 changes: 4 additions & 4 deletions cross-reference/crossreference/cr/models.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from django.db import models, connections
from django.db.models import Q
from pprint import pprint
import re
from django.db import connection
from datetime import datetime
from pprint import pprint

from django.db import connection, connections, models
from django.db.models import Q


class Builder(models.Model):
Expand Down
2 changes: 1 addition & 1 deletion cross-reference/crossreference/cr/router.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .models import TestRun, TestFailure, Builder
from .models import Builder, TestFailure, TestRun


class MariaDBRouter:
Expand Down
3 changes: 1 addition & 2 deletions cross-reference/crossreference/cr/views.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from django.shortcuts import render

# Create your views here.
from django.http import HttpResponse
from django.shortcuts import render

from .models import select_test_failures

Expand Down
1 change: 1 addition & 0 deletions cross-reference/crossreference/crossreference/settings.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os

from dotenv import load_dotenv

# Load environment variables from .env file
Expand Down
1 change: 1 addition & 0 deletions define_masters.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import os
import shutil

import yaml

BASE_PATH = "autogen/"
Expand Down
11 changes: 6 additions & 5 deletions locks.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
from twisted.internet import defer

from buildbot.plugins import *
from buildbot.process.properties import Property, Properties
from buildbot.steps.shell import ShellCommand, Compile, Test, SetPropertyFromCommand
from buildbot.process.properties import Properties, Property
from buildbot.process.remotecommand import RemoteCommand
from buildbot.steps.mtrlogobserver import MTR, MtrLogObserver
from buildbot.steps.shell import (Compile, SetPropertyFromCommand,
ShellCommand, Test)
from buildbot.steps.source.github import GitHub
from buildbot.process.remotecommand import RemoteCommand
from twisted.internet import defer

from constants import *

####### LOCKS
Expand Down
3 changes: 2 additions & 1 deletion master-bintars/buildbot.tac
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import os

from twisted.application import service

from buildbot.master import BuildMaster

basedir = "."
Expand All @@ -22,8 +23,8 @@ if basedir == ".":
# note: this line is matched against to check that this is a buildmaster
# directory; do not edit it.
application = service.Application("buildmaster")
from twisted.python.log import FileLogObserver, ILogObserver
from twisted.python.logfile import LogFile
from twisted.python.log import ILogObserver, FileLogObserver

logfile = LogFile.fromFullPath(
os.path.join(log_basedir, "master-bintars.log"),
Expand Down
3 changes: 2 additions & 1 deletion master-docker-nonstandard-2/buildbot.tac
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import os

from twisted.application import service

from buildbot.master import BuildMaster

basedir = "."
Expand All @@ -22,8 +23,8 @@ if basedir == ".":
# note: this line is matched against to check that this is a buildmaster
# directory; do not edit it.
application = service.Application("buildmaster")
from twisted.python.log import FileLogObserver, ILogObserver
from twisted.python.logfile import LogFile
from twisted.python.log import ILogObserver, FileLogObserver

logfile = LogFile.fromFullPath(
os.path.join(log_basedir, "master-docker-non-standard-2.log"),
Expand Down
3 changes: 2 additions & 1 deletion master-docker-nonstandard/buildbot.tac
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import os

from twisted.application import service

from buildbot.master import BuildMaster

basedir = "."
Expand All @@ -22,8 +23,8 @@ if basedir == ".":
# note: this line is matched against to check that this is a buildmaster
# directory; do not edit it.
application = service.Application("buildmaster")
from twisted.python.log import FileLogObserver, ILogObserver
from twisted.python.logfile import LogFile
from twisted.python.log import ILogObserver, FileLogObserver

logfile = LogFile.fromFullPath(
os.path.join(log_basedir, "master-docker-non-standard.log"),
Expand Down
3 changes: 2 additions & 1 deletion master-galera/buildbot.tac
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import os

from twisted.application import service

from buildbot.master import BuildMaster

basedir = "."
Expand All @@ -22,8 +23,8 @@ if basedir == ".":
# note: this line is matched against to check that this is a buildmaster
# directory; do not edit it.
application = service.Application("buildmaster")
from twisted.python.log import FileLogObserver, ILogObserver
from twisted.python.logfile import LogFile
from twisted.python.log import ILogObserver, FileLogObserver

logfile = LogFile.fromFullPath(
os.path.join(log_basedir, "master-galera.log"),
Expand Down
3 changes: 2 additions & 1 deletion master-libvirt/buildbot.tac
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import os

from twisted.application import service

from buildbot.master import BuildMaster

basedir = "."
Expand All @@ -22,8 +23,8 @@ if basedir == ".":
# note: this line is matched against to check that this is a buildmaster
# directory; do not edit it.
application = service.Application("buildmaster")
from twisted.python.log import FileLogObserver, ILogObserver
from twisted.python.logfile import LogFile
from twisted.python.log import ILogObserver, FileLogObserver

logfile = LogFile.fromFullPath(
os.path.join(log_basedir, "master-libvirt.log"),
Expand Down
3 changes: 2 additions & 1 deletion master-nonlatent/buildbot.tac
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import os

from twisted.application import service

from buildbot.master import BuildMaster

basedir = "."
Expand All @@ -22,8 +23,8 @@ if basedir == ".":
# note: this line is matched against to check that this is a buildmaster
# directory; do not edit it.
application = service.Application("buildmaster")
from twisted.python.log import FileLogObserver, ILogObserver
from twisted.python.logfile import LogFile
from twisted.python.log import ILogObserver, FileLogObserver

logfile = LogFile.fromFullPath(
os.path.join(log_basedir, "master-nonlatent.log"),
Expand Down
3 changes: 2 additions & 1 deletion master-protected-branches/buildbot.tac
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import os

from twisted.application import service

from buildbot.master import BuildMaster

basedir = "."
Expand All @@ -22,8 +23,8 @@ if basedir == ".":
# note: this line is matched against to check that this is a buildmaster
# directory; do not edit it.
application = service.Application("buildmaster")
from twisted.python.log import FileLogObserver, ILogObserver
from twisted.python.logfile import LogFile
from twisted.python.log import ILogObserver, FileLogObserver

logfile = LogFile.fromFullPath(
os.path.join(log_basedir, "master-protected-branches.log"),
Expand Down
3 changes: 2 additions & 1 deletion master-web/buildbot.tac
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import os

from twisted.application import service

from buildbot.master import BuildMaster

basedir = "."
Expand All @@ -22,8 +23,8 @@ if basedir == ".":
# note: this line is matched against to check that this is a buildmaster
# directory; do not edit it.
application = service.Application("buildmaster")
from twisted.python.log import FileLogObserver, ILogObserver
from twisted.python.logfile import LogFile
from twisted.python.log import ILogObserver, FileLogObserver

logfile = LogFile.fromFullPath(
os.path.join(log_basedir, "master-web.log"),
Expand Down
1 change: 0 additions & 1 deletion schedulers_definition.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from buildbot.plugins import *

from utils import *


Expand Down
15 changes: 9 additions & 6 deletions utils.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
import fnmatch
import os
import re
import sys
import fnmatch
from datetime import timedelta, datetime
from pyzabbix import ZabbixAPI
from datetime import datetime, timedelta

import docker
from pyzabbix import ZabbixAPI
from twisted.internet import defer

from buildbot.plugins import *
from buildbot.process.properties import Property, Properties
from buildbot.process.properties import Properties, Property
from buildbot.process.remotecommand import RemoteCommand
from buildbot.process.results import FAILURE
from buildbot.steps.shell import ShellCommand, Compile, Test, SetPropertyFromCommand
from buildbot.steps.mtrlogobserver import MTR, MtrLogObserver
from buildbot.steps.shell import (Compile, SetPropertyFromCommand,
ShellCommand, Test)
from buildbot.steps.source.github import GitHub
from buildbot.process.remotecommand import RemoteCommand
from constants import *

private_config = {"private": {}}
Expand Down

0 comments on commit 5562df8

Please sign in to comment.