Commit 510fbd2c by Tyler Hallada

Upgrade minor/patch versions of packages

Also deleted unneeded docs/en_us/requirements.txt. The newer
requirements/docs.txt covers requirements needed to build docs.
parent 5b6e12d9
......@@ -10,40 +10,41 @@
"tests"
],
"dependencies": {
"globalize": "1.1.1",
"globalize": "1.2.2",
"requirejs-plugins": "~1.0.3",
"bootstrap-sass-official": "v3.2.0+2",
"bootstrap-sass-official": "v3.3.7",
"jquery": "~1.11.1",
"bootstrapaccessibilityplugin": "~1.0.3",
"underscore": "~1.8.2",
"backbone": "~1.1.2",
"backbone": "~1.3.3",
"d3": "~3.5.3",
"requirejs": "~2.1.15",
"requirejs": "~2.3.2",
"nvd3": "~1.8.4",
"jasmine": "~2.0.4",
"moment": "~2.8.3",
"topojson": "~1.4.3",
"datamaps": "~0.3.4",
"jasmine": "~2.5.2",
"moment": "~2.17.1",
"topojson": "~1.6.19",
"datamaps": "~0.5.8",
"datatables": "~1.10.2",
"font-awesome": "~4.6.3",
"natural-sort": "overset/javascript-natural-sort#dbf4ca259b327a488bd1d7897fd46d80c414a7e0",
"cldr-data": "29.0.0",
"edx-ui-toolkit": "edx/edx-ui-toolkit#29759050aff2f4f3cb6921432855ad057bd69bb1",
"marionette": "~2.4.4",
"uri.js": "1.17",
"uri.js": "1.18.4",
"backgrid": "^0.3.5",
"backgrid-paginator": "^0.3.5",
"backgrid-filter": "^0.3.5",
"text": "^2.0.14",
"axe-core": "^1.1.1",
"nprogress": "^0.2.0",
"edx-pattern-library": "0.16.6"
"edx-pattern-library": "0.18.0"
},
"resolutions": {
"backbone": "~1.2.3",
"backbone": "~1.3.3",
"jquery": "~1.11.1",
"underscore": "~1.8.2",
"d3": "~3.5.3",
"cldrjs": "~0.4.4"
"cldrjs": "~0.4.4",
"topojson": "~1.6.19"
}
}
path.py
Django >=1.4,<1.5
pytz
-e git+https://github.com/edx/XBlock.git#egg=XBlock
lxml
sphinxcontrib-napoleon==0.2.6
stevedore==0.14.1
......@@ -16,7 +16,7 @@
"eslint-config-edx": "^1.2.0",
"gulp": "^3.8.8",
"gulp-eslint": "^2.0.0",
"gulp-karma": "0.0.4",
"gulp-karma": "0.0.5",
"jasmine-core": "^2.4.1",
"jscs": "^1.10.0",
"karma": "^0.12.16",
......@@ -29,7 +29,7 @@
"karma-requirejs": "^0.2.2",
"karma-sinon": "^1.0.3",
"phantomjs-prebuilt": "^2.1.7",
"sinon": "1.17.3"
"sinon": "1.17.7"
},
"eslintConfig": {
"extends": "eslint-config-edx"
......
awesome-slugify==1.6.5 # GPLv3
bpython==0.15 # MIT License
bpython==0.16 # MIT License
Django==1.9.10 # BSD License
django-appconf==1.0.2
django-braces==1.9.0 # BSD
......@@ -13,17 +13,17 @@ django-crispy-forms==1.6.0 # MIT
django-soapbox==1.3 # BSD
django-waffle==0.11.1 # BSD
pinax-announcements==2.0.4 # MIT
edx-auth-backends==0.5.0
edx-auth-backends==0.5.3
edx-django-release-util==0.2.0
edx-i18n-tools==0.3.5
edx-rest-api-client>=1.5.0, <1.6.0 # Apache
libsass==0.11.1 # MIT
libsass==0.12.1 # MIT
logutils==0.3.3 # BSD
python-social-auth==0.2.19
requests==2.10.0 # Apache 2.0
requests==2.12.4 # Apache 2.0
git+https://github.com/edx/django-lang-pref-middleware.git@0.1.0#egg=django-lang-pref-middleware
git+https://github.com/edx/edx-analytics-data-api-client.git@0.9.0#egg=edx-analytics-data-api-client==0.9.0 # edX
......
# Dependencies for building documentation
-r base.txt
Sphinx==1.4.5
Sphinx==1.5.1
sphinx_rtd_theme==0.1.9
# Local development dependencies go here
-r base.txt
django-debug-toolbar==1.5
transifex-client==0.12.1
django-debug-toolbar==1.6
transifex-client==0.12.2
newrelic==2.68.0.50 # New Relic
newrelic==2.76.0.55 # New Relic
......@@ -3,7 +3,7 @@
-r base.txt
MySQL-python==1.2.5 # GPL License
PyYAML==3.11 # MIT License
PyYAML==3.12 # MIT License
gunicorn==0.17.4 # MIT
python-memcached==1.53
python-memcached==1.58
nodeenv==0.13.3 # BSD
# Test dependencies go here.
-r base.txt
bok-choy>=0.4.7
coverage==4.2
ddt==1.1.0
django-dynamic-fixture==1.9.0
coverage==4.3.1
ddt==1.1.1
django-dynamic-fixture==1.9.1
django-nose==1.4.4
elasticsearch==2.3.0
unittest2==1.1.0
httpretty==0.8.14
mock==1.0.1
nose-exclude==0.4.1
nose-exclude==0.5.0
nose-ignore-docstring==0.2
nose==1.3.7
pep257==0.7.0
pep8==1.7.0
pylint==1.6.4
logilab-common==1.2.2
logilab-common==1.3.0
selenium>=2.44.0,<3.0.0
sure==1.4.0
testfixtures==4.10.0
testfixtures==4.13.3
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