Merge pull request #5411 from benjaoming/rsa-fix

Update rsa - fixes #5401
learningequality · Feb 14, 2017 · 1c5542e · 1c5542e
2 parents e030914 + 5ae1a6c
commit 1c5542e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -6,10 +6,8 @@
 
 If not all TODOs are marked, this PR is considered WIP (work in progress)
 
-- [ ] Have **tests** been written for the new code? If you're fixing a bug, write a regression test (or have a really good reason for not writing one... and I mean **really** good!)
 - [ ] Has documentation been written/updated?
 - [ ] Have you written release notes for the upcoming release?
-- [ ] New dependencies (if any) added to requirements file
 
 ## Reviewer guidance
 
@@ -19,6 +17,3 @@ If not all TODOs are marked, this PR is considered WIP (work in progress)
 
 List the issues solved or partly solved by the PR
 
-## Screenshots (if appropriate)
-
-*They're nice. :)*
diff --git a/docs/installguide/release_notes.rst b/docs/installguide/release_notes.rst
@@ -78,6 +78,7 @@ Bug fixes
  * ``kalite manage contentpackchecker all --update`` wrongly retrieved all available content packs. Now only updates *installed* content packs.
  * No content pack files are placed in ``STATIC_ROOT``, ensuring that ``kalite manage collectstatic`` will not remove any files from content packs (subtitles!). :url-issue:`5386` :url-issue:`5073`
  * Online availability incorrectly detected, bypassing registration progress on Video and Language downloads :url-issue:`5401`
+ * The ``rsa`` library has been upgraded to ``3.4.2`` following device registration blockers on Mac and Windows. :url-issue:`5401`
  * **Windows**: Logging works again: Writing to ``server.log`` was disabled on Windows :url-issue:`5057`
  * **Dev** Loading subtitles now works in ``bin/kalite manage runserver --settings=kalite.project.settings.dev``
  * **Dev** Auto-discovery of content-packs in well-known location ``/usr/share/kalite/preseed/contentpack-<version>.<lang>.zip``, example: ``/usr/share/kalite/preseed/contentpack-0.17.en.zip``. Happens during ``kalite.distributed.management.commands.setup``.

diff --git a/requirements.txt b/requirements.txt
@@ -23,7 +23,7 @@ cherrypy==3.3.0
 ifcfg==0.9.3
 importlib==1.0.3
 pbkdf2==1.3
-rsa==3.1.1
+rsa==3.4.2
 youtube-dl==2015.11.24
 
 django-tastypie-legacy