Merge branch 'develop' into 'flatpaks-namespace'

bodhi/server/migrations/versions/a3580bdf5129_remove_the_ci_url_field_from_builds.py

@@ -0,0 +1,44 @@
+# Copyright (c) 2019 Sebastian Wojciechowski.
+#
+# This file is part of Bodhi.
+#
+# 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 2
+# 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, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+"""
+Remove the ci_url field from builds.
+
+Revision ID: a3580bdf5129
+Revises: 8e9dc57e082d
+Create Date: 2019-01-11 17:41:30.353652
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'a3580bdf5129'
+down_revision = 'f8a44498c806'
+
+
+def upgrade():
+    """Remove the ci_url from builds."""
+    op.drop_column('builds', 'ci_url')
+
+
+def downgrade():
+    """Add the ci_url to builds."""
+    op.add_column(
+        'builds',
+        sa.Column('ci_url', sa.UnicodeText, nullable=True)
+    )

bodhi/server/models.py

@@ -1313,7 +1313,6 @@ class Build(Base):
     release_id = Column(Integer, ForeignKey('releases.id'))
     signed = Column(Boolean, default=False, nullable=False)
     update_id = Column(Integer, ForeignKey('updates.id'))
-    ci_url = Column(UnicodeText, default=None, nullable=True)
 
     release = relationship('Release', backref='builds', lazy=False)
 

bodhi/server/services/releases.py

@@ -53,7 +53,7 @@
 releases = Service(name='releases', path='/releases/',
                    description='Fedora Releases',
                    factory=security.AdminACLFactory,
-                   # Note, this 'rw' is not a typo.  the @comments service has
+                   # Note, this 'rw' is not a typo. The @releases service has
                    # a ``post`` section at the bottom.
                    cors_origins=bodhi.server.security.cors_origins_rw)
 

bodhi/tests/server/test_models.py

@@ -203,13 +203,13 @@ def test__to_json_no_seen(self):
 
         self.assertEqual(
             j,
-            {'release_id': 1, 'ci_url': b.ci_url, 'epoch': b.epoch, 'nvr': b.nvr,
+            {'release_id': 1, 'epoch': b.epoch, 'nvr': b.nvr,
              'signed': b.signed, 'type': str(b.type.value)})
 
     def test_grid_columns(self):
         """Assert correct return value from the grid_columns() method."""
         self.assertEqual(model.Build.grid_columns(), ['nvr', 'release_id', 'signed',
-                                                      'ci_url', 'type', 'epoch'])
+                                                      'type', 'epoch'])
 
     def test_find_child_for_rpm(self):
         subclass = model.Package.find_polymorphic_child(model.ContentType.rpm)

docs/user/man_pages/bodhi.rst

@@ -60,7 +60,7 @@ in more detail in their own sections below.
 
 ``bodhi composes <subcommand> [options] [args]``
 
-    Provides an interface to view composes. Supports one subcommand, ``list``, described below.
+    Provides an interface to view composes. Supports subcommands ``list`` and ``info``, described below.
 
 ``bodhi overrides <subcommand> [options] [args]``
 

docs/user/release_notes.rst

@@ -18,6 +18,7 @@ Backwards incompatible changes
 * The ``bodhi-manage-releases`` script has been removed (:issue:`2420`).
 * Bodhi server no longer supports Python 2. Python 3 is the only supported Python release
   (:issue:`2759`).
+* Support for the ``ci_url`` on the ``Build`` object was dropped (:issue:`2782`).
 * Support for ``active_releases`` parameter in updates query API was droped (:issue:`2815`).
 * The ``/updates/ALIAS/TITLE`` API has been removed (:issue:`2869`).
 * Support for update's old_updateid was dropped (:issue:`2903`).