Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update black formatting #818

Merged
merged 4 commits into from
Aug 27, 2019
Merged

Update black formatting #818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
754fb5a
Use pre-release version of black for formatting
vfazio Aug 16, 2019
7d5b885
Apply black py36 reformatting
vfazio Aug 16, 2019
6e5c0da
Add PR818 news entry
vfazio Aug 27, 2019
394038b
Merge branch 'master' into vfazio-blackout
Aug 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions anitya/api_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,18 +136,18 @@ def get(self):
q = q.filter_by(package_name=name)
page = q.paginate(order_by=models.Packages.package_name, **args)
return {
u"items": [
"items": [
{
u"distribution": package.distro_name,
u"name": package.package_name,
u"project": package.project.name,
u"ecosystem": package.project.ecosystem_name,
"distribution": package.distro_name,
"name": package.package_name,
"project": package.project.name,
"ecosystem": package.project.ecosystem_name,
}
for package in page.items
],
u"page": page.page,
u"items_per_page": page.items_per_page,
u"total_items": page.total_items,
"page": page.page,
"items_per_page": page.items_per_page,
"total_items": page.total_items,
}

@authentication.require_token
Expand Down Expand Up @@ -270,7 +270,7 @@ def post(self):
topic="project.map.new",
message=message,
)
return {u"distribution": distro.name, u"name": package.package_name}, 201
return {"distribution": distro.name, "name": package.package_name}, 201
except IntegrityError:
Session.rollback()
return {"error": "package already exists in distribution"}, 409
Expand Down
30 changes: 15 additions & 15 deletions anitya/db/migrations/versions/b9201d816075_remove_the_backends_and_ecosystems_.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

def upgrade():
"""Drop the Backends and Ecosystems tables and remove foreign keys."""
op.drop_constraint(u"projects_backend_fkey", "projects", type_="foreignkey")
op.drop_constraint(u"FK_ECOSYSTEM_FOR_PROJECT", "projects", type_="foreignkey")
op.drop_constraint("projects_backend_fkey", "projects", type_="foreignkey")
op.drop_constraint("FK_ECOSYSTEM_FOR_PROJECT", "projects", type_="foreignkey")
op.create_index(
op.f("ix_projects_ecosystem_name"), "projects", ["ecosystem_name"], unique=False
)
Expand All @@ -34,7 +34,7 @@ def downgrade():
op.create_table(
"backends",
sa.Column("name", sa.VARCHAR(length=200), autoincrement=False, nullable=False),
sa.PrimaryKeyConstraint("name", name=u"backends_pkey"),
sa.PrimaryKeyConstraint("name", name="backends_pkey"),
postgresql_ignore_search_path=False,
)
# We have to populate the backends table before we can add the ecosystems
Expand All @@ -53,14 +53,14 @@ def downgrade():
),
sa.ForeignKeyConstraint(
["default_backend_name"],
[u"backends.name"],
name=u"ecosystems_default_backend_name_fkey",
onupdate=u"CASCADE",
ondelete=u"CASCADE",
["backends.name"],
name="ecosystems_default_backend_name_fkey",
onupdate="CASCADE",
ondelete="CASCADE",
),
sa.PrimaryKeyConstraint("name", name=u"ecosystems_pkey"),
sa.PrimaryKeyConstraint("name", name="ecosystems_pkey"),
sa.UniqueConstraint(
"default_backend_name", name=u"ecosystems_default_backend_name_key"
"default_backend_name", name="ecosystems_default_backend_name_key"
),
)
for ecosystem in plugins.ECOSYSTEM_PLUGINS.get_plugins():
Expand All @@ -73,20 +73,20 @@ def downgrade():
)

op.create_foreign_key(
u"FK_ECOSYSTEM_FOR_PROJECT",
"FK_ECOSYSTEM_FOR_PROJECT",
"projects",
"ecosystems",
["ecosystem_name"],
["name"],
onupdate=u"CASCADE",
ondelete=u"SET NULL",
onupdate="CASCADE",
ondelete="SET NULL",
)
op.create_foreign_key(
u"projects_backend_fkey",
"projects_backend_fkey",
"projects",
"backends",
["backend"],
["name"],
onupdate=u"CASCADE",
ondelete=u"CASCADE",
onupdate="CASCADE",
ondelete="CASCADE",
)
2 changes: 1 addition & 1 deletion anitya/db/migrations/versions/feeaa70ead67_social_authentication_table.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ def upgrade():
sa.Column("extra_data", storage.JSONType(), nullable=True),
sa.Column("uid", sa.String(length=255), nullable=True),
sa.Column("user_id", GUID(), nullable=False),
sa.ForeignKeyConstraint(["user_id"], [u"users.id"]),
sa.ForeignKeyConstraint(["user_id"], ["users.id"]),
sa.PrimaryKeyConstraint("id"),
)
op.create_index(
Expand Down
2 changes: 1 addition & 1 deletion anitya/db/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,7 +937,7 @@ def _api_token_generator(charset=string.ascii_letters + string.digits, length=40
Returns:
str: The API token as a unicode string.
"""
return u"".join(random_choice(charset) for __ in range(length))
return "".join(random_choice(charset) for __ in range(length))


class ApiToken(Base):
Expand Down
2 changes: 1 addition & 1 deletion anitya/lib/exceptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def __init__(self, requested_project):
self.requested_project = requested_project

def to_dict(self):
return {u"requested_project": self.requested_project.__json__()}
return {"requested_project": self.requested_project.__json__()}

def __str__(self):
return "Unable to create project since it already exists."
Expand Down
16 changes: 8 additions & 8 deletions anitya/tests/db/test_meta.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,16 @@ def test_order_by(self):

def test_as_dict(self):
expected_dict = {
u"items_per_page": 1,
u"page": 1,
u"total_items": 3,
u"items": [
"items_per_page": 1,
"page": 1,
"total_items": 3,
"items": [
{
"id": 3,
"backend": u"custom",
"name": u"R2spec",
"homepage": u"https://fedorahosted.org/r2spec/",
"ecosystem": u"https://fedorahosted.org/r2spec/",
"backend": "custom",
"name": "R2spec",
"homepage": "https://fedorahosted.org/r2spec/",
"ecosystem": "https://fedorahosted.org/r2spec/",
"regex": None,
"version": None,
"version_url": None,
Expand Down
8 changes: 4 additions & 4 deletions anitya/tests/db/test_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,16 +673,16 @@ def test_project_flag__json__(self):
flag = create_flagged_project(self.session)
data = {
"created_on": time.mktime(flag.created_on.timetuple()),
"user": u"[email protected]",
"state": u"open",
"project": u"geany",
"user": "[email protected]",
"state": "open",
"project": "geany",
"updated_on": time.mktime(flag.updated_on.timetuple()),
"id": 1,
}

self.assertEqual(flag.__json__(), data)

data["reason"] = u"this is a duplicate."
data["reason"] = "this is a duplicate."
self.assertEqual(flag.__json__(detailed=True), data)

def test_project_flag_all(self):
Expand Down
60 changes: 30 additions & 30 deletions anitya/tests/lib/backends/test_custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,36 +125,36 @@ def test_custom_get_versions(self):
pid = 3
project = models.Project.get(self.session, pid)
exp = [
u"3.1.1",
u"4.0",
u"4.0.1",
u"4.0.2",
u"4.0.3",
u"4.1",
u"4.2",
u"4.3",
u"4.4.0",
u"4.4.1",
u"4.4.2",
u"4.5.0",
u"4.5.1",
u"4.5.2",
u"4.5.3",
u"4.5.4",
u"4.5.5",
u"4.5.6",
u"4.6.0",
u"4.6.1",
u"4.6.2",
u"4.6.3",
u"4.6.4",
u"4.7.1",
u"4.7.2",
u"4.7.3",
u"4.7.4",
u"4.7.5",
u"4.7.6",
u"4.7.7",
"3.1.1",
"4.0",
"4.0.1",
"4.0.2",
"4.0.3",
"4.1",
"4.2",
"4.3",
"4.4.0",
"4.4.1",
"4.4.2",
"4.5.0",
"4.5.1",
"4.5.2",
"4.5.3",
"4.5.4",
"4.5.5",
"4.5.6",
"4.6.0",
"4.6.1",
"4.6.2",
"4.6.3",
"4.6.4",
"4.7.1",
"4.7.2",
"4.7.3",
"4.7.4",
"4.7.5",
"4.7.6",
"4.7.7",
]
obs = backend.CustomBackend.get_ordered_versions(project)
self.assertEqual(obs, exp)
Expand Down
4 changes: 2 additions & 2 deletions anitya/tests/lib/backends/test_debian.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def test_get_versions(self):
""" Test the get_versions function of the debian backend. """
pid = 1
project = models.Project.get(self.session, pid)
exp = [u"0.4.2", u"0.4.3", u"0.4.4", u"0.5.0", u"0.7.0", u"0.7.2"]
exp = ["0.4.2", "0.4.3", "0.4.4", "0.5.0", "0.7.0", "0.7.2"]
obs = backend.DebianBackend.get_ordered_versions(project)
self.assertEqual(obs, exp)

Expand All @@ -142,7 +142,7 @@ def test_get_versions_no_z_release(self):
"""Assert the Debian backend handles versions in the format X.Y"""
pid = 3
project = models.Project.get(self.session, pid)
exp = [u"0.45", u"0.50", u"0.52"]
exp = ["0.45", "0.50", "0.52"]
obs = backend.DebianBackend.get_ordered_versions(project)
self.assertEqual(obs, exp)

Expand Down
86 changes: 43 additions & 43 deletions anitya/tests/lib/backends/test_folder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,19 +142,19 @@ def test_folder_get_versions(self):
pid = 1
project = models.Project.get(self.session, pid)
exp = [
u"0.7.1",
u"0.7.2",
u"0.8.0",
u"0.8.1",
u"0.8.2",
u"0.8.3",
u"0.8.4",
u"0.8.5",
u"0.8.6",
u"0.8.7",
u"0.8.8",
u"0.8.9",
u"0.8.10",
"0.7.1",
"0.7.2",
"0.8.0",
"0.8.1",
"0.8.2",
"0.8.3",
"0.8.4",
"0.8.5",
"0.8.6",
"0.8.7",
"0.8.8",
"0.8.9",
"0.8.10",
]
obs = backend.FolderBackend.get_ordered_versions(project)
self.assertEqual(obs, exp)
Expand All @@ -168,36 +168,36 @@ def test_folder_get_versions(self):
pid = 3
project = models.Project.get(self.session, pid)
exp = [
u"3.1.1",
u"4.0",
u"4.0.1",
u"4.0.2",
u"4.0.3",
u"4.1",
u"4.2",
u"4.3",
u"4.4.0",
u"4.4.1",
u"4.4.2",
u"4.5.0",
u"4.5.1",
u"4.5.2",
u"4.5.3",
u"4.5.4",
u"4.5.5",
u"4.5.6",
u"4.6.0",
u"4.6.1",
u"4.6.2",
u"4.6.3",
u"4.6.4",
u"4.7.1",
u"4.7.2",
u"4.7.3",
u"4.7.4",
u"4.7.5",
u"4.7.6",
u"4.7.7",
"3.1.1",
"4.0",
"4.0.1",
"4.0.2",
"4.0.3",
"4.1",
"4.2",
"4.3",
"4.4.0",
"4.4.1",
"4.4.2",
"4.5.0",
"4.5.1",
"4.5.2",
"4.5.3",
"4.5.4",
"4.5.5",
"4.5.6",
"4.6.0",
"4.6.1",
"4.6.2",
"4.6.3",
"4.6.4",
"4.7.1",
"4.7.2",
"4.7.3",
"4.7.4",
"4.7.5",
"4.7.6",
"4.7.7",
]
obs = backend.FolderBackend.get_ordered_versions(project)
self.assertEqual(obs, exp)
Expand Down
Loading