From 7f571522425245a4c0d7b5215a2517eee0afd2a3 Mon Sep 17 00:00:00 2001 From: my8100 Date: Tue, 16 Apr 2019 22:43:21 +0800 Subject: [PATCH 1/8] Fix #311 --- scrapyd/utils.py | 2 +- scrapyd/website.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scrapyd/utils.py b/scrapyd/utils.py index 2c6293d0..c9377226 100644 --- a/scrapyd/utils.py +++ b/scrapyd/utils.py @@ -26,7 +26,7 @@ def render_object(self, obj, txrequest): txrequest.setHeader('Access-Control-Allow-Origin', '*') txrequest.setHeader('Access-Control-Allow-Methods', 'GET, POST, PATCH, PUT, DELETE') txrequest.setHeader('Access-Control-Allow-Headers',' X-Requested-With') - txrequest.setHeader('Content-Length', len(r)) + txrequest.setHeader('Content-Length', str(len(r))) return r class UtilsCache: diff --git a/scrapyd/website.py b/scrapyd/website.py index 6f5e189c..05abff61 100644 --- a/scrapyd/website.py +++ b/scrapyd/website.py @@ -154,6 +154,6 @@ def render(self, txrequest): s += "" txrequest.setHeader('Content-Type', 'text/html; charset=utf-8') - txrequest.setHeader('Content-Length', len(s)) + txrequest.setHeader('Content-Length', str(len(s))) return s.encode('utf-8') From 9e6d1f8535eb90e077bcc94a35f942ecb6ae638b Mon Sep 17 00:00:00 2001 From: my8100 Date: Mon, 29 Apr 2019 22:25:25 +0800 Subject: [PATCH 2/8] Avoid using DeferredQueue.pending to fix #327 --- scrapyd/poller.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scrapyd/poller.py b/scrapyd/poller.py index ee4e30cd..aa4097f7 100644 --- a/scrapyd/poller.py +++ b/scrapyd/poller.py @@ -11,11 +11,11 @@ class QueuePoller(object): def __init__(self, config): self.config = config self.update_projects() - self.dq = DeferredQueue(size=1) + self.dq = DeferredQueue() @inlineCallbacks def poll(self): - if self.dq.pending: + if not self.dq.waiting: return for p, q in iteritems(self.queues): c = yield maybeDeferred(q.count) From de47c7249ee5edb51fca24452007dbef724f6867 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=9D=CE=B9=CE=BA=CF=8C=CE=BB=CE=B1=CE=BF=CF=82-=CE=94?= =?UTF-8?q?=CE=B9=CE=B3=CE=B5=CE=BD=CE=AE=CF=82=20=CE=9A=CE=B1=CF=81=CE=B1?= =?UTF-8?q?=CE=B3=CE=B9=CE=AC=CE=BD=CE=BD=CE=B7=CF=82?= Date: Tue, 16 Apr 2019 16:16:55 +0300 Subject: [PATCH 3/8] read config with regard to encoding --- scrapyd/config.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/scrapyd/config.py b/scrapyd/config.py index 829fa7a7..a0e509ad 100644 --- a/scrapyd/config.py +++ b/scrapyd/config.py @@ -1,5 +1,5 @@ import glob -from io import StringIO +import io from pkgutil import get_data from six.moves.configparser import SafeConfigParser, NoSectionError, NoOptionError from os.path import expanduser @@ -17,10 +17,14 @@ def __init__(self, values=None, extra_sources=()): sources = self._getsources() default_config = get_data(__package__, 'default_scrapyd.conf').decode('utf8') self.cp = SafeConfigParser() - self.cp.readfp(StringIO(default_config)) - self.cp.read(sources) - for fp in extra_sources: - self.cp.readfp(fp) + self.cp.readfp(io.StringIO(default_config)) + sources.extend(extra_sources) + for fname in sources: + try: + with io.open(fname) as fp: + self.cp.readfp(fp) + except (IOError, OSError): + pass else: self.cp = SafeConfigParser(values) self.cp.add_section(self.SECTION) From ce37fbe192c112da76107f45675a46dcdbb54f9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=9D=CE=B9=CE=BA=CF=8C=CE=BB=CE=B1=CE=BF=CF=82-=CE=94?= =?UTF-8?q?=CE=B9=CE=B3=CE=B5=CE=BD=CE=AE=CF=82=20=CE=9A=CE=B1=CF=81=CE=B1?= =?UTF-8?q?=CE=B3=CE=B9=CE=AC=CE=BD=CE=BD=CE=B7=CF=82?= Date: Wed, 17 Apr 2019 22:42:47 +0300 Subject: [PATCH 4/8] remove py3.3 from travis. 3.3 was never supported --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cd2e8b47..ab198f78 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,6 @@ matrix: env: TOXENV=py27 - python: 2.7 env: TOXENV=pypy - - python: 3.3 - env: TOXENV=py33 - python: 3.4 env: TOXENV=py34 - python: 3.5 From eed93cb994905457c2d251f080c6fa763b413073 Mon Sep 17 00:00:00 2001 From: Paul Tremberth Date: Fri, 1 Sep 2017 19:07:02 +0200 Subject: [PATCH 5/8] Native-stringify project and version arguments when deploying --- scrapyd/webservice.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scrapyd/webservice.py b/scrapyd/webservice.py index 5cb7562a..15c56b5f 100644 --- a/scrapyd/webservice.py +++ b/scrapyd/webservice.py @@ -79,9 +79,10 @@ def render_POST(self, txrequest): class AddVersion(WsResource): def render_POST(self, txrequest): - project = txrequest.args[b'project'][0].decode('utf-8') - version = txrequest.args[b'version'][0].decode('utf-8') - eggf = BytesIO(txrequest.args[b'egg'][0]) + eggf = BytesIO(txrequest.args.pop(b'egg')[0]) + args = native_stringify_dict(copy(txrequest.args), keys_only=False) + project = args['project'][0] + version = args['version'][0] self.root.eggstorage.put(eggf, project, version) spiders = get_spider_list(project, version=version) self.root.update_projects() From fd26af641ecd1a28a743cf0f029b2ca5af16a0ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=9D=CE=B9=CE=BA=CF=8C=CE=BB=CE=B1=CE=BF=CF=82-=CE=94?= =?UTF-8?q?=CE=B9=CE=B3=CE=B5=CE=BD=CE=AE=CF=82=20=CE=9A=CE=B1=CF=81=CE=B1?= =?UTF-8?q?=CE=B3=CE=B9=CE=AC=CE=BD=CE=BD=CE=B7=CF=82?= Date: Thu, 13 Jun 2019 08:42:51 +0300 Subject: [PATCH 6/8] make test eggs work with scrapy-1.0 --- scrapyd/tests/mybot.egg | Bin 5129 -> 3644 bytes scrapyd/tests/mybot2.egg | Bin 5706 -> 4199 bytes scrapyd/tests/mybotunicode.egg | Bin 2980 -> 3716 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/scrapyd/tests/mybot.egg b/scrapyd/tests/mybot.egg index 8525589bbf745d10e4fdb0668bb16afc05661e95..6acb11b05f08069fde278a027a495550486935a4 100644 GIT binary patch literal 3644 zcma)93p~^7AKq*hO4gcNN{(6?CbyKLBU+g;Gr61&O>87JvyGEL7;%4^T@rasPLxY>?*%F${=1e#G)A{})^MaJ zcfJ)DoxM&}n;$K4{@srzND)}hcBzc2LLxXAa?=|DXPzO9s-Vw8uw?H6pi2u5gGp6S z>GO2=qB#*g&3L+G{$$~u!k_`4b!#(Yi5f?nHP>==9Ep2LquVa$m;D)O zm0D)I=y<`SCv^$0JcRZf9|O!Y-ZjTEKL^YOH*6ZxaGk~22b7}X6jZAv0w@K7VT0L^Ye!su1++qMwOF`+%qnRuoCz{R<4`uN_Aq8d>GZ)jm zUtSnf2>9B1@(S-_ubLv)yDJ{Vsj?&B5ZaC>&PghO4h2d}o|YHRrtf4%F?UMU)JgHr zp_1eqQrIGULfHiFwqT}06NK4%_Fw^+lJpyRq=;S7f#JLrbb2T<-tVv7-?XdAd~( zV}rpT#)HDl1PBV6tgnk4V2a!=5mY^_H(y?QTljI+msXhgU0xTq<}&*+UFC*zHsWxH$`8~S*0ZFeqLYCFP_N!;u>oodywO%*Z^L`ia8}Z+)EuK7|;EtV+cGlrf zBYwzxuKzPLF&;fo*L-8&z}$w(iE`F=@2@#C)pA=cH0hnb`#*5~E9mx)ACwfQVCP0$ zZV7PmwSuE^@9vYMITPs?HX^v14*xMcNr2;TP(wIjg$#ys2qP&FX_1|-Lrd3*U760m zh%0n3yljcD5T|S3ZZa{eaU~Iq$KvujU>M5eH$(dl-#CZc>p)>2I3oz7UOQhw&Pxts zAB0hB8dokPZbo#^L3$LxgG_^JtY;pZ1xw zRL093?LN)Tu|=h|4es~`QYpf=C|%jP*doGGelVolJm|2}u2Z1Dcc7%R`gxmk*`W+3 zhbzC`{gW-`-ZVfXV=4l1tyMqj3pH*nc3|5qO>nyN-I4u^13h!D28Kk1-&z<*yzswW zKGn-vdJ98JEu0WpX|G7eyQ`|McJ$mzLlEB)DTxs}7FHQTuQhy}%frLlwv`v3y0dkE zzW1xuxDyi-*09m0bE#`Zhby{X+Ln6c@|O>9@4e-i6uoV8cCI6p@HX^Ke?8OMv`_4p zUEsN2f^=&eR8}wkx>OQL+hN@l*S_Mt`iq zdAF=iKi$6U>WtpLuE^5Vx--6ulOvvVhiJzvYI{1Iw*%9^uUajZzkA4Puy~AJdv;mx zYSq4yhaYpFvaXC>-8J|_g6JJwwtc#RF$cC_&i{+5vs?iLYi=QxLKWxj~XlbJ4h;+)eh->N&= z;+ja+rY55wqpruSE-zp=%qp;(zrEw7n0WnY%dm)HkMBO>m+5e~tL#4Q%K8-Sa<3N| zQARJ03%~yucXA%%SgltEKFB}yL{OwIU5jg*d3&6lBv`Yy{Bhsou~QqECj75Pzs0 z!l6m*GZ+RF^H0me<#HL6K|V-GlhKz)%%_2gni4QmPJ&WFW0H(YC{G0qO;8$WERxau zAy1V3r zI5PY~5Muwj(PW879xh!TddxRcx2~2R1Nf=kg=G~f~t|RD2SQqD3#GrL6lc)>NAb>jDw1So{cgV$v?0F UG0M{a6<}!aWe=?EQI&rBKM9rMng9R* literal 5129 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 N$AFXEK>FT5^=}bQL+1bh diff --git a/scrapyd/tests/mybot2.egg b/scrapyd/tests/mybot2.egg index c0e615e6b56429759dc3bdbaae13b79c2311e26d..78ef8e72fe2c2288848138f50e3d6d99eeacde9c 100644 GIT binary patch literal 4199 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 Z$hTPlF$ngZ61cUYAZ@_9Ix5Qk_Ad!TpWXlf literal 5706 zcmb7I2{_c-8y@>McFB?@ON1H8Qj%>n*&55plFBxQ#xe$jMvPseG_qvNzD0|@g+xe% zO2nmwBxOmNTXaSL-_)%cliU5@d7fjQc^>b3zVp4`Ip1Ps&crMP0)f~;s0?G1RMz30 zOu#P&U`YTAZfp!Owb*Z|>W;>tvF>Oris0;n!FmTm@yGF#j3BFZ=)-qe2BiU%9I!-b z(P%6_fZ&Yt!(j2>kV#MrsF_N|=_w@($oB4Db5*-)+k2M}^r$|H;lTMb(9sG&kBj>Q zbalYur=_(r|85-_0Wm#bs$x3GZ4OcD?|o2*+%c#=zG&WyXh13|_B=2{Kqp`+oY1~L zgi2*SlKmt36Pb5ua`D~+#1O>ffF+z=J0rvW)#gHSkWHYVdLUnsURL)-LZ`{-5oA(o z(oQb3*5Ec~rT_u+fyJZ%ei=IZB*SDnlL5P|0k2V9`O|4OmbOSExDCZuK@T2rMq7bd z$5)=iOG9HT5~StdhLYC0%|hZm;nVZxGD3q@HD6amd)xEGyd5+qW>mJixysH6YH74M zr*G2aVofH5^DmSJVWv7Is8Idu80aL1^@jDt^^tHs5;TtQt@>t!4N!z6(nu$vWF!nF3|{cz4c z=wP%D#cI_!Z{Q!3fF-aI0EJrXz2CVF`7X5=#B$nT4%E@9VjvS2wbg-1?qxZ{ zIV0IbMC3js#=|0!h&1!?KjnmV3n2Q(T`7#pD~!T=IGK7S6TL!j60v9`@f0yE%)`mU zG_2Xl5Y546RgAzA%`g^~68DzfNd7dYiC$ILZN#MPx(t{^xi36FO~c^PzJb6&5NB&R z+joHXg+z23W-y!8vfWIFowQhu*02+^8Qa;o^VNd44&-1ApXJTT!Esp9huCx(L%V1c zLd$g`;li~9jjrvac>VxW&C0eI_U!4tl=G(G6C(N^Es3%IB8!z*i*8LXi^axdJ+_)! zRq9u2*cZH zT$bNznT*qG9=mdfv^vDLJ|y;p7l0Rl17!gRicLCS}P>Pj*YF zR)mU;>g|j`Zb}Qe6l&qp>Nd4)BIm7a*=*>G<2J+oYFaJB#>Vp+LD5!x^~SUKCtl)i zGdWjy{qD^9$oL93(oT7&5{?~stcB{sx}#SyOJl^D5;wD)+wi*wCLW=D1Sm? z`YW7p#8(qim-kisdWt^PHx$vMAh*ue06zH)ENVRBFgP^uGNLKMYo4v)i8kQdx3ZFm zP#oM>Se_BRkDKEY^8%}O%-mG)_T>`{K|NW2T+52>fAfVsn~?ZwlOLy^i-Ss`B>y%w zjthjR+k>{`TOrGy+*oM4-IP5V({sY#x3X3VI(50iv|y%d8dedN8#+Yt%tGZPp7G6m z9GAJB%}@StME+WH{qT~@X$eREoBg~`X3o!j{t!K6ggusGWW2RD&ZLg-&^Fe>|0$BpKs_KO3FIGk^s4+sQ68xR2Cps|Yu7@gJ>)i>z* z;1TYv%=Vd9A*0YoqsMKm9v?K{W_?OLj7h(T*F{0Xx!Qzy3bk@;`c=rDmiY)LFA)pa z2NTx?b~zB^oGghyj46!4r!lRgy8rqE1c%c~&-GnHuEmaD%1>x40LK7Z_@5-P8toh7O7xqh0_JaX-AS_kSFs@gnyrbO(}LFA$HvqydB zx_s0gY$j)UNocW1^2B*`!FM?{5{8>N5W&Va#SPJ)uVz9&B{8!NGsEh2&cLqMSk|YM z#}5SHwQwBD@@LCEKWjLm!&br(ACnuDC(Z>BYgVdzV$P#m=;GqIr=N`_;5JdfZPbS? z5RJ!Uu%48#uq8e7j@cp9`GRbJM6r`Q5qmXG_qwJ8Y{+_S-W6OUHU=ge2Hbyt`^6B^ zm%#qv)wK4s2P1r5X)I=Q0&+pO{%+Jv2y5FOGQ`VWP%BFQqLb2Cx1*ar(_Rx8TA@Ho zO!=a&$g__nTvm5w`MkH-iTU+6<((FLWY@)Gl+c7N;r4yUYHMMDnkg0#gEQe3UZY}M zCHUs|Cce@86E*+vdU)*Jo>Ak?N$(>o#Ur{U{(Q|IRC-aq&*3er&y+Q|jnmOn=nI&m zJwyuJU6h{fR;qWK3*D~$B~9c}voAicsM*6Y`%KMrn2m>j&jd&G2ksc_(CJy3?mEM8 zuoUCn#B1(t!{}_)Mr9|`8sUzSA6hn-x5eSE{+hM@edTuHFi}7IoSlEXuMa!a3HOhY z8?^eKrM;fK8meW0R7_$F5Hp7&8=UM3@cunJ$=iKJ?K|2B$P8I^ZPXHG6R?>JM z1-Rd=-GDDn!BnswnG)S%Shx$}_)v$x_>eqF>g_hp8yt;I@dg8F{lare%SA1bbqz|; z-ma|n{@#Aa{FpV|5P>vss2cGWwW-YvhhX8CNfB2Wb_>Q0Y)Az<-a$nz`yBjCTcje+I@8gQ;mG+x%&OTe~ z9`;peJk$KBsyJ^_B$?pDcSe=!LrQ8!B{TZw0T+H5Sd{whduk5EVcgLHfwU?5=vg(M zc4NxU6W1~@Ibc%!aEDG^d`Hl&uCUpq!^)(gt!5>X0-$rBO5w z?=~Q_q;WLW?E_4-2bRb$rheB!4R}b*m3to8Dt;@W2bH1s4wyoa_j)1sRF$l8W-1ok ztVuY3`Dr=f&B_MH59|3HK_{z?3?Qx2&0F6vLqQ9mt2zv!tfkE| zH&H@}#Sq zo#8aQVUh31<0-V5^lBhtT#92R)i=n_d)8>CvWz^9ZZRVd4M;{~)azb&Vk??Ra83OS zgi&4=i-?yjZ4JjyT~Jvr)3#eB?Z>vc$$rik7dc5xMCnah$}YVWr-l;*(CBhP?(Dy5 zwDZ4dw0|RwN`BEu=*nc)$A8g?vNNF3x8&ULnBj5BR=r}FW7B+V90sOSEHU~x_|)jO z92rgT26qA7_FeCb!$5U8jQWx3%_H4)`4`@J?;*_SIV+2(6s^L>bOjV0*)=2KBeDeo z1^hhhO3}QLA(79VBE<|PU+_H(OYJnt%jfgqEGIuv4F41WIss-u}(`I+D`7lwi2 z&_j}5xN}^lYS*T^n2~v$Ri$&AO6t$t9Ndzu`09M7`PZlu+Z0vH>@XKklTSe^@80SY zCcCTUXQd7YRi5n{3`S2rE_fXum{or?zCC}pAx^omFm?NjgVROx=UV$5E-8EsWLkY# zwd1u|gcyO(o~jZUi08PESG@jBCH4QN(%p?zy7Y@mTh${kEd7g0l$`;UtSL7sJr}DS zmnar9Wr7}uPJ&InJnsehwW!5w18oPuumqa}R6 zmoK4JF4YO2xO|sP3XW|Z1PQywM4CnJUpBDf&tICF%!a!@MI%lSppGO4bAO8 zT>R(r7uF(Ar)~?7pIpLQ7DTa_oSi`vD%wn;a-B~zqy$ZFC|}B`wI>Z|%~%EQE+RR* zLBkoY$tdztWs>krBGhI+=CMgD8%&769>R`-##T#l&_zy^hWasdMf(y!*?POs3b~{mWqBD zK~FWq-9vwozrvB_vKU$HK08G zX~mB&off`PlTL-B0QfI0J1v}&PUu^9Dm-l?IEog(QD05Ps{+%h@7w?AvT3oDz3E$5 zDwds@9{bD2^t~MwEXVQ#Oxp<2Z%*GjQSmImbmhC@wD?~Ppl>3m1bf+j5YQC0^!w9S z!BqH7V8ZivJxA?G)@{F01xUrOas0&pS`X5jL0@xGX&!U_hGv~P8x=%U9wHY#54Aj^ zw}!sBp|ULhhGm^G8)befjSTn3#!#{`y)pDzoXV2>8%CJxv)B)TJ93SP^{{R@b3LgLf diff --git a/scrapyd/tests/mybotunicode.egg b/scrapyd/tests/mybotunicode.egg index 60df5000b65fc111a8c3fa56b528c804dad0da09..8891f915099469db58d67508fe68d50b88bee12a 100644 GIT binary patch literal 3716 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 Date: Mon, 17 Jun 2019 08:10:32 +0300 Subject: [PATCH 7/8] 1.2.1 changelog --- docs/news.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/news.rst b/docs/news.rst index db805ded..cffd2510 100644 --- a/docs/news.rst +++ b/docs/news.rst @@ -3,6 +3,17 @@ Release notes ============= +1.2.1 +----- +*Release date: 2019-06-17* + +fixed +~~~~~ +- http header types were breaking newer twisted versions +- DeferredQueue was hiding a pending job when reaching max_proc +- AddVersion's arguments' string types were breaking the environment in windows +- Tests: Updated binary eggs to be scrapy-1.x compatible + 1.2.0 ----- *Release date: 2017-04-12* From 5a9c9eb2ca6da215e7efea03bd7381a15cef565c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=9D=CE=B9=CE=BA=CF=8C=CE=BB=CE=B1=CE=BF=CF=82-=CE=94?= =?UTF-8?q?=CE=B9=CE=B3=CE=B5=CE=BD=CE=AE=CF=82=20=CE=9A=CE=B1=CF=81=CE=B1?= =?UTF-8?q?=CE=B3=CE=B9=CE=AC=CE=BD=CE=BD=CE=B7=CF=82?= Date: Mon, 17 Jun 2019 08:11:43 +0300 Subject: [PATCH 8/8] Bump 1.2.1 --- scrapyd/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scrapyd/VERSION b/scrapyd/VERSION index 26aaba0e..6085e946 100644 --- a/scrapyd/VERSION +++ b/scrapyd/VERSION @@ -1 +1 @@ -1.2.0 +1.2.1