From 75f9d2ffc4f5da9ca93c3b7cf0a6dbb1297da713 Mon Sep 17 00:00:00 2001 From: tomtom5152 Date: Tue, 27 Jan 2015 16:43:12 +0000 Subject: [PATCH] Fixed some dependency version issues. --- PyRIGS/settings.py | 2 +- RIGS/importer.py | 2 +- db.sqlite3 | Bin 19219456 -> 19221504 bytes requirements.txt | 3 ++- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py index 9a9fefda..a13dabb4 100644 --- a/PyRIGS/settings.py +++ b/PyRIGS/settings.py @@ -138,4 +138,4 @@ TEMPLATE_DIRS = ( os.path.join(BASE_DIR, 'templates'), ) -TERMS_OF_HIRE_URL = "http://www.nottinghamtec.co.uk/pdf/terms.pdf" \ No newline at end of file +TERMS_OF_HIRE_URL = "http://dev.nottinghamtec.co.uk/wp-content/uploads/2014/11/terms.pdf" \ No newline at end of file diff --git a/RIGS/importer.py b/RIGS/importer.py index 0a8bbbe5..01f1989e 100644 --- a/RIGS/importer.py +++ b/RIGS/importer.py @@ -63,7 +63,7 @@ def import_people(delete=False): resp = cursor.fetchall() for row in resp: email = row[3] - if email is not "" and "@" not in email: + if (email is not None) and ("@" not in email): email += "@nottingham.ac.uk" notes = "" diff --git a/db.sqlite3 b/db.sqlite3 index 7ab8dcb25eca098d5e7c56f293fe33df81751250..5300e8cba4f1a2005fb6aee8d0b15efd6e58adb5 100644 GIT binary patch delta 1521 zcmajfS8!Bi9ER~d`|U}xscb??BU!2-1a>#Ogaj0#6axe#!2(E8(hY>rs|E-~sf)&q z(nX4mqQHVm3xf2bs|I32s-gsx9@_ICFTC)=i{CS6&YYQV&c*kZ%qlaNl$V(o#ON6Y zLt3WW+JT3J^Zrw^HfL#zRj6(-7&KKw(=t_!*W#;QZuDBqBYSD#X&I(K-kVgRK~*WY z+M+y`!G8U{R$sN-=&_y+EpF0SrE9t4a$T-G=Y--R!?SY=hUSh*&P&Qq99C2~x+p)< zSujHPxP!Ej!6sE|P^VReTB%C^ImTnHjPQ8|R%-sSt^}JS!EUqKT`BhD6uYC9y-iz( z%cjSvRL#@EPmA{M4%7Ngwt;8m1h3Z`NjN--TXFcY)z8eYe2%)wmD!+b1&8w>FU-b5MRf(PYz8}DEd7GnvP zVi}fW1>VI#!ahuo0i&Q*6R!Y=IYBu??T$b9{mA*nyqc zh25yY9(;+t*oUvM9|v#{hj182a1_UI94GKKzJU+l;yZkgN}R+gRN)8wh@bE?e!*${ ziZeKib2yI+xQO5IJ1*f5{E5q`#uZ$}U-%o>a2+>r6Sr_1cTj`7xQF|AFq^wS9}=TP zNlX%5;wSN!1W3%1KuM4!SP~)$m4r!ZNi33ZNra@fq>iMnq@E;F5+#Y2#7JT#^(AqV zc!^cgK+;gsNZZLoXufr;O`6FZBFk&6Fc>|Sj@m|9)c|9&sqJ(8%Uot+7o_N8<5ToW9=b+~5*1}KhU@&4vbkQ9V$x#NC0c5PpK57uqbQ1| znG`KcGiheSEOl+VF(a>oh1vMnA(zfPm>`QdC$#gC%sZf;I9%4;$FR4)$<>Bb;DB zemJ853Zf8P;0iam!vlrk2`_lV2p<%IFN(qs#ZVk2P!gq38f8!x{wN38KM+AEk6?r# z6ctbrl@Nx?sDi4fhHz9z4b(&}M4&bzQ3rJqg?gxu255*zXpAOkie_kz7HEl9XpJ^# zi)ge%dvriYbV6rzL05D`47#HSdZHJ4qYwI`ANpee24WBfV+e*~7=~j6Mq(63V+_V( z9L8e;CL$J-5QoW_f~lB>>4?V+%tQiaVK(L<5lJv18FMiYDVPs47GNP3VKJ6qDVAY5 zR$wJoVKvrZE!JT@Hee$*VKcU1D^jry+pz;Xu?xGAhCN8fUhKnu9Kb;w!eJc2Q5?f@ zoInOn;uKEf49?;l&f@|u;u0?73a;WBuHy!7;udZr6L)YIS-6M$cz}n5%Ik^+)~l0p&}iL1m-;x6%!6qa~Oyd>Tdqr^v2 OMB=L+;YFx7QvU(LXCo~D diff --git a/requirements.txt b/requirements.txt index fdba806a..a8c14984 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,7 @@ django-reversion==1.8.5 sqlparse==0.1.13 simplejson==3.6.5 lxml==3.4.1 -pil==1.1.7 +pillow==2.7.0 +reportlab==2.7 z3c.rml==2.7.2 pyPDF2==1.23