Skip to content

Commit

Permalink
Upgrade PyYaml
Browse files Browse the repository at this point in the history
* PyYaml needs upgrading due to security concern.
* PyYaml is used by webassets and it seems fine with the latest version, according to:
  https://github.com/miracle2k/webassets/blob/e3e82114324ffd6cf1a2877976a1de08c515eb10/requirements-dev.pip
* PyYaml was only just introduced to CKAN in webassets PR #4614
  However it was added to requirements.txt not .in, so I fixed that too.
* Regenerating requirements.in adds a few minor things along the way.
  • Loading branch information
David Read committed May 24, 2019
1 parent 687afaf commit 0481af4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 2 additions & 0 deletions requirements.in
Expand Up @@ -20,6 +20,7 @@ Pylons==0.9.7
python-dateutil>=1.5.0
pytz==2016.7
pyutilib.component.core==4.6.4
pyyaml # needed by webassets. latest should be fine.
repoze.who-friendlyform==1.0.8
repoze.who==2.3
requests==2.22.0
Expand All @@ -32,6 +33,7 @@ sqlparse==0.2.2
tzlocal==1.3
unicodecsv>=0.9
vdm==0.14
webassets==0.12.1
WebHelpers==1.3
WebOb==1.0.8
WebTest==1.4.3 # need to pin this so that Pylons does not install a newer version that conflicts with WebOb==1.0.8
Expand Down
7 changes: 4 additions & 3 deletions requirements.txt
Expand Up @@ -20,7 +20,7 @@ funcsigs==1.0.2 # via beaker
idna==2.8 # via requests
itsdangerous==1.1.0 # via flask
jinja2==2.10.1
mako==1.0.9 # via pylons
mako==1.0.9 # via alembic, pylons
markdown==2.6.7
markupsafe==1.1.1 # via jinja2, mako, webhelpers
nose==1.3.7 # via pylons
Expand All @@ -35,9 +35,11 @@ pygments==2.3.1 # via weberror
pylons==0.9.7
pysolr==3.6.0
python-dateutil==2.8.0
python-editor==1.0.4 # via alembic
python-magic==0.4.15
pytz==2016.7
pyutilib.component.core==4.6.4
pyyaml==5.1
redis==3.2.1 # via rq
repoze.lru==0.7 # via routes
repoze.who-friendlyform==1.0.8
Expand All @@ -55,12 +57,11 @@ tzlocal==1.3
unicodecsv==0.14.1
urllib3==1.25.2 # via requests
vdm==0.14
webassets==0.12.1
webencodings==0.5.1 # via bleach
weberror==0.13.1 # via pylons
webhelpers==1.3
webob==1.0.8
webtest==1.4.3
werkzeug==0.14.1
zope.interface==4.3.2
PyYAML==3.13
webassets==0.12.1

0 comments on commit 0481af4

Please sign in to comment.