Canonical SSO provider

Merge lp:~facundo/canonical-identity-provider/pycrypto-in-prod into lp:canonical-identity-provider/release

  1. pycrypto-in-prod
  2. Merge into trunk
Proposed by Facundo Batista
Status: Merged
Approved by: Wes Mason
Approved revision: no longer in the source branch.
Merged at revision: 1409
Proposed branch: lp:~facundo/canonical-identity-provider/pycrypto-in-prod
Merge into: lp:canonical-identity-provider/release
Diff against target: 23 lines (+1/-1)
2 files modified
requirements.txt (+1/-0)
requirements_devel.txt (+0/-1)
To merge this branch: bzr merge lp:~facundo/canonical-identity-provider/pycrypto-in-prod
Reviewer Review Type Date Requested Status
Wes Mason (community) Approve
Matias Bordese (community) Approve
Review via email: mp+288961@code.launchpad.net

Commit message

Moved pycrypto dependency from devel to normal.

Description of the change

Moved pycrypto dependency from devel to normal.

To post a comment you must log in.
Revision history for this message
Matias Bordese (matiasb) wrote :

LGTM

review: Approve
Revision history for this message
Wes Mason (wesmason) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'requirements.txt'
--- requirements.txt 2016-03-04 22:19:58 +0000
+++ requirements.txt 2016-03-14 17:23:05 +0000
@@ -23,6 +23,7 @@
23oops-timeline==0.0.223oops-timeline==0.0.2
24oops-wsgi==0.0.1124oops-wsgi==0.0.11
25paste==2.0.125paste==2.0.1
26pycrypto==2.6.1
26pymacaroons==0.9.127pymacaroons==0.9.1
27raven==5.6.028raven==5.6.0
28requests-oauthlib==0.4.229requests-oauthlib==0.4.2
2930
=== modified file 'requirements_devel.txt'
--- requirements_devel.txt 2016-01-20 18:34:00 +0000
+++ requirements_devel.txt 2016-03-14 17:23:05 +0000
@@ -14,7 +14,6 @@
14mock==1.0.114mock==1.0.1
15paramiko==1.15.115paramiko==1.15.1
16pep8==1.5.716pep8==1.5.7
17pycrypto==2.6.1
18pyflakes==0.8.117pyflakes==0.8.1
19pylint==0.28.018pylint==0.28.0
20pyquery==1.2.119pyquery==1.2.1