From bb4ddf40dee8f070348a9f55abbe4a6cbaaac81c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20M=C3=A9nager?= <herve.menager@pasteur.fr>
Date: Sat, 12 Sep 2020 21:31:54 +0200
Subject: [PATCH] black reformats
---
ippisite/ippidb/models.py | 15 +++------------
ippisite/ippidb/tasks.py | 2 +-
ippisite/ippidb/tests/tests_utils.py | 9 ++++++++-
ippisite/ippidb/views/about.py | 5 ++++-
ippisite/ippidb/views/contribute.py | 4 +---
ippisite/ippidb/ws.py | 2 +-
ippisite/ippisite/decorator.py | 3 ++-
7 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/ippisite/ippidb/models.py b/ippisite/ippidb/models.py
index cc53d7e8..681c1878 100644
--- a/ippisite/ippidb/models.py
+++ b/ippisite/ippidb/models.py
@@ -1495,21 +1495,14 @@ class ContributionManager(models.Manager):
if current_user.is_anonymous:
qs = qs.exclude(validated=False)
elif not current_user.is_superuser:
- qs = qs.exclude(
- Q(validated=False),
- ~Q(contributor=current_user),
- )
+ qs = qs.exclude(Q(validated=False), ~Q(contributor=current_user),)
return qs
def validated(self):
"""
Get validated contributions
"""
- return (
- super()
- .get_queryset()
- .exclude(validated=False)
- )
+ return super().get_queryset().exclude(validated=False)
class Contribution(models.Model):
@@ -1814,9 +1807,7 @@ def update_compound_cached_properties(compounds_queryset=None):
)
.values("_bindtest_av")[:1]
),
- pktest_av=Exists(
- CompoundPKResult.objects.filter(id=OuterRef("id"))
- ),
+ pktest_av=Exists(CompoundPKResult.objects.filter(id=OuterRef("id"))),
cytoxtest_av=Exists(
CompoundCytotoxicityResult.objects.filter(id=OuterRef("id"))
),
diff --git a/ippisite/ippidb/tasks.py b/ippisite/ippidb/tasks.py
index 676af40f..fa8088d2 100644
--- a/ippisite/ippidb/tasks.py
+++ b/ippisite/ippidb/tasks.py
@@ -625,7 +625,7 @@ def launch_validate_contributions(contribution_ids: List[int]):
run_update_compound_cached_properties.s(),
run_compute_drugbank_similarity.s(),
run_validate.s(),
- )
+ ),
)
contribution_jobs.append(compounds_properties_computation_group)
# compounds_properties_computation_group.delay()
diff --git a/ippisite/ippidb/tests/tests_utils.py b/ippisite/ippidb/tests/tests_utils.py
index 5c73f34e..21bc5614 100644
--- a/ippisite/ippidb/tests/tests_utils.py
+++ b/ippisite/ippidb/tests/tests_utils.py
@@ -6,7 +6,14 @@ import re
from django.test import TestCase
from openbabel import vectorUnsignedInt, OBFingerprint
-from ippidb.utils import FingerPrinter, mol2smi, smi2mol, smi2inchi, smi2inchikey, smi2sdf
+from ippidb.utils import (
+ FingerPrinter,
+ mol2smi,
+ smi2mol,
+ smi2inchi,
+ smi2inchikey,
+ smi2sdf,
+)
class MolSmiTestCase(TestCase):
diff --git a/ippisite/ippidb/views/about.py b/ippisite/ippidb/views/about.py
index 27069fd7..323bfce6 100644
--- a/ippisite/ippidb/views/about.py
+++ b/ippisite/ippidb/views/about.py
@@ -106,7 +106,10 @@ def about_pharmacology(request):
drugbank_compounds_per_ppi_family = convert_to_bar_chart_data(
drugbank_compounds_per_ppi_family_raw
)
- ppi_family_labels = {entry['name']: entry['id'] for entry in PpiFamily.objects.values(*['id', 'name'])}
+ ppi_family_labels = {
+ entry["name"]: entry["id"]
+ for entry in PpiFamily.objects.values(*["id", "name"])
+ }
context = {
"biochemical_tests_count_by_name": biochemical_tests_count_by_name,
"cellular_tests_count_by_name": cellular_tests_count_by_name,
diff --git a/ippisite/ippidb/views/contribute.py b/ippisite/ippidb/views/contribute.py
index f0483c0f..308fb474 100644
--- a/ippisite/ippidb/views/contribute.py
+++ b/ippisite/ippidb/views/contribute.py
@@ -561,9 +561,7 @@ class IppiWizard(
f"Congratulations! Dear {contribution.contributor.username},"
f" thank you for your contribution.",
)
- return redirect(
- reverse("contribution-detail", kwargs={"pk": contribution.pk})
- )
+ return redirect(reverse("contribution-detail", kwargs={"pk": contribution.pk}))
def get(self, *args, **kwargs):
"""
diff --git a/ippisite/ippidb/ws.py b/ippisite/ippidb/ws.py
index e954562c..341fac3b 100644
--- a/ippisite/ippidb/ws.py
+++ b/ippisite/ippidb/ws.py
@@ -397,7 +397,7 @@ def get_pdb_pfam_mapping(pdb_id: str) -> dict:
resp = requests.get(
"https://www.ebi.ac.uk/pdbe/api/mappings/pfam/{}".format(pdb_id.lower())
)
- if "application/json" not in resp.headers.get('content-type'):
+ if "application/json" not in resp.headers.get("content-type"):
raise EntryNotFoundError(pdb_id, resp.status_code)
all_pfam = resp.json()[pdb_id]["Pfam"]
for pfam in all_pfam.values():
diff --git a/ippisite/ippisite/decorator.py b/ippisite/ippisite/decorator.py
index 865d8bd1..0316c59d 100644
--- a/ippisite/ippisite/decorator.py
+++ b/ippisite/ippisite/decorator.py
@@ -21,7 +21,8 @@ class MonitorTask(Task):
tasks = TaskResult.objects.filter(
task_name=self.request.task,
status__in=[states.STARTED, states.PENDING, states.RETRY, states.RECEIVED],
- task_args=str(args), task_kwargs=str(kwargs)
+ task_args=str(args),
+ task_kwargs=str(kwargs),
)
count_tasks = tasks.count()
if not count_tasks:
--
GitLab