Merge remote-tracking branch 'upstream/master' into zope4py2

component/jupyter-py2/buildout.cfg

@@ -65,7 +65,6 @@ Pygments = 2.2.0
 astor = 0.5
 backports-abc = 0.5
 backports.shutil-get-terminal-size = 1.0.0
-cycler = 0.10.0
 ipykernel = 4.5.2
 ipython = 5.3.0
 ipython-genutils = 0.1.0
@@ -78,7 +77,6 @@ matplotlib = 2.1.2
 mistune = 0.7.3
 nbformat = 4.3.0
 notebook = 4.4.1
-pandas = 0.19.2
 prompt-toolkit = 1.0.13
 ptyprocess = 0.5.1
 pyzmq = 16.0.2
@@ -89,8 +87,6 @@ statsmodels = 0.8.0
 terminado = 0.6
 tornado = 4.4.2
 widgetsnbextension = 2.0.0
-# numpy >= 1.13.1 is required for numpy.core.multiarray
-numpy = 1.13.1
 
 # nbconvert 4.2.0 depends on entrypoints egg that is not available as tar/zip source.
 nbconvert = 4.1.0
@@ -99,7 +95,6 @@ patsy = 0.4.1
 pexpect = 4.2.1
 pickleshare = 0.7.4
 scandir = 1.5
-scipy = 0.19.0
 singledispatch = 3.4.0.3
 wcwidth = 0.1.7
 jupyter = 1.0.0

component/numpy/buildout.cfg

@@ -27,4 +27,4 @@ numpy = 1.22.0
 depends =
 
 [versions:sys.version_info < (3,8)]
-numpy = 1.16.4
+numpy = 1.16.5

component/pandas/buildout.cfg

@@ -15,13 +15,14 @@ egg = pandas
 environment = pandas-env
 setup-eggs =
   ${numpy:egg}
-
-[pandas:sys.version_info >= (3,8)]
-setup-eggs +=
   ${cython:egg}
 
 [versions]
-pandas = 0.25.3
-
-[versions:sys.version_info >= (3,8)]
 pandas = 1.4.0
+
+[pandas:sys.version_info < (3,8)]
+setup-eggs =
+  ${numpy:egg}
+
+[versions:sys.version_info < (3,8)]
+pandas = 0.24.2

software/beremiz-ide/software.cfg

@@ -176,7 +176,6 @@ output = ${buildout:directory}/nginx_conf.in
 Pillow = 6.2.2
 matplotlib = 2.2.5
 kiwisolver = 1.1.0
-cycler = 0.10.0
 Pyro = 3.16
 zeroconf2 = 0.19.2
 cython = 0.29.24

software/beremiz-runtime/software.cfg

@@ -122,8 +122,6 @@ autobahn = 19.11.2
 txaio = 18.8.1
 idna = 2.10
 
-numpy = 1.16.5
-cycler = 0.10.0
 click = 7.1.2
 lxml  = 4.5.0
 opcua = 0.98.13

software/dream/software.cfg

@@ -49,7 +49,6 @@ rpy2 = 2.4.0
 pydot = 1.0.28
 xlrd = 0.9.3
 xlwt = 0.7.5
-scipy = 0.13.3
 simpy = 3.0.5
 zope.dottedname = 4.1.0
 tablib = 0.10.0

software/jupyter/software.cfg

@@ -51,7 +51,6 @@ async-generator = 1.10
 backports-abc = 0.5
 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:whl
@@ -69,8 +68,6 @@ nest-asyncio = 1.4.3
 nbclient = 0.5.1
 nbformat = 5.0.8
 notebook = 6.1.5
-numpy = 1.14.6
-pandas = 0.25.3
 pandocfilters = 1.4.3
 prompt-toolkit = 1.0.13
 ptyprocess = 0.5.1
@@ -95,7 +92,6 @@ pickleshare = 0.7.4
 prometheus-client = 0.9.0
 scandir = 1.5
 pytz = 2020.4
-scipy = 1.0.1
 singledispatch = 3.4.0.3
 wcwidth = 0.1.7
 jupyter = 1.0.0