repos: Rename from repository

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 3d45de658329564815d2e2b7442c2f73dc1451f5..cdb8846c015841549f6270a6f04a8bcf42f79f8c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,7 +106,7 @@ buildservice_PYTHON = \
        src/buildservice/ratelimiter.py \
        src/buildservice/releases.py \
        src/buildservice/releasemonitoring.py \
-       src/buildservice/repository.py \
+       src/buildservice/repos.py \
        src/buildservice/sessions.py \
        src/buildservice/settings.py \
        src/buildservice/sources.py \

diff --git a/src/buildservice/__init__.py b/src/buildservice/__init__.py
index 774e55d25b2132d554f6da22bc1e6023cc2d37c4..5aadd6206ee19f3293acfeef9653e9af4fd13975 100644 (file)
--- a/src/buildservice/__init__.py
+++ b/src/buildservice/__init__.py
@@ -32,7 +32,7 @@ from . import mirrors
 from . import packages
 from . import ratelimiter
 from . import releasemonitoring
-from . import repository
+from . import repos
 from . import settings
 from . import sessions
 from . import sources
@@ -83,7 +83,7 @@ class Backend(object):
                self.packages    = packages.Packages(self)
                self.monitorings = releasemonitoring.Monitorings(self)
                self.ratelimiter = ratelimiter.RateLimiter(self)
-               self.repos       = repository.Repositories(self)
+               self.repos       = repos.Repos(self)
                self.sessions    = sessions.Sessions(self)
                self.sources     = sources.Sources(self)
                self.uploads     = uploads.Uploads(self)

diff --git a/src/buildservice/builds.py b/src/buildservice/builds.py
index 5775b10282e1e0bc38cbb7d09094b243b2ee978a..496ada8a85e9e717f4ac0fa3bcf8ca4a017fb161 100644 (file)
--- a/src/buildservice/builds.py
+++ b/src/buildservice/builds.py
@@ -16,7 +16,7 @@ from . import base
 from . import builds
 from . import database
 from . import packages
-from . import repository
+from . import repos
 from . import users
 
 from .constants import *
@@ -132,14 +132,14 @@ class Builds(base.Object):
                        stmt = (
                                stmt
                                .join(
-                                       repository.RepoBuild,
-                                       repository.RepoBuild.build_id == Build.id,
+                                       repos.RepoBuild,
+                                       repos.RepoBuild.build_id == Build.id,
                                ).where(
-                                       repository.RepoBuild.removed_at == None,
-                                       repository.RepoBuild.repo == repo,
+                                       repos.RepoBuild.removed_at == None,
+                                       repos.RepoBuild.repo == repo,
                                )
                                .order_by(
-                                       repository.RepoBuild.added_at.desc(),
+                                       repos.RepoBuild.added_at.desc(),
                                )
                        )
 

diff --git a/src/buildservice/distros.py b/src/buildservice/distros.py
index e40f4904ebe3f175935933d7c27518618a857d1d..57da79cdaa037a3a722ddeb0b04410ebb043953c 100644 (file)
--- a/src/buildservice/distros.py
+++ b/src/buildservice/distros.py
@@ -28,7 +28,7 @@ from . import base
 from . import database
 from . import misc
 from . import releases
-from . import repository
+from . import repos
 from . import sources
 
 # Setup logging
@@ -222,14 +222,14 @@ class Distro(database.Base, database.BackendMixin, database.SoftDeleteMixin):
                """
                stmt = (
                        sqlalchemy
-                       .select(repository.Repo)
+                       .select(repos.Repo)
                        .where(
-                               repository.Repo.deleted_at == None,
-                               repository.Repo.distro == self,
-                               repository.Repo.owner == None,
+                               repos.Repo.deleted_at == None,
+                               repos.Repo.distro == self,
+                               repos.Repo.owner == None,
                        )
                        .order_by(
-                               repository.Repo.name,
+                               repos.Repo.name,
                        )
                )
 
@@ -241,12 +241,12 @@ class Distro(database.Base, database.BackendMixin, database.SoftDeleteMixin):
                """
                stmt = (
                        sqlalchemy
-                       .select(repository.Repo)
+                       .select(repos.Repo)
                        .where(
-                               repository.Repo.deleted_at == None,
-                               repository.Repo.distro == self,
-                               repository.Repo.owner == None,
-                               repository.Repo.slug == slug,
+                               repos.Repo.deleted_at == None,
+                               repos.Repo.distro == self,
+                               repos.Repo.owner == None,
+                               repos.Repo.slug == slug,
                        )
                )
 
@@ -281,15 +281,15 @@ class Distro(database.Base, database.BackendMixin, database.SoftDeleteMixin):
                        .select(
                                sources.Source,
                        )
-                       .select_from(repository.Repo)
+                       .select_from(repos.Repo)
                        .join(
                                sources.Source,
-                               sources.Source.repo_id == repository.Repo.id,
+                               sources.Source.repo_id == repos.Repo.id,
                        )
                        .where(
-                               repository.Repo.deleted_at == None,
-                               repository.Repo.distro == self,
-                               repository.Repo.owner == None,
+                               repos.Repo.deleted_at == None,
+                               repos.Repo.distro == self,
+                               repos.Repo.owner == None,
 
                                sources.Source.deleted_at == None,
                        )

diff --git a/src/buildservice/events.py b/src/buildservice/events.py
index 33b7c214dfaa5cbec1211b236e5186ea40c77030..14292d4d83fa2fbddfd641ef022cec4066bfb7af 100644 (file)
--- a/src/buildservice/events.py
+++ b/src/buildservice/events.py
@@ -34,7 +34,7 @@ from . import jobs
 from . import mirrors
 from . import releases
 from . import releasemonitoring as monitorings
-from . import repository as repos
+from . import repos
 
 # Setup logging
 log = logging.getLogger("pbs.events")

diff --git a/src/buildservice/repository.py b/src/buildservice/repos.py
similarity index 99%
rename from src/buildservice/repository.py
rename to src/buildservice/repos.py
index 6a16dbc39a32cc94083d81438f750a5c26ce9d65..7001d1460c8b70f4da099275d5c0634bb3d6a6f9 100644 (file)
--- a/src/buildservice/repository.py
+++ b/src/buildservice/repos.py
@@ -81,7 +81,7 @@ class RepoBuild(database.Base):
        )
 
 
-class Repositories(base.Object):
+class Repos(base.Object):
        def __aiter__(self):
                stmt = (
                        sqlalchemy

diff --git a/src/buildservice/users.py b/src/buildservice/users.py
index 0e84e93425dc325e24386e8fb49728d68925bab6..00fb927bea5cef2cc80890c7dc834a910f62e54a 100644 (file)
--- a/src/buildservice/users.py
+++ b/src/buildservice/users.py
@@ -37,7 +37,7 @@ from . import database
 from . import httpclient
 from . import jobs
 from . import packages
-from . import repository
+from . import repos
 from . import uploads
 
 from .decorators import *
@@ -884,13 +884,13 @@ class User(database.Base, database.BackendMixin, database.SoftDeleteMixin):
                """
                stmt = (
                        sqlalchemy
-                       .select(repository.Repo)
+                       .select(repos.Repo)
                        .where(
-                               repository.Repo.deleted_at == None,
-                               repository.Repo.owner == self,
+                               repos.Repo.deleted_at == None,
+                               repos.Repo.owner == self,
                        )
                        .order_by(
-                               repository.Repo.name,
+                               repos.Repo.name,
                        )
                )
 
@@ -906,12 +906,12 @@ class User(database.Base, database.BackendMixin, database.SoftDeleteMixin):
 
                stmt = (
                        sqlalchemy
-                       .select(repository.Repo)
+                       .select(repos.Repo)
                        .where(
-                               repository.Repo.deleted_at == None,
-                               repository.Repo.owner == self,
-                               repository.Repo.distro == distro,
-                               repository.Repo.slug == slug,
+                               repos.Repo.deleted_at == None,
+                               repos.Repo.owner == self,
+                               repos.Repo.distro == distro,
+                               repos.Repo.slug == slug,
                        )
                )