Cleanup a lot of legacy cruft from the database schema (pypi#4581)

* Remove the unused stable_version column
* Remove Release._pypi_hidden
* Remove Project.autohide
* Remove Project.comments
* Remove Project.bugtrack_url
* Remove project.hosting_mode
* Remove Release.description_from_readme
* Remove File.downloads
* Remove User.is_staff
* Allow setting User.is_staff to null

Author: dstufft

tests/common/db/accounts.py

@@ -28,7 +28,6 @@ class Meta:
     name = factory.fuzzy.FuzzyText(length=12)
     password = "!"
     is_active = True
-    is_staff = False
     is_superuser = False
     date_joined = factory.fuzzy.FuzzyNaiveDateTime(
         datetime.datetime(2005, 1, 1), datetime.datetime(2010, 1, 1)

tests/unit/forklift/test_legacy.py

@@ -2903,152 +2903,6 @@ def test_fails_without_user(self, pyramid_config, pyramid_request):
             "403 Invalid or non-existent authentication information."
         )
 
-    def test_autohides_old_releases(self, pyramid_config, db_request):
-        pyramid_config.testing_securitypolicy(userid=1)
-
-        user = UserFactory.create()
-        EmailFactory.create(user=user)
-        project = ProjectFactory.create(autohide=True)
-        ReleaseFactory.create(project=project, version="0.5", _pypi_hidden=False)
-        RoleFactory.create(user=user, project=project)
-
-        db_request.db.add(Classifier(classifier="Environment :: Other Environment"))
-        db_request.db.add(Classifier(classifier="Programming Language :: Python"))
-
-        filename = "{}-{}.tar.gz".format(project.name, "1.0")
-
-        db_request.user = user
-        db_request.remote_addr = "10.10.10.20"
-        db_request.user_agent = "warehouse-tests/6.6.6"
-        db_request.POST = MultiDict(
-            {
-                "metadata_version": "1.2",
-                "name": project.name,
-                "version": "1.0",
-                "summary": "This is my summary!",
-                "filetype": "sdist",
-                "md5_digest": "335c476dc930b959dda9ec82bd65ef19",
-                "content": pretend.stub(
-                    filename=filename,
-                    file=io.BytesIO(b"A fake file."),
-                    type="application/tar",
-                ),
-            }
-        )
-        db_request.POST.extend(
-            [
-                ("classifiers", "Environment :: Other Environment"),
-                ("classifiers", "Programming Language :: Python"),
-                ("requires_dist", "foo"),
-                ("requires_dist", "bar (>1.0)"),
-                ("project_urls", "Test, https://example.com/"),
-                ("requires_external", "Cheese (>1.0)"),
-                ("provides", "testing"),
-            ]
-        )
-
-        storage_service = pretend.stub(store=lambda path, filepath, meta: None)
-        db_request.find_service = lambda svc, name=None: storage_service
-
-        resp = legacy.file_upload(db_request)
-
-        assert resp.status_code == 200
-
-        # Ensure that a Release object has been created and is not hidden.
-        release = (
-            db_request.db.query(Release)
-            .filter((Release.project == project) & (Release.version == "1.0"))
-            .one()
-        )
-        assert not release._pypi_hidden
-
-        # Ensure that all the old release objects are hidden.
-        other_releases = (
-            db_request.db.query(Release)
-            .filter((Release.project == project) & (Release.version != "1.0"))
-            .all()
-        )
-        assert len(other_releases)
-        for r in other_releases:
-            assert r._pypi_hidden
-
-    def test_doesnt_autohides_old_releases(self, pyramid_config, db_request):
-        pyramid_config.testing_securitypolicy(userid=1)
-
-        user = UserFactory.create()
-        EmailFactory.create(user=user)
-        project = ProjectFactory.create(autohide=False)
-        previous_releases = {
-            "0.5": ReleaseFactory.create(
-                project=project, version="0.5", _pypi_hidden=False
-            ),
-            "0.75": ReleaseFactory.create(
-                project=project, version="0.75", _pypi_hidden=False
-            ),
-        }
-        RoleFactory.create(user=user, project=project)
-
-        db_request.db.add(Classifier(classifier="Environment :: Other Environment"))
-        db_request.db.add(Classifier(classifier="Programming Language :: Python"))
-
-        filename = "{}-{}.tar.gz".format(project.name, "1.0")
-
-        db_request.user = user
-        db_request.remote_addr = "10.10.10.20"
-        db_request.user_agent = "warehouse-tests/6.6.6"
-        db_request.POST = MultiDict(
-            {
-                "metadata_version": "1.2",
-                "name": project.name,
-                "version": "1.0",
-                "summary": "This is my summary!",
-                "filetype": "sdist",
-                "md5_digest": "335c476dc930b959dda9ec82bd65ef19",
-                "content": pretend.stub(
-                    filename=filename,
-                    file=io.BytesIO(b"A fake file."),
-                    type="application/tar",
-                ),
-            }
-        )
-        db_request.POST.extend(
-            [
-                ("classifiers", "Environment :: Other Environment"),
-                ("classifiers", "Programming Language :: Python"),
-                ("requires_dist", "foo"),
-                ("requires_dist", "bar (>1.0)"),
-                ("project_urls", "Test, https://example.com/"),
-                ("requires_external", "Cheese (>1.0)"),
-                ("provides", "testing"),
-            ]
-        )
-
-        storage_service = pretend.stub(store=lambda path, filepath, meta: None)
-        db_request.find_service = lambda svc, name=None: storage_service
-
-        resp = legacy.file_upload(db_request)
-
-        assert resp.status_code == 200
-
-        # Ensure that a Release object has been created and is not hidden.
-        release = (
-            db_request.db.query(Release)
-            .filter((Release.project == project) & (Release.version == "1.0"))
-            .one()
-        )
-        assert not release._pypi_hidden
-
-        # Ensure that all the old release objects still have the same hidden
-        # state.
-        other_releases = (
-            db_request.db.query(Release)
-            .filter((Release.project == project) & (Release.version != "1.0"))
-            .all()
-        )
-        assert len(other_releases)
-        for r in other_releases:
-            assert r._pypi_hidden == previous_releases[r.version]._pypi_hidden
-
 
 @pytest.mark.parametrize("status", [True, False])
 def test_legacy_purge(monkeypatch, status):

tests/unit/legacy/api/xmlrpc/test_xmlrpc.py

@@ -460,12 +460,12 @@ def test_list_packages_with_serial(db_request):
 
 
 def test_package_hosting_mode_shows_none(db_request):
-    assert xmlrpc.package_hosting_mode(db_request, "nope") is None
+    assert xmlrpc.package_hosting_mode(db_request, "nope") == "pypi-only"
 
 
 def test_package_hosting_mode_results(db_request):
-    project = ProjectFactory.create(hosting_mode="pypi-explicit")
-    assert xmlrpc.package_hosting_mode(db_request, project.name) == "pypi-explicit"
+    project = ProjectFactory.create()
+    assert xmlrpc.package_hosting_mode(db_request, project.name) == "pypi-only"
 
 
 def test_user_packages(db_request):
@@ -592,8 +592,8 @@ def test_release_data(db_request):
     assert xmlrpc.release_data(db_request, project.name, release.version) == {
         "name": release.project.name,
         "version": release.version,
-        "stable_version": release.project.stable_version,
-        "bugtrack_url": release.project.bugtrack_url,
+        "stable_version": None,
+        "bugtrack_url": None,
         "package_url": urls[0],
         "release_url": urls[1],
         "docs_url": release.project.documentation_url,
@@ -619,7 +619,6 @@ def test_release_data(db_request):
         "requires_python": release.requires_python,
         "requires_external": list(release.requires_external),
         "_pypi_ordering": release._pypi_ordering,
-        "_pypi_hidden": release._pypi_hidden,
         "downloads": {"last_day": -1, "last_week": -1, "last_month": -1},
         "cheesecake_code_kwalitee_id": None,
         "cheesecake_documentation_id": None,

warehouse/accounts/interfaces.py

@@ -66,9 +66,7 @@ def check_password(user_id, password, *, tags=None):
         checking the password.
         """
 
-    def create_user(
-        username, name, password, is_active=False, is_staff=False, is_superuser=False
-    ):
+    def create_user(username, name, password, is_active=False, is_superuser=False):
         """
         Accepts a user object, and attempts to create a user with those
         attributes.

warehouse/accounts/models.py

@@ -69,7 +69,6 @@ class User(SitemapMixin, db.Model):
     password = Column(String(length=128), nullable=False)
     password_date = Column(DateTime, nullable=True, server_default=sql.func.now())
     is_active = Column(Boolean, nullable=False)
-    is_staff = Column(Boolean, nullable=False)
     is_superuser = Column(Boolean, nullable=False)
     date_joined = Column(DateTime, server_default=sql.func.now())
     last_login = Column(DateTime, nullable=False, server_default=sql.func.now())

warehouse/accounts/services.py

@@ -173,21 +173,14 @@ def check_password(self, userid, password, *, tags=None):
         return False
 
     def create_user(
-        self,
-        username,
-        name,
-        password,
-        is_active=False,
-        is_staff=False,
-        is_superuser=False,
+        self, username, name, password, is_active=False, is_superuser=False
     ):
 
         user = User(
             username=username,
             name=name,
             password=self.hasher.hash(password),
             is_active=is_active,
-            is_staff=is_staff,
             is_superuser=is_superuser,
         )
         self.db.add(user)

warehouse/admin/templates/admin/projects/detail.html

@@ -84,14 +84,12 @@ <h3 class="project-name text-center">{{ project.name }}</h3>
               <table class="table table-hover">
                 <th>Release version</th>
                 <th>Created</th>
-                <th>Hidden</th>
                 <th>Uploader</th>
                 <th>Author email</th>
                 {% for release in releases %}
                 <tr>
                   <td><a href="{{ request.route_path('admin.project.release', project_name=release.project.normalized_name, version=release.version) }}">{{ release.name }}-{{ release.version }}</a></td>
                   <td>{{ release.created }}</td>
-                  <td>{{ release._pypi_hidden }}</td>
                   <td><a href="{{ request.route_path('admin.user.detail', user_id=release.uploader.id) }}">{{ release.uploader.username }}</a></td>
                   <td>{{ release.author_email }}</td>
                 </tr>

warehouse/admin/templates/admin/projects/release_detail.html

@@ -39,10 +39,6 @@ <h3>Details</h3>
           <td>Created</td>
           <td>{{ release.created }}</td>
         </tr>
-        <tr>
-          <td>Hidden</td>
-          <td>{{ release._pypi_hidden }}</td>
-        </tr>
         <tr>
           <td>Uploader</td>
           <td><a href="{{ request.route_path('admin.user.detail', user_id=release.uploader.id) }}">{{ release.uploader.username }}</a></td>

warehouse/admin/templates/admin/projects/releases_list.html

@@ -43,7 +43,6 @@
       <tr>
         <th>Release version</th>
         <th>Created</th>
-        <th>Hidden</th>
         <th>Uploader</th>
         <th>Author email</th>
       </tr>
@@ -52,7 +51,6 @@
       <tr>
         <td><a href="{{ request.route_path('admin.project.release', project_name=release.project.normalized_name, version=release.version) }}">{{ release.name }}-{{ release.version }}</a></td>
         <td>{{ release.created }}</td>
-        <td>{{ release._pypi_hidden }}</td>
         <td><a href="{{ request.route_path('admin.user.detail', user_id=release.uploader.id) }}">{{ release.uploader.username }}</a></td>
         <td>{{ release.author_email }}</td>
       </tr>

warehouse/forklift/legacy.py

@@ -961,7 +961,6 @@ def file_upload(request):
             _classifiers=[
                 c for c in all_classifiers if c.classifier in form.classifiers.data
             ],
-            _pypi_hidden=False,
             dependencies=list(
                 _construct_dependencies(
                     form,
@@ -1021,20 +1020,14 @@ def file_upload(request):
     releases = (
         request.db.query(Release)
         .filter(Release.project == project)
-        .options(orm.load_only(Release._pypi_ordering, Release._pypi_hidden))
+        .options(orm.load_only(Release._pypi_ordering))
         .all()
     )
     for i, r in enumerate(
         sorted(releases, key=lambda x: packaging.version.parse(x.version))
     ):
         r._pypi_ordering = i
 
-    # TODO: Again, we should figure out a better solution to doing this than
-    #       just inlining this inside this method.
-    if project.autohide:
-        for r in releases:
-            r._pypi_hidden = bool(not r == release)
-
     # Pull the filename out of our POST data.
     filename = request.POST["content"].filename
 

warehouse/legacy/api/json.py

@@ -172,7 +172,7 @@ def json_release(release, request):
                 list(release.requires_dist) if release.requires_dist else None
             ),
             "docs_url": project.documentation_url,
-            "bugtrack_url": project.bugtrack_url,
+            "bugtrack_url": None,
             "home_page": release.home_page,
             "download_url": release.download_url,
         },

warehouse/legacy/api/xmlrpc/views.py

@@ -242,16 +242,7 @@ def list_packages_with_serial(request):
 
 @xmlrpc_method(method="package_hosting_mode")
 def package_hosting_mode(request, package_name: str):
-    try:
-        project = (
-            request.db.query(Project)
-            .filter(Project.normalized_name == func.normalize_pep426_name(package_name))
-            .one()
-        )
-    except NoResultFound:
-        return None
-    else:
-        return project.hosting_mode
+    return "pypi-only"
 
 
 @xmlrpc_method(method="user_packages")
@@ -332,8 +323,8 @@ def release_data(request, package_name: str, version: str):
     return {
         "name": release.project.name,
         "version": release.version,
-        "stable_version": release.project.stable_version,
-        "bugtrack_url": release.project.bugtrack_url,
+        "stable_version": None,
+        "bugtrack_url": None,
         "package_url": request.route_url(
             "packaging.project", name=release.project.name
         ),
@@ -363,7 +354,6 @@ def release_data(request, package_name: str, version: str):
         "requires_python": release.requires_python,
         "requires_external": list(release.requires_external),
         "_pypi_ordering": release._pypi_ordering,
-        "_pypi_hidden": release._pypi_hidden,
         "downloads": {"last_day": -1, "last_week": -1, "last_month": -1},
         "cheesecake_code_kwalitee_id": None,
         "cheesecake_documentation_id": None,

warehouse/migrations/versions/62f6becc7653_set_user_is_staff_to_nullable.py

@@ -0,0 +1,32 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""
+Set User.is_staff to nullable
+
+Revision ID: 62f6becc7653
+Revises: 522918187b73
+Create Date: 2018-08-17 16:16:20.397865
+"""
+
+from alembic import op
+
+
+revision = "62f6becc7653"
+down_revision = "522918187b73"
+
+
+def upgrade():
+    op.alter_column("accounts_user", "is_staff", nullable=True)
+
+
+def downgrade():
+    op.alter_column("accounts_user", "is_staff", nullable=False)