more imports for conciseness

diff --git a/master.cfg b/master.cfg
index 5e59613238d0dee110a1e9fd6a3c84163d704c00..e6bf6eaaf874b804f8232c99efe977fab7174311 100644 (file)
--- a/master.cfg
+++ b/master.cfg
@@ -1,12 +1,17 @@
 # -*- python -*-
 
 from buildbot.plugins import changes, reporters, schedulers, secrets, steps, util, worker
+from buildbot.changes.filter import ChangeFilter
+from buildbot.changes.gitpoller import GitPoller
 from buildbot.config.builder import BuilderConfig
 from buildbot.steps.source.git import Git
 from buildbot.steps.shell import ShellCommand
 from buildbot.steps.trigger import Trigger
 from buildbot.process.factory import BuildFactory
 from buildbot.process.properties import Secret
+from buildbot.schedulers.basic import SingleBranchScheduler
+from buildbot.schedulers.forcesched import ForceScheduler
+from buildbot.schedulers.triggerable import Triggerable
 from twisted.internet import defer
 from buildbot.process import buildstep
 
@@ -31,32 +36,32 @@ c['protocols'] = {'pb': {
 ####### CHANGESOURCES
 
 c['change_source'] = []
-c['change_source'].append(changes.GitPoller(
+c['change_source'].append(GitPoller(
     'https://framagit.org/medoc92/npupnp.git',
     project='npupnp',
     workdir='npupnp',
     only_tags=True,
     pollInterval=60*60*24))
-c['change_source'].append(changes.GitPoller(
+c['change_source'].append(GitPoller(
     'https://framagit.org/medoc92/libupnpp.git',
     project='libupnpp',
     workdir='libupnpp',
     only_tags=True,
     pollInterval=60*60*24))
-c['change_source'].append(changes.GitPoller(
+c['change_source'].append(GitPoller(
     'https://framagit.org/medoc92/upmpdcli.git',
     project='upmpdcli',
     workdir='upmpdcli',
     only_tags=True,
     pollInterval=60*60*24))
-c['change_source'].append(changes.GitPoller(
+c['change_source'].append(GitPoller(
     'https://gitlab.com/veilid/veilid.git',
     project='veilid',
     workdir='veilid',
     only_tags=True,
     pollAtLaunch=True,
     pollInterval=60*60*24))
-c['change_source'].append(changes.GitPoller(
+c['change_source'].append(GitPoller(
     'https://github.com/crawl/crawl.git',
     project='crawl',
     workdir='crawl',
@@ -76,14 +81,14 @@ c['projects'].append(util.Project(
 ####### SCHEDULERS
 
 c['schedulers'] = []
-c['schedulers'].append(schedulers.ForceScheduler(
+c['schedulers'].append(ForceScheduler(
     name="force",
     builderNames=["crawl","npupnp","libupnpp","upmpdcli","veilid"]))
-c['schedulers'].append(schedulers.ForceScheduler(
+c['schedulers'].append(ForceScheduler(
     name="force-two",
     buttonName="Run",
     builderNames=["stage-test"]))
-c['schedulers'].append(schedulers.ForceScheduler(
+c['schedulers'].append(ForceScheduler(
     name="force-stage-test",
     buttonName="pushMe!",
     label="My nice Force form",
@@ -135,39 +140,39 @@ c['schedulers'].append(schedulers.ForceScheduler(
     ]
 
 ))
-c['schedulers'].append(schedulers.SingleBranchScheduler(
+c['schedulers'].append(SingleBranchScheduler(
     name="npupnp",
-    change_filter=util.ChangeFilter(project="npupnp"),
+    change_filter=ChangeFilter(project="npupnp"),
     treeStableTimer=None,
     builderNames=["npupnp"]))
-c['schedulers'].append(schedulers.SingleBranchScheduler(
+c['schedulers'].append(SingleBranchScheduler(
     name="libupnpp",
-    change_filter=util.ChangeFilter(project="libupnpp"),
+    change_filter=ChangeFilter(project="libupnpp"),
     treeStableTimer=None,
     builderNames=["libupnpp"]))
-c['schedulers'].append(schedulers.SingleBranchScheduler(
+c['schedulers'].append(SingleBranchScheduler(
     name="upmpdcli",
-    change_filter=util.ChangeFilter(project="upmpdcli"),
+    change_filter=ChangeFilter(project="upmpdcli"),
     treeStableTimer=None,
     builderNames=["upmpdcli"]))
-c['schedulers'].append(schedulers.SingleBranchScheduler(
+c['schedulers'].append(SingleBranchScheduler(
     name="veilid",
-    change_filter=util.ChangeFilter(project="veilid"),
+    change_filter=ChangeFilter(project="veilid"),
     treeStableTimer=None,
     builderNames=["veilid"]))
-c['schedulers'].append(schedulers.SingleBranchScheduler(
+c['schedulers'].append(SingleBranchScheduler(
     name="crawl",
-    change_filter=util.ChangeFilter(project="crawl"),
+    change_filter=ChangeFilter(project="crawl"),
     treeStableTimer=None,
     builderNames=["crawl"]))
 
-c['schedulers'].append(schedulers.Triggerable(
+c['schedulers'].append(Triggerable(
     name="fetch-deps-stage",
     builderNames=["fetch-deps-stage"]))
-c['schedulers'].append(schedulers.Triggerable(
+c['schedulers'].append(Triggerable(
     name="build-frontend-job",
     builderNames=["build-frontend-job"]))
-c['schedulers'].append(schedulers.Triggerable(
+c['schedulers'].append(Triggerable(
     name="build-backend-job",
     builderNames=["build-backend-job"]))