Commit 59ebf0d0 authored by Vincent Pelletier's avatar Vincent Pelletier

stack/{slapos.cfg,caucase}: Version up.

To fix caucased failures:
  File "caucase/caucase/http.py", line 799, in main
    http_cas=http_cas,
  File "caucase/caucase/http.py", line 397, in getSSLContext
    http_cas.createCertificate(csr_id)
  File "caucase/caucase/ca.py", line 281, in createCertificate
    template_csr=template_csr,
  File "caucase/caucase/ca.py", line 328, in _createCertificate
    x509.SubjectKeyIdentifier,
  File "cryptography-2.3.1-py2.7-linux-x86_64.egg/cryptography/x509/extensions.py", line 189, in from_issuer_subject_key_identifier
    key_identifier=ski.value.digest,
AttributeError: 'SubjectKeyIdentifier' object has no attribute 'value'

In turn, this requires updating cryptography dependencies.
In turn, this requires updating requests as our old version is
incompatible with current idna version.
In turn, this requires updating requests dependencies.
And finally, this allows/requires updating some pins in SRs:
- software/jupyter: Version up certifi.
- stack/erp5: Un-pin chardet, as it is already pinned at stack/slapos level.
parent 0540c9c6
Pipeline #10116 failed with stage
in 0 seconds
...@@ -101,7 +101,7 @@ numpy = 1.13.1 ...@@ -101,7 +101,7 @@ numpy = 1.13.1
# Required by: # Required by:
# tornado==4.4.2 # tornado==4.4.2
certifi = 2017.1.23 certifi = 2020.6.20
# Required by: # Required by:
# notebook==4.3.2 # notebook==4.3.2
......
...@@ -36,5 +36,5 @@ depends = ${caucase-jinja2-library-eggs:eggs} ...@@ -36,5 +36,5 @@ depends = ${caucase-jinja2-library-eggs:eggs}
[versions] [versions]
caucase = 0.9.7 caucase = 0.9.7
pem = 17.1.0 pem = 20.1.0
PyJWT = 1.7.1 PyJWT = 1.7.1
...@@ -630,7 +630,6 @@ WSGIUtils = 0.7 ...@@ -630,7 +630,6 @@ WSGIUtils = 0.7
ZODB3 = 3.11.0 ZODB3 = 3.11.0
# astroid 1.4.1 breaks testDynamicClassGeneration # astroid 1.4.1 breaks testDynamicClassGeneration
astroid = 1.3.8 astroid = 1.3.8
chardet = 2.3.0
csp-eventlet = 0.7.0 csp-eventlet = 0.7.0
erp5diff = 0.8.1.7 erp5diff = 0.8.1.7
eventlet = 0.20.1 eventlet = 0.20.1
......
...@@ -134,16 +134,16 @@ Jinja2 = 2.9.5 ...@@ -134,16 +134,16 @@ Jinja2 = 2.9.5
MarkupSafe = 1.0 MarkupSafe = 1.0
PyYAML = 3.13 PyYAML = 3.13
Werkzeug = 0.12 Werkzeug = 0.12
asn1crypto = 0.21.1 asn1crypto = 1.3.0
cffi = 1.9.1 cffi = 1.14.0
click = 6.7 click = 6.7
cliff = 2.4.0 cliff = 2.4.0
cmd2 = 0.7.0 cmd2 = 0.7.0
collective.recipe.shelloutput = 0.1 collective.recipe.shelloutput = 0.1
collective.recipe.template = 2.0 collective.recipe.template = 2.0
cryptography = 2.3.1 cryptography = 2.9.2
decorator = 4.3.0 decorator = 4.3.0
idna = 2.2 idna = 2.9
inotify-simple = 1.1.1 inotify-simple = 1.1.1
itsdangerous = 0.24 itsdangerous = 0.24
lock-file = 2.0 lock-file = 2.0
...@@ -154,10 +154,10 @@ pbr = 2.0.0 ...@@ -154,10 +154,10 @@ pbr = 2.0.0
plone.recipe.command = 1.1 plone.recipe.command = 1.1
prettytable = 0.7.2 prettytable = 0.7.2
psutil = 5.6.3 psutil = 5.6.3
pyOpenSSL = 18.0.0 pyOpenSSL = 19.1.0
pyparsing = 2.2.0 pyparsing = 2.2.0
pytz = 2016.10 pytz = 2016.10
requests = 2.13.0 requests = 2.24.0
six = 1.12.0 six = 1.12.0
slapos.cookbook = 1.0.152 slapos.cookbook = 1.0.152
slapos.core = 1.5.12 slapos.core = 1.5.12
...@@ -214,7 +214,7 @@ dnspython = 1.15.0 ...@@ -214,7 +214,7 @@ dnspython = 1.15.0
# Required by: # Required by:
# cryptography==1.8.1 # cryptography==1.8.1
enum34 = 1.1.6 enum34 = 1.1.10
# Required by: # Required by:
# slapos.toolbox==0.94 # slapos.toolbox==0.94
...@@ -242,7 +242,7 @@ setuptools-scm = 3.5.0 ...@@ -242,7 +242,7 @@ setuptools-scm = 3.5.0
# Required by: # Required by:
# cryptography==1.8.1 # cryptography==1.8.1
ipaddress = 1.0.18 ipaddress = 1.0.23
# Required by: # Required by:
# slapos.cookbook==1.0.143 # slapos.cookbook==1.0.143
...@@ -271,7 +271,7 @@ pyasn1 = 0.4.5 ...@@ -271,7 +271,7 @@ pyasn1 = 0.4.5
# Required by: # Required by:
# cffi==1.9.1 # cffi==1.9.1
pycparser = 2.17 pycparser = 2.20
# Required by: # Required by:
# slapos.toolbox==0.94 # slapos.toolbox==0.94
...@@ -301,6 +301,18 @@ uritemplate = 3.0.0 ...@@ -301,6 +301,18 @@ uritemplate = 3.0.0
# slapos.core==1.5.0 # slapos.core==1.5.0
zope.interface = 4.3.3 zope.interface = 4.3.3
# Required by:
# requests==2.24.0
certifi = 2020.6.20
# Required by:
# requests==2.24.0
chardet = 3.0.4
# Required by:
# requests==2.24.0
urllib3 = 1.25.9
[networkcache] [networkcache]
download-cache-url = http://shacache.nxdcdn.com download-cache-url = http://shacache.nxdcdn.com
download-dir-url = http://shadir.nxdcdn.com download-dir-url = http://shadir.nxdcdn.com
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment