From 87b772b62186f4f6959e90fa9a181441a5063a8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20=20MENAGER?= <herve.menager@pasteur.fr>
Date: Fri, 19 May 2017 14:43:57 +0200
Subject: [PATCH] adapt admin lists and create migration for nb_pockets change
---
ippisite/db.sqlite3 | Bin 569344 -> 569344 bytes
ippisite/ippidb/admin.py | 4 +--
.../management/commands/import_v1_data.py | 7 ++++-
.../migrations/0014_auto_20170519_1243.py | 24 ++++++++++++++++++
4 files changed, 32 insertions(+), 3 deletions(-)
create mode 100644 ippisite/ippidb/migrations/0014_auto_20170519_1243.py
diff --git a/ippisite/db.sqlite3 b/ippisite/db.sqlite3
index 57542b95b741e72c1e7980fb7ecdb36ade6e1767..db5d773a7c69fd5c0d0e7127f3eb1efe378bb8eb 100644
GIT binary patch
delta 1161
zcmYMzUuaWT9Ki8&&dp8Ewdwse;#Ra)Zc9OBZOCnswK^3<Z3WwG#nwMtHOXybO<UX8
zrrP<hF|jIDv?XH~hOkYl1{7sPye~e;x<_Gu?3<=kP<$zjfe$|HVJE*G@ZtCQ-g93r
z=WtJExjwU8KU?D~5kjtsnGxeAg!Roe25IS+*gPmTT5sM{6=qs*vCG(??bueMlC@v#
zOr}!Fek%|#L(%v|dNkS`Fk1p)b4%204h74Lra-vK++vu`TSLLEW~)CGHa~A^E&j0f
zwwqVJ_0H%qJy!Ik+PuY?#sGEK7>AU0ZvWY-*5*r1m*_;!@?Ww1)Uo_*-q*26;61Fs
z8+Zka@Em@Fr|=jaz&zZ7@8CLIf^(3DVd#fm=!Op14cj0DjnDw=VGVe}rT?qH*H`p6
z`YU}=d^M|2soB#iA)2OUPsvWmre()v$7D~+resHDM`TaP4$BV74$3BFkC!_oK0F{_
z9FtAR_RIFkTC#E3m~2$`sO%BhUfFMCzm`2Ldq~t@-uXfK;(%<AY&TZR?pMhtnilM7
z4L|vc(M(0<904UlAgeFf`X6lFDkZ{xWC!WbWVZZsC{E-B+qKF?2yGT?KfSWB#Kb6K
zTw+vbVadIHPMrVWkdGO@yBW_jTItXftAi=!a;-u%<+2B5C`C!x=_&LAdLBK8o<+}~
zljv#m6gq*X(Q$MPJ&C5!(X!F$5nP-=htVN)5KW@T(E;=rnn3$e3yq^OG>RS-;--s6
zY8gHv&S3KUXVhg^%<?LAQrx{wjxoz$!)Km$;-hUu|4@0s`<FLdu|`|b_VFj~d+wxa
zxo#@|DD5mr+qj>$iGyB88!jeuaZhz!9nICI<JNHE|LYkQm-OS4{kp`e?e+q1v41V_
zYWr+~@7*}sH<U<^M@OuBBRP^z3?#;k$d}zlq^F}}bG9lM^Hg_svYgMpRbqP>nYPUW
z|J43HL*4eH5?gIoEwMb^?CibG>lORyeZIpUyu*JIe*k%x?=t3SN!aDO=*n64)q8x}
Zd0F5`m~-O+A7W0$UH&a~K0M@{{s(8e5!?U(
delta 1414
zcmb`_Z)jUp7{~E*PHyf!`TL}3=~kV)i_9_UiaG~{qJlD4rGHj!*SXHNrpB%7Y~xzp
zsM@4Svq=?~65W-8Xu8rBh8r5@MNp_z@P#mRDyVa#B17<nq9CmL#^>z!&esy2d~(Q(
zd$`{xx0=kYCQG-}ToyvS$}_`b3!(PUHf)!d-yc|@Kz(Sg>?C$nJKereb#DE<ZN~><
z*P=7knoLWyI@55MwCmlyfnD1Bsx7#od}Z6T%oI|MCsK{lPc^EAnm29T+7g%l&xfCy
ziDl(=zNZlK5AZAa8T<&o1sB2RU>SS_J^*LI0(cvo0w=*MU<za>;21az(x4CYfZgB`
z@E~Xg_kwNU4zLld12rJbSjRV5A{4TYJ686F3P%aV4T@PX30?*-ffvC9I0lY_7r^si
z9E^b@;5m@7M3%2n9K~@2JPQtkVQ>fxfrH=xcm|}w(;x+&0t28Q^cjNuA|(0tZuL(#
z#=jGRc0u|0N^I7PeyQrUdPnuhiYW26-WKrNzg7>0Bl*TD;ncOY$wG&B|GeHQH+!Fc
zqiVg2Iq7(GMcL)%eNnGEugh+Oo6L+34yVV*`bSbpcW7iheIR|rZSUxE+q+v^x1LzJ
zs(1oC7EjP$xoY1x`<S`O=J=YRzvwsmg;wc%x<p^lXY>huNatyZDl|uBdX0)SNk=I|
zLzJRk>Y_G!m>!@ex|{B#+v!%Sr8qex;%mI-XX05aZ|VpuZ|X3n4rA&trVeB3Fs2T}
zbqppBW8yF-4rAglCJtlbFeVOT;xHx-W8w%an>Tg%XzDP7z(nGciNu&ljETgUNX(O9
zKj;Pfz!P9E=mC2`H|R3xeCTnuc6)czj>Vj_%&+8ks=Arg|9+JR+_z3GOUsLtbRt;f
z7Sq04(m&CbNRvpY77@R0hvTiW^U>GCiO{J2K}VhG;GxLJ)?lEd{!}fzEUxl*oz}^K
zcV<z)>rcL?C!{rH74~@dEa_tS(L%RVw`r5i_j{ccy<Q%}0_7^Y$-7k1JH6BA^i2U?
z5dXrG?pIdiZ!ul&baPH~q1UeK*y?qDr#5;g7xg-eZ}$fORq}5>tA~}pc1}C;U-Z8c
AcmMzZ
diff --git a/ippisite/ippidb/admin.py b/ippisite/ippidb/admin.py
index dc4f162a..21a59ca3 100644
--- a/ippisite/ippidb/admin.py
+++ b/ippisite/ippidb/admin.py
@@ -20,8 +20,8 @@ class DomainAdmin(admin.ModelAdmin):
@admin.register(ProteinDomainBoundComplex)
class ProteinDomainBoundComplexAdmin(admin.ModelAdmin):
- list_display = ('protein', 'domain', 'ppc_copy_nb', 'ppp_copy_nb_per_p', 'pockets_nb')
- list_display_links = ('protein', 'domain', 'ppc_copy_nb', 'ppp_copy_nb_per_p', 'pockets_nb')
+ list_display = ('protein', 'domain', 'ppc_copy_nb', 'ppp_copy_nb_per_p')
+ list_display_links = ('protein', 'domain', 'ppc_copy_nb', 'ppp_copy_nb_per_p')
@admin.register(ProteinDomainPartnerComplex)
class ProteinDomainPartnerComplexAdmin(admin.ModelAdmin):
diff --git a/ippisite/ippidb/management/commands/import_v1_data.py b/ippisite/ippidb/management/commands/import_v1_data.py
index cf14e8eb..f5419e9b 100644
--- a/ippisite/ippidb/management/commands/import_v1_data.py
+++ b/ippisite/ippidb/management/commands/import_v1_data.py
@@ -223,7 +223,12 @@ select distinct protein.NumUniprot, domain.PfamNumAccession , complexe.NbCopy,
compound.is_macrocycle = (row[4]=='Y')
compound.aromatic_ratio = row[5]
compound.balaban_index = row[6]
- compound.balaban_index = row[6]
+ compound.fsp3 = row[7] #Csp3Ratio
+ compound.gc_molar_refractivity=row[10] #GCMolarRefractivity
+ compound.log_d = row[13] #LogD
+ compound.a_log_p = row[14] #ALogP
+ compound.mean_atom_vol_vdw = row[15] #MeanAtomVolVdW
+ compound.molecular_weight = row[16]
compound.save()
except Exception as e:
if options['stoponfail']:
diff --git a/ippisite/ippidb/migrations/0014_auto_20170519_1243.py b/ippisite/ippidb/migrations/0014_auto_20170519_1243.py
new file mode 100644
index 00000000..3aef4f32
--- /dev/null
+++ b/ippisite/ippidb/migrations/0014_auto_20170519_1243.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.1 on 2017-05-19 12:43
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('ippidb', '0013_auto_20170518_1943'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='proteindomainboundcomplex',
+ name='pockets_nb',
+ ),
+ migrations.AddField(
+ model_name='ppi',
+ name='pockets_nb',
+ field=models.IntegerField(default=1, verbose_name='Total number of pockets in the complex'),
+ ),
+ ]
--
GitLab