version up: zc.buildout 2.7.1+slapos013

component/jupyter-py2/buildout.cfg

@@ -66,7 +66,6 @@ context =
 Pygments = 2.2.0
 astor = 0.5
 backports-abc = 0.5
-backports.functools-lru-cache = 1.6.1
 backports.shutil-get-terminal-size = 1.0.0
 cycler = 0.10.0
 ipykernel = 4.5.2

component/jupyter/buildout.cfg

@@ -3,6 +3,7 @@ extends =
   ../numpy/openblas.cfg
   ../matplotlib/buildout.cfg
   ../ipython/buildout.cfg
+  ../python-cffi/buildout.cfg
   ../python-pyzmq/buildout.cfg
   ../scipy/buildout.cfg
   ../scikit-learn/buildout.cfg
@@ -14,6 +15,11 @@ parts =
   jupyter
   jupyter-notebook-scripts
 
+[argon2-cffi]
+recipe = zc.recipe.egg:custom
+egg = ${:_buildout_section_name_}
+setup-eggs = ${python-cffi:egg}
+
 [jupyter-env]
 <= numpy-env
 
@@ -43,6 +49,7 @@ eggs =
   openpyxl
   sympy
   xlrd
+  ${argon2-cffi:egg}
 # additional eggs for jupyterlab
   jupyterlab
   jupyterlab-launcher

component/python-cachecontrol/buildout.cfg

-[buildout]
-
-[python-cachecontrol]
-recipe = zc.recipe.egg:custom
-egg = cachecontrol
-setup-eggs =
-  pbr
-  lockfile

component/python-cliff/buildout.cfg

-[buildout]
-
-[python-cliff]
-recipe = zc.recipe.egg:custom
-egg = cliff
-setup-eggs =
-  pbr

component/slapos/buildout.cfg

@@ -77,8 +77,6 @@ eggs =
   ${lxml-python:egg}
   ${python-cffi:egg}
   ${python-PyYAML:egg}
-  ${python-cachecontrol:egg}
-  ${python-cliff:egg}
   ${python-cryptography:egg}
   pyOpenSSL
   slapos.libnetworkcache

software/backupserver/software.cfg

@@ -32,7 +32,7 @@ recipe = zc.recipe.egg
 interpreter = python-${:_buildout_section_name_}
 eggs =
   PyRSS2Gen
-  ${python-dateutil:egg}
+  python-dateutil
 
 ##########################################################
 # Service startup scripts and configuration files

software/erp5testnode/software.cfg

@@ -46,7 +46,6 @@ dnspython = 1.15.0
 PyXML = 0.8.5
 WebOb = 1.8.5
 WebTest = 2.0.33
-backports.functools-lru-cache = 1.5
 soupsieve = 1.8
 #gitdb2 = 2.0.4
 #smmap2 = 2.0.4

software/jupyter/software.cfg

@@ -54,13 +54,12 @@ Pygments = 2.7.2
 astor = 0.5
 async-generator = 1.10
 backports-abc = 0.5
-backports.functools-lru-cache = 1.6.1
 backports.shutil-get-terminal-size = 1.0.0
 bleach = 3.2.1
 cycler = 0.10.0
 defusedxml = 0.6.0
 entrypoints = 0.3
-ipykernel = 5.3.4
+ipykernel = 5.3.4:whl
 ipython = 5.3.0
 ipython-genutils = 0.1.0
 ipywidgets = 6.0.0

software/neoppod/software-common.cfg

@@ -45,7 +45,6 @@ environment = neoppod-setup-env
 [neoppod]
 recipe = zc.recipe.egg
 eggs = neoppod[admin, ctl, master]
-  ${python-dateutil:egg}
   ${cython-zstd:egg}
   ${msgpack-python:egg}
   ${:adapter-egg}

software/powerdns/software.cfg

@@ -56,6 +56,5 @@ cns.recipe.symlink = 0.2.3
 plone.recipe.command = 1.1
 passlib = 1.7.1
 GitPython = 2.1.11
-lockfile = 0.12.2
 feedparser = 5.2.1
 atomize = 0.2.0

software/slapos-sr-testing/software.cfg

@@ -2,7 +2,6 @@
 
 extends =
   ../../component/bcrypt/buildout.cfg
-  ../../component/python-cliff/buildout.cfg
   ../../component/curl/buildout.cfg
   ../../component/openssl/buildout.cfg
   ../../component/git/buildout.cfg
@@ -202,7 +201,6 @@ setup = ${slapos.core-repository:location}
 [python-interpreter]
 eggs += ${:extra-eggs}
 extra-eggs =
-  ${python-cliff:egg}
   ${lxml-python:egg}
   ${slapos.core-setup:egg}
   ${pillow-python:egg}
@@ -337,7 +335,7 @@ forcediphttpsadapter = 1.0.1
 httplib2 = 0.11.3
 image = 1.5.25
 paramiko = 2.4.2
-plantuml = 0.3.0
+plantuml = 0.3.0:whl
 pysftp = 0.2.9
 requests-toolbelt = 0.8.0
 selenium = 3.141.0
@@ -348,7 +346,7 @@ PyPDF2 = 1.26.0+SlapOSPatched001
 # Django 1.11 is python 2 compatible
 Django = 1.11
 
-mock = 2.0.0
+mock = 2.0.0:whl
 testfixtures = 6.11
 funcsigs = 1.0.2
 mysqlclient = 1.3.12

software/slapos-testing/software.cfg

@@ -234,7 +234,7 @@ dnspython = 1.15.0
 funcsigs = 1.0.2
 httmock = 1.2.6
 manuel = 1.9.0
-mock = 2.0.0
+mock = 2.0.0:whl
 testfixtures = 6.11.0
 pycurl = 7.43.0.2
 pyflakes = 2.0.0

software/slaprunner/software.cfg

@@ -177,4 +177,3 @@ prettytable = 0.7.2
 pycurl = 7.43.0
 collective.recipe.environment = 0.2.0
 smmap = 0.9.0
-lockfile = 0.12.2

software/wendelin/software-kerastensorflow.cfg

@@ -38,5 +38,5 @@ cuda_toolkit_path = /usr/local/cuda
 cudnn_install_path = /usr/local/cuda
 
 [versions]
-mock = 2.0.0
+mock = 2.0.0:whl
 funcsigs = 1.0.2

stack/cloudooo.cfg

@@ -71,7 +71,7 @@ command = true
 
 [versions]
 Paste = 3.4.0
-PasteScript = 3.2.0
+PasteScript = 3.2.0:whl
 WSGIUtils = 0.7.2
 WSGIserver = 1.3
 python-magic = 0.4.18

stack/slapos.cfg

@@ -25,8 +25,6 @@ extends =
   ../component/lxml-python/buildout.cfg
   ../component/python-backports-lzma/buildout.cfg
   ../component/python-cffi/buildout.cfg
-  ../component/python-cliff/buildout.cfg
-  ../component/python-cachecontrol/buildout.cfg
   ../component/python-cryptography/buildout.cfg
   ../component/python-PyYAML/buildout.cfg
   ../component/pycurl/buildout.cfg
@@ -103,11 +101,8 @@ eggs =
   ${lxml-python:egg}
   ${python-cffi:egg}
   ${python-PyYAML:egg}
-  ${python-cachecontrol:egg}
-  ${python-cliff:egg}
   ${python-cryptography:egg}
   ${pyrsistent:egg}
-  ${jsonschema:egg}
 
 # slapos.toolbox containing utilities
 [slapos-toolbox]
@@ -121,28 +116,15 @@ depends = ${slapos-toolbox-dependencies:eggs}
 # slapos.toolbox dependencies.
 recipe = zc.recipe.egg
 eggs =
-  ${python-cliff:egg}
   ${lxml-python:egg}
   ${pycurl:egg}
   ${python-cryptography:egg}
   ${backports.lzma:egg}
-  ${python-dateutil:egg}
-
-[jsonschema]
-recipe = zc.recipe.egg:custom
-egg = ${:_buildout_section_name_}
-setup-eggs = setuptools_scm
-
-[python-dateutil]
-recipe = zc.recipe.egg:custom
-egg = ${:_buildout_section_name_}
-setup-eggs = setuptools_scm
 
 # Install a slapos command with networkcache enabled in ${buildout:bin-directory}
 [slapos-command]
 recipe = zc.recipe.egg
 eggs =
-  ${python-cliff:egg}
   ${lxml-python:egg}
   slapos.core
   slapos.libnetworkcache
@@ -150,7 +132,7 @@ eggs =
 [versions]
 setuptools = 44.1.1
 # Use SlapOS patched zc.buildout
-zc.buildout = 2.7.1+slapos010
+zc.buildout = 2.7.1+slapos013
 # Use SlapOS patched zc.recipe.egg (zc.recipe.egg 2.x is for Buildout 2)
 zc.recipe.egg = 2.0.3+slapos003
 # Use own version of h.r.download to be able to open .xz and .lz archives
@@ -165,11 +147,11 @@ Werkzeug = 1.0.1
 ZConfig = 2.9.3
 asn1crypto = 1.3.0
 atomicwrites = 1.4.0
-backports.functools-lru-cache = 1.6.1
+backports.functools-lru-cache = 1.6.1:whl
 backports.lzma = 0.0.14
 cffi = 1.14.0
 click = 6.7
-cliff = 2.8.3
+cliff = 2.8.3:whl
 cmd2 = 0.7.0
 collective.recipe.shelloutput = 0.1
 collective.recipe.template = 2.0
@@ -217,7 +199,7 @@ slapos.recipe.build = 0.46
 slapos.recipe.cmmi = 0.17
 slapos.recipe.template = 4.5
 slapos.toolbox = 0.119
-stevedore = 1.21.0
+stevedore = 1.21.0:whl
 subprocess32 = 3.5.4
 unicodecsv = 0.14.1
 wcwidth = 0.2.5
@@ -229,7 +211,7 @@ zipp = 1.2.0
 zodburi = 2.4.0
 zope.event = 3.5.2
 paramiko = 2.1.3
-CacheControl = 0.12.6
+CacheControl = 0.12.6:whl
 msgpack = 0.6.2
 
 # Required by:
@@ -290,21 +272,17 @@ attrs = 18.2.0
 # jsonschema==3.0.2
 pyrsistent = 0.16.1
 
-pytest-runner = 5.2.0
-
-# Required by:
-# jsonschema==3.0.2
-setuptools-scm = 3.5.0
+pytest-runner = 5.2.0:whl
 
 ipaddress = 1.0.23
 
 # Required by:
 # slapos.cookbook==1.0.143
-jsonschema = 3.0.2
+jsonschema = 3.0.2:whl
 
 # Required by:
 # slapos.toolbox==0.94
-lockfile = 0.12.2
+lockfile = 0.12.2:whl
 
 # Required by:
 # slapos.core==1.5.0
@@ -331,7 +309,7 @@ pycurl = 7.43.0
 
 # Required by:
 # slapos.toolbox==0.94
-python-dateutil = 2.7.3
+python-dateutil = 2.7.3:whl
 
 # Required by:
 # slapos.toolbox==0.94