From 38c1d7a1a38a5e9fa7de80f04a6c6ce2462edeac Mon Sep 17 00:00:00 2001 From: Felipe Monteiro Date: Thu, 18 Oct 2018 01:45:37 +0100 Subject: [PATCH] fix: Pin down Deckhand package requirements This patch set pins down package requirements for the following reasons: * Inconsistencies between ranges and direct pins * Deckhand isn't gated against requirements repo so changes to some packages isn't actively tested * Other Airship components use pins, so Deckhand might break them when package requirements go out of sync between components * Deckhand as of yet has no stable release so Airship relies on master for stability so it is better to ensure stability over anything else Change-Id: I20ef4be3e01cd267771098d33447ccb61aee20b4 --- doc/source/images/architecture-pegleg.png | Bin 37598 -> 37600 bytes doc/source/images/architecture.png | Bin 23227 -> 23230 bytes requirements.txt | 66 +++++++++++----------- test-requirements.txt | 23 ++++---- 4 files changed, 42 insertions(+), 47 deletions(-) diff --git a/doc/source/images/architecture-pegleg.png b/doc/source/images/architecture-pegleg.png index f35812da5a7c19578fb37279499b61a643b9812c..ed0a368d7dc2d6c20368e0d49c1c24f9d6e05e70 100644 GIT binary patch delta 531 zcmV+u0_^?Xr2^ok0+3mM_py0%5 z#KDS;-Fy_QZgJd$Wkm~2$SSaFEsI;L>VNO70mqRdq}9&Hd;8`wx3%HgG*#&^`|->u z4eo62It--|<^b;fYPCEIlOOR}^eef0a4qsh^9l)x+1o3ZxeI@P9R{$8lr&nETk!n} zZ052M61NWfcLrHvQDV^p+6bcfp~G~EPodv;C=jBdG}@6{R=R-)o4lLyIZu0#b;*_*>j)*g z3wYk-{RLQvJTLKoH`n&DPt!+$g*wchma_Md5S6)|w63k6e4Nd} zn|$!wjzM?w1+*w$jU9M44`GJ8QXMKXx1&OB7a(tY9d=9Saf8^h^VqTBMC3f+2h4dk#Mv zTDJ;Au+d<(7(z1dlcZ@cw31dIdt5KtCb(B7*(q~uzP|FN!alD_7pxa8>AKYzlE^Rq z#q((FrNNldN@;F{EFhtugH;Hzkj)=9!x!F^)`3jrR1Qh~SMP?!Tow&4NE=EPDbl15 VR7==@{xSpw;4-KbWwTfUhL9By1L*(& delta 529 zcmV+s0`C3br2^ii0+3mM_IgxUbZ~58Zgh2RYybdwoNZEFYuhjseHZvYT>O+g*wkg& zN*+SV$NDjcWpk1}givJb))ld(Aj@gP*ni(uY^Ny{fzbUpN9P{twzAyVx-2~A7SF6U z;7@11$52^mkKo@gmy3%q`4wM8f0DZg-yxq3FOiU#?OwPNKK%867{F$tl{LE9LKu!< zGgG-#xb@h-3&;ZV0`m^gL@eX5skS?WyV!YlVE1h zLPGN)j0qB;65CVf4?I>@zmp4YdCDs%O;=>!36L_6h^NIQ^o$(3s72qoJC z1i|S22AE4B3Vh{%#$EPl`UG%LkGb7Zb{-O?@4O_h(yQqDJtqF@OClRN=!vj{&TvT3Mrit2Kn-C9GzulnU1# z`}jtA+@RuCT{7DNN!Y@YTZ}_?jH~Ym&Xo}%A%<7O&Hhgzi>xzRFAp8 zlRPYf82c^ss$|B0VPAXdz^}1Ac106*Ct>qSDEpKqutn2Itsn|VC(%V1MFTEqDY${r z2%_`&>@*&q!qZ|3E|SgI{BG%%HOAng!6F?3pB+G$ zsjW0x)pQhgzfAigxYd?#wC#$|&w`0`?G5>YW!j4_dyg?hnfwu+Jdegf7L6I5+6XIE z37nRObqtAA?K`{17tvOhy5+i{bWHAl1{W+5s%%9`-cYfrCQoKZInF)-9z@X35lY_` IvljxSSP~=Pwg3PC delta 463 zcmV;=0Wki)wE?@e0gzdLwR%)obZ~58Zgh2RYybdwoNZA}Z`wc*y|3i|F!Biww&JL? z5r-&((4;A-v<7-WC|cVSy274C>oF;+`rkWiL&%}BWbJ&sH*enD)vO&iRT(J%A+g~j zgpZ5GJiLVI_vyRnXZr9Z^xZE`R|w%f=DS~-iV*$;3Sd39#Lkv~8;IjuSWjqc2seTH z`wsGLkCd{`cQCfq-jYz)XZT3F%;cI*_!M)83@KZOFcL_FRBYPLuXwE4UdRj0I@7iA z&uz_HhhBHbDldp&U7Vyo7ugx)SM{aFuO-RT1ET2mG680$C`x?Q&JX)p#0xc zo{bR1$%T$p#Q5BQn@?@>ZS6qa$%gGo)V$Qh%h?nT=xSpLlKA>6xrvh`L)OWlx1=4} zSAtw@G$jI?3j3<}FrPwg8UgrY(PY|q diff --git a/requirements.txt b/requirements.txt index 5f871399..bb5ec42f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,49 +2,47 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -# Hacking already pins down pep8, pyflakes and flake8 -hacking>=1.1.0 # Apache-2.0 +hacking==1.1.0 -alembic>=0.9.6 # MIT -falcon>=1.4.1 # Apache-2.0 -pbr!=2.1.0,>=4.0.3 # Apache-2.0 -PasteDeploy>=1.5.2 # MIT -Paste # MIT -Routes>=2.4.1 # MIT -keystoneauth1>=3.6.1 # Apache-2.0 -networkx==2.1 - -six>=1.11.0 # MIT -stevedore>=1.28.0 # Apache-2.0 -python-keystoneclient>=3.16.0 # Apache-2.0 -python-memcached==1.59 -keystonemiddleware>=5.1.0 # Apache-2.0 -psycopg2==2.7.4 -uwsgi==2.0.17 +alembic==1.0.1 +beaker==1.9.1 +cryptography==2.3.1 +deepdiff==3.3.0 +falcon==1.2.0 jsonpath-ng==1.4.3 jsonschema==2.6.0 -beaker==1.9.1 -cryptography>=2.1 # BSD/Apache-2.0 -deepdiff==3.3.0 - -oslo.cache>=1.30.1 # Apache-2.0 -oslo.concurrency>=3.27.0 # Apache-2.0 -oslo.config!=4.3.0,!=4.4.0 # Apache-2.0 -oslo.context>=2.20.0 # Apache-2.0 +keystoneauth1==3.4.0 +keystonemiddleware==4.17.0 +networkx==2.1 +oslo.cache==1.31.0 +oslo.concurrency==3.28.1 +oslo.config==6.6.1 +oslo.context>=2.21.0 oslo.messaging==8.1.2 -oslo.db>=4.38.0 # Apache-2.0 -oslo.i18n!=3.15.2,>=3.20.0 # Apache-2.0 -oslo.log>=3.38.1 # Apache-2.0 -oslo.middleware>=3.35.0 # Apache-2.0 -oslo.policy>=1.35.0 # Apache-2.0 -oslo.serialization!=2.19.1,>=2.25.0 # Apache-2.0 -oslo.utils>=3.36.2 # Apache-2.0 +oslo.db==4.41.1 +oslo.log==3.40.1 +oslo.middleware==3.36.0 +oslo.policy==1.40.0 +oslo.serialization==2.28.1 +oslo.utils==3.37.1 +pbr==5.0.0 +PasteDeploy==1.5.2 +Paste==2.0.3 +psycopg2==2.7.4 # TODO(alanmeadows) # this must match the container service # likely this should be imported from a # container sidecar long-term -python-barbicanclient>=4.6.0 # Apache-2.0 +python-barbicanclient==4.7.0 +python-keystoneclient==3.17.0 +python-memcached==1.59 +requests==2.19.1 +Routes==2.4.1 +six==1.11.0 +stevedore==1.29.0 +urllib3==1.23 +uwsgi==2.0.17 # To support profiling in non-prod Werkzeug==0.14.1 diff --git a/test-requirements.txt b/test-requirements.txt index 75fbf80e..8090de56 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,18 +2,15 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -# Hacking already pins down pep8, pyflakes and flake8 -hacking>=1.1.0 # Apache-2.0 - -coverage!=4.4,>=4.5.1 # Apache-2.0 -fixtures>=3.0.0 # Apache-2.0/BSD -python-subunit>=1.3.0 # Apache-2.0/BSD -oslotest>=3.4.2 # Apache-2.0 -os-testr>=1.0.0 # Apache-2.0 -testrepository>=0.0.20 # Apache-2.0/BSD -testtools>=2.3.0 # MIT -bandit>=1.4.0 # Apache-2.0 +coverage==4.5.1 +fixtures==3.0.0 +python-subunit==1.3.0 +os-testr==1.0.0 +testrepository==0.0.20 +testtools==2.3.0 +bandit==1.5.1 # NOTE(felipemonteiro): Pin here because later versions require that -# content-type be present in empty responses, which is apparently a bug. +# content-type be present in empty responses. gabbi==1.35.1 -pifpaf>=0.10.0 # Apache-2.0 +pifpaf==2.1.2 +oslotest==3.7.0