Skip to content

Commit

Permalink
Merge pull request #5373 from benjaoming/tastypie-link
Browse files Browse the repository at this point in the history
Remove dependency link and depend on django-tastypie-legacy
  • Loading branch information
benjaoming committed Dec 23, 2016
2 parents 5213c8f + a3dbc56 commit 0b34961
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
1 change: 1 addition & 0 deletions docs/installguide/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ Bug fixes
* Implement friendlier user-facing error messages during unexpected JS failures :url-issue:`5123`
* Source distribution and `ka-lite` + `ka-lite-raspberry-pi` debian packages no longer ship with English content.db, means they have reduced ~40% in file size :url-issue:`5318`
* Installation works with latest ``setuptools >= 30.0`` affecting almost any recent system using ``pip install``. :url-issue:`5352`
* Installation works with latest ``pip 9``. :url-issue:`5319`
* **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** Test runner is now compatible with Selenium 3 and Firefox 50
Expand Down
5 changes: 1 addition & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,5 @@ pbkdf2==1.3
rsa==3.1.1
youtube-dl==2015.11.24

# There is still no release of this
# fixed issue, i.e. django-tastypie==0.12.2 is broken.
# This one works though...
https://github.com/django-tastypie/django-tastypie/archive/e6bc34bea83d53552c7fc9dfa696ed7693fe22ab.tar.gz#egg=django-tastypie-0.12.2dev0
django-tastypie-legacy
requests==2.11.1

0 comments on commit 0b34961

Please sign in to comment.