Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into fill-missing-rotation-policy

This commit is contained in:
Curtis 2018-08-07 08:23:29 -07:00 committed by GitHub
parent 82158aece6 e0c6d6dd7d
commit cf71f88680
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lemur/authorities/views.py
View File

@ -90,7 +90,7 @@ class AuthoritiesList(AuthenticatedResource):
"owner": "secure@example.com", "owner": "secure@example.com",
"id": 43, "id": 43,
"description": "This is the ROOT certificate for the TestAuthority certificate authority." "description": "This is the ROOT certificate for the TestAuthority certificate authority."
} }],
"total": 1 "total": 1
} }
@ -136,7 +136,7 @@ class AuthoritiesList(AuthenticatedResource):
"sensitivity": "medium", "sensitivity": "medium",
"keyType": "RSA2048", "keyType": "RSA2048",
"plugin": { "plugin": {
"slug": "cloudca-issuer", "slug": "cloudca-issuer"
}, },
"name": "TimeTestAuthority5", "name": "TimeTestAuthority5",
"owner": "secure@example.com", "owner": "secure@example.com",
@ -148,6 +148,7 @@ class AuthoritiesList(AuthenticatedResource):
"names": [] "names": []
}, },
"custom": [] "custom": []
}
} }
**Example response**: **Example response**:
@ -499,6 +500,7 @@ class AuthorityVisualizations(AuthenticatedResource):
{"name": "MergeEdge", "size": 743} {"name": "MergeEdge", "size": 743}
] ]
} }
]
} }
]} ]}
""" """

4
requirements-dev.txt
View File

@ -12,11 +12,11 @@ chardet==3.0.4 # via requests
flake8==3.5.0 flake8==3.5.0
identify==1.1.4 # via pre-commit identify==1.1.4 # via pre-commit
idna==2.7 # via requests idna==2.7 # via requests
invoke==1.1.0 invoke==1.1.1
mccabe==0.6.1 # via flake8 mccabe==0.6.1 # via flake8
nodeenv==1.3.2 nodeenv==1.3.2
pkginfo==1.4.2 # via twine pkginfo==1.4.2 # via twine
pre-commit==1.10.4 pre-commit==1.10.5
pycodestyle==2.3.1 # via flake8 pycodestyle==2.3.1 # via flake8
pyflakes==1.6.0 # via flake8 pyflakes==1.6.0 # via flake8
pyyaml==3.13 # via aspy.yaml, pre-commit pyyaml==3.13 # via aspy.yaml, pre-commit

4
requirements-docs.txt
View File

@ -15,8 +15,8 @@ asyncpool==1.0
babel==2.6.0 # via sphinx babel==2.6.0 # via sphinx
bcrypt==3.1.4 bcrypt==3.1.4
blinker==1.4 blinker==1.4
boto3==1.7.65 boto3==1.7.66
botocore==1.10.65 botocore==1.10.66
certifi==2018.4.16 certifi==2018.4.16
cffi==1.11.5 cffi==1.11.5
chardet==3.0.4 chardet==3.0.4

8
requirements-tests.txt
View File

@ -8,9 +8,9 @@ asn1crypto==0.24.0 # via cryptography
atomicwrites==1.1.5 # via pytest atomicwrites==1.1.5 # via pytest
attrs==18.1.0 # via pytest attrs==18.1.0 # via pytest
aws-xray-sdk==0.95 # via moto aws-xray-sdk==0.95 # via moto
boto3==1.7.66 # via moto boto3==1.7.71 # via moto
boto==2.49.0 # via moto boto==2.49.0 # via moto
botocore==1.10.66 # via boto3, moto, s3transfer botocore==1.10.71 # via boto3, moto, s3transfer
certifi==2018.4.16 # via requests certifi==2018.4.16 # via requests
cffi==1.11.5 # via cryptography cffi==1.11.5 # via cryptography
chardet==3.0.4 # via requests chardet==3.0.4 # via requests
@ -33,7 +33,7 @@ jsondiff==1.1.1 # via moto
jsonpickle==0.9.6 # via aws-xray-sdk jsonpickle==0.9.6 # via aws-xray-sdk
markupsafe==1.0 # via jinja2 markupsafe==1.0 # via jinja2
mock==2.0.0 # via moto mock==2.0.0 # via moto
more-itertools==4.2.0 # via pytest more-itertools==4.3.0 # via pytest
moto==1.3.3 moto==1.3.3
nose==1.3.7 nose==1.3.7
pbr==4.2.0 # via mock pbr==4.2.0 # via mock
@ -44,7 +44,7 @@ pycparser==2.18 # via cffi
pyflakes==2.0.0 pyflakes==2.0.0
pytest-flask==0.10.0 pytest-flask==0.10.0
pytest-mock==1.10.0 pytest-mock==1.10.0
pytest==3.6.4 pytest==3.7.1
python-dateutil==2.6.1 # via botocore, faker, freezegun, moto python-dateutil==2.6.1 # via botocore, faker, freezegun, moto
pytz==2018.5 # via moto pytz==2018.5 # via moto
pyyaml==3.13 # via pyaml pyyaml==3.13 # via pyaml

6
requirements.txt
View File

@ -13,8 +13,8 @@ asn1crypto==0.24.0 # via cryptography
asyncpool==1.0 asyncpool==1.0
bcrypt==3.1.4 # via flask-bcrypt, paramiko bcrypt==3.1.4 # via flask-bcrypt, paramiko
blinker==1.4 # via flask-mail, flask-principal, raven blinker==1.4 # via flask-mail, flask-principal, raven
boto3==1.7.66 boto3==1.7.71
botocore==1.10.66 # via boto3, s3transfer botocore==1.10.71 # via boto3, s3transfer
certifi==2018.4.16 certifi==2018.4.16
cffi==1.11.5 # via bcrypt, cryptography, pynacl cffi==1.11.5 # via bcrypt, cryptography, pynacl
chardet==3.0.4 # via requests chardet==3.0.4 # via requests
@ -47,7 +47,7 @@ lockfile==0.12.2
mako==1.0.7 # via alembic mako==1.0.7 # via alembic
markupsafe==1.0 # via jinja2, mako markupsafe==1.0 # via jinja2, mako
marshmallow-sqlalchemy==0.14.0 marshmallow-sqlalchemy==0.14.0
marshmallow==2.15.3 marshmallow==2.15.4
mock==2.0.0 # via acme mock==2.0.0 # via acme
ndg-httpsclient==0.5.1 ndg-httpsclient==0.5.1
paramiko==2.4.1 paramiko==2.4.1