]> git.ipfire.org Git - pbs.git/commitdiff
jobs: Drop some more unneeded code
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 21 Jun 2022 10:22:52 +0000 (10:22 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 21 Jun 2022 10:22:52 +0000 (10:22 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/buildservice/jobs.py

index 38c2e5b39b01d1d951ea64c4fdd95933aaf3bc45..e0af52880aa664a4610f7829d0a04daec4a9937f 100644 (file)
@@ -88,18 +88,6 @@ class Job(base.DataObject):
 
                return NotImplemented
 
-       def __iter__(self):
-               return iter(self.packages)
-
-       def __bool__(self):
-               return True
-
-       def __len__(self):
-               res = self.db.get("SELECT COUNT(*) AS len FROM jobs_packages \
-                       WHERE job_id = %s", self.id)
-
-               return res.len
-
        @property
        def uuid(self):
                return self.data.uuid
@@ -108,13 +96,9 @@ class Job(base.DataObject):
        def name(self):
                return "%s-%s.%s" % (self.pkg.name, self.pkg.friendly_version, self.arch)
 
-       @property
-       def build_id(self):
-               return self.data.build_id
-
        @lazy_property
        def build(self):
-               return self.backend.builds.get_by_id(self.build_id)
+               return self.backend.builds.get_by_id(self.data.build_id)
 
        @property
        def test(self):
@@ -122,15 +106,10 @@ class Job(base.DataObject):
 
        @property
        def related_jobs(self):
-               ret = []
-
-               for job in self.build.jobs:
-                       if job == self:
-                               continue
-
-                       ret.append(job)
-
-               return ret
+               """
+                       Returns all sibling jobs
+               """
+               return [job for job in self.build.jobs if not self == job]
 
        @property
        def pkg(self):
@@ -158,19 +137,6 @@ class Job(base.DataObject):
        def size(self):
                return sum((p.size for p in self.packages))
 
-       @lazy_property
-       def rank(self):
-               """
-                       Returns the rank in the build queue
-               """
-               if not self.state == "pending":
-                       return
-
-               res = self.db.get("SELECT rank FROM job_queue WHERE job_id = %s", self.id)
-
-               if res:
-                       return res.rank
-
        @lazy_property
        def estimated_build_time(self):
                """