Commit 4c494a4f by Clinton Blackburn Committed by GitHub

Merge pull request #251 from edx/clintonb/minor-improvements

Miscellaneous updates
parents c303d2cc 1792fc2b
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
"dependencies": { "dependencies": {
"edx-pattern-library": "0.16.3", "edx-pattern-library": "0.16.3",
"underscore": "~1.8.3", "underscore": "~1.8.3",
"moment": "~2.10.3", "moment": "~2.13.0",
"pikaday": "https://github.com/owenmead/Pikaday.git#1.4.0", "pikaday": "https://github.com/owenmead/Pikaday.git#1.4.0",
"clipboard": "1.5.12" "clipboard": "1.5.12"
} }
......
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations
LANGTAGS = (
("Chinese - Mandarin", "zh-cmn"),
("Chinese - Simplified", "zh-Hans"),
("Chinese - Traditional", "zh-Hant"),
)
def add_language_tags(apps, schema_editor):
LanguageTag = apps.get_model('ietf_language_tags', 'LanguageTag')
for name, code in LANGTAGS:
LanguageTag.objects.update_or_create(code=code, defaults={'name': name})
def drop_language_tags(apps, schema_editor):
LanguageTag = apps.get_model('ietf_language_tags', 'LanguageTag')
codes = [code for __, code in LANGTAGS]
LanguageTag.objects.filter(code__in=codes).delete()
class Migration(migrations.Migration):
dependencies = [
('ietf_language_tags', '0003_fix_language_tag_names'),
]
operations = [
migrations.RunPython(add_language_tags, drop_language_tags)
]
...@@ -3,11 +3,12 @@ cryptography==1.4 ...@@ -3,11 +3,12 @@ cryptography==1.4
django==1.8.14 django==1.8.14
django-choices==1.4.3 django-choices==1.4.3
django-compressor==2.0 django-compressor==2.0
django-extensions==1.6.7 django-contrib-comments==1.7.2
django-filter==0.13.0 django-extensions==1.7.2
django-fsm==2.2.0 django-filter==0.14.0
django-guardian==1.4.4 django-fsm==2.4.0
django-haystack==2.4.1 django-guardian==1.4.5
django-haystack==2.5.0
django-libsass==0.7 django-libsass==0.7
django-simple-history==1.8.1 django-simple-history==1.8.1
django-sortedm2m==1.3.2 django-sortedm2m==1.3.2
...@@ -26,12 +27,11 @@ edx-auth-backends==0.5.2 ...@@ -26,12 +27,11 @@ edx-auth-backends==0.5.2
edx-ccx-keys==0.2.0 edx-ccx-keys==0.2.0
edx-django-release-util==0.1.0 edx-django-release-util==0.1.0
edx-drf-extensions==1.1.1 edx-drf-extensions==1.1.1
edx-opaque-keys==0.3.1 edx-opaque-keys==0.3.2
edx-rest-api-client==1.6.0 edx-rest-api-client==1.6.0
elasticsearch>=1.0.0,<2.0.0 elasticsearch>=1.0.0,<2.0.0
html2text==2016.5.29 html2text==2016.5.29
pillow==3.3.0 pillow==3.3.0
pycountry==1.20 pycountry==1.20
python-dateutil==2.5.3 python-dateutil==2.5.3
pytz==2016.4 pytz==2016.6.1
django-contrib-comments==1.7.2
# Packages required in a production environment # Packages required in a production environment
-r base.txt -r base.txt
certifi==2016.2.28 certifi==2016.8.8
gevent==1.1.1 gevent==1.1.2
gunicorn==19.6.0 gunicorn==19.6.0
mysqlclient==1.3.7 mysqlclient==1.3.7
newrelic==2.66.0.49 newrelic==2.68.0.50
nodeenv==0.13.6 nodeenv==0.13.6
python-memcached==1.58 python-memcached==1.58
PyYAML==3.11 PyYAML==3.11
# Packages required for testing # Packages required for testing
-r base.txt -r base.txt
coverage==4.0.2 coverage==4.2
ddt==1.0.1 ddt==1.1.0
django-nose==1.4.2 django-nose==1.4.4
edx-lint==0.5.0 edx-lint==0.5.1
factory-boy==2.7.0 factory-boy==2.7.0
freezegun==0.3.7 freezegun==0.3.7
lxml==3.4.2 lxml==3.6.1
mock==1.3.0 mock==2.0.0
nose-ignore-docstring==0.2 nose-ignore-docstring==0.2
pep8==1.6.2 pep8==1.7.0
responses==0.5.0 responses==0.5.1
selenium==2.53.2 selenium==2.53.2
testfixtures==4.7.0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment