diff --git a/requirements/edx/base.in b/requirements/edx/base.in index f1ca679312..f177044a1c 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -62,6 +62,7 @@ django-user-tasks django-waffle==0.12.0 django-webpack-loader # Used to wire webpack bundles into the django asset pipeline djangorestframework-jwt +django-xforwardedfor-middleware==2.0 # Middleware to use the X-Forwarded-For header as the request IP dogapi==1.2.1 # Python bindings to Datadog's API, for metrics gathering edx-ace==0.1.9 edx-analytics-data-api-client diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 01cbd99ef8..9d95a16fcf 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -56,11 +56,11 @@ boto3==1.4.8 boto==2.39.0 botocore==1.8.17 celery==3.1.25 -certifi==2018.8.24 +certifi==2018.10.15 cffi==1.11.5 charade==1.0.3 # via pysrt chardet==3.0.4 -click==6.7 # via user-util +click==7.0 # via user-util coreapi==2.3.3 # via django-rest-swagger, openapi-codec coreschema==0.0.4 # via coreapi cryptography==2.3.1 @@ -72,7 +72,7 @@ django-appconf==1.0.2 # via django-statici18n django-babel-underscore==0.5.2 django-babel==0.6.2 # via django-babel-underscore django-classy-tags==0.8.0 # via django-sekizai -django-config-models==0.2.0 +django-config-models==0.2.2 django-cors-headers==2.1.0 django-countries==4.6.1 django-crum==0.7.3 @@ -85,7 +85,7 @@ django-model-utils==3.0.0 django-mptt==0.8.7 django-multi-email-field==0.5.1 # via edx-enterprise django-mysql==2.4.1 -django-oauth-toolkit==1.1.2 +django-oauth-toolkit==1.1.3 django-object-actions==0.10.0 # via edx-enterprise django-pyfs==2.0 django-ratelimit-backend==1.1.1 @@ -101,6 +101,7 @@ django-storages==1.4.1 django-user-tasks==0.1.5 django-waffle==0.12.0 django-webpack-loader==0.6.0 +django-xforwardedfor-middleware==2.0 django==1.11.16 djangorestframework-jwt==1.11.0 djangorestframework-xml==1.3.0 # via edx-enterprise @@ -162,14 +163,14 @@ loremipsum==1.0.5 lxml==3.8.0 mailsnake==1.6.2 mako==1.0.2 -markdown==2.6.11 +markdown==3.0.1 markey==0.8 # via django-babel-underscore markupsafe==1.0 mock==1.0.1 mongoengine==0.10.0 mysql-python==1.2.5 networkx==1.7 -newrelic==4.4.0.103 +newrelic==4.4.1.104 nltk==3.3.0 nodeenv==1.1.1 numpy==1.6.2 @@ -179,10 +180,10 @@ openapi-codec==1.3.2 # via django-rest-swagger path.py==8.2.1 pathtools==0.1.2 paver==1.3.4 -pbr==4.2.0 +pbr==5.0.0 pdfminer==20140328 piexif==1.0.2 -pillow==5.2.0 +pillow==5.3.0 polib==1.1.0 # via edx-i18n-tools psutil==1.2.1 py2neo==3.1.2 @@ -208,7 +209,7 @@ pytz==2016.10 pyuca==1.1 pyyaml==3.13 redis==2.10.6 -reportlab==3.5.6 +reportlab==3.5.9 requests-oauthlib==1.0.0 requests==2.19.1 rest-condition==1.0.3 @@ -238,7 +239,7 @@ user-util==0.1.5 voluptuous==0.11.5 watchdog==0.9.0 web-fragments==0.2.2 -webob==1.8.2 # via xblock +webob==1.8.3 # via xblock wrapt==1.10.5 xblock-review==1.1.5 xblock-utils==1.2.0 diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt index a5fd3c85de..20e6fe4db7 100644 --- a/requirements/edx/coverage.txt +++ b/requirements/edx/coverage.txt @@ -6,7 +6,7 @@ # coverage==4.4 diff-cover==0.9.8 -inflect==1.0.0 # via jinja2-pluralize +inflect==1.0.1 # via jinja2-pluralize jinja2-pluralize==0.3.0 # via diff-cover jinja2==2.10 # via diff-cover, jinja2-pluralize markupsafe==1.0 # via jinja2 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 629f1a35f0..c7ed114fbb 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -42,7 +42,7 @@ git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.1.6#egg=xblock-d -e git+https://github.com/edx-solutions/xblock-google-drive.git@138e6fa0bf3a2013e904a085b9fed77dab7f3f21#egg=xblock-google-drive git+https://github.com/open-craft/xblock-poll@add89e14558c30f3c8dc7431e5cd6536fff6d941#egg=xblock-poll==1.5.1 -e common/lib/xmodule -alabaster==0.7.11 # via sphinx +alabaster==0.7.12 # via sphinx amqp==1.4.9 analytics-python==1.1.0 aniso8601==3.0.2 @@ -66,12 +66,12 @@ boto3==1.4.8 boto==2.39.0 botocore==1.8.17 celery==3.1.25 -certifi==2018.8.24 +certifi==2018.10.15 cffi==1.11.5 charade==1.0.3 chardet==3.0.4 click-log==0.1.8 -click==6.7 +click==7.0 colorama==0.3.9 configparser==3.5.0 constantly==15.1.0 @@ -90,7 +90,7 @@ django-appconf==1.0.2 django-babel-underscore==0.5.2 django-babel==0.6.2 django-classy-tags==0.8.0 -django-config-models==0.2.0 +django-config-models==0.2.2 django-cors-headers==2.1.0 django-countries==4.6.1 django-crum==0.7.3 @@ -104,7 +104,7 @@ django-model-utils==3.0.0 django-mptt==0.8.7 django-multi-email-field==0.5.1 django-mysql==2.4.1 -django-oauth-toolkit==1.1.2 +django-oauth-toolkit==1.1.3 django-object-actions==0.10.0 django-pyfs==2.0 django-ratelimit-backend==1.1.1 @@ -120,6 +120,7 @@ django-storages==1.4.1 django-user-tasks==0.1.5 django-waffle==0.12.0 django-webpack-loader==0.6.0 +django-xforwardedfor-middleware==2.0 django==1.11.16 djangorestframework-jwt==1.11.0 djangorestframework-xml==1.3.0 @@ -157,15 +158,15 @@ event-tracking==0.2.4 execnet==1.5.0 extras==1.0.0 factory_boy==2.8.1 -faker==0.9.1 +faker==0.9.2 feedparser==5.1.3 +filelock==3.0.9 firebase-token-generator==1.3.2 -first==2.0.1 fixtures==3.0.0 flake8-polyfill==1.0.2 flake8==3.5.0 flask==1.0.2 -freezegun==0.3.10 +freezegun==0.3.11 fs-s3fs==0.1.8 fs==2.0.18 funcsigs==1.0.2 @@ -183,7 +184,7 @@ httpretty==0.9.5 idna==2.7 imagesize==1.1.0 # via sphinx incremental==17.5.0 -inflect==1.0.0 +inflect==1.0.1 ipaddr==2.1.11 ipaddress==1.0.22 isodate==0.6.0 @@ -206,7 +207,7 @@ lxml==3.8.0 mailsnake==1.6.2 mako==1.0.2 mando==0.6.4 -markdown==2.6.11 +markdown==3.0.1 markey==0.8 markupsafe==1.0 mccabe==0.6.1 @@ -217,7 +218,7 @@ more-itertools==4.3.0 moto==0.3.1 mysql-python==1.2.5 networkx==1.7 -newrelic==4.4.0.103 +newrelic==4.4.1.104 nltk==3.3.0 nodeenv==1.1.1 numpy==1.6.2 @@ -225,21 +226,21 @@ oauth2==1.9.0.post1 oauthlib==2.1.0 openapi-codec==1.3.2 pa11ycrawler==1.6.2 -packaging==17.1 # via sphinx +packaging==18.0 # via sphinx parsel==1.5.0 path.py==8.2.1 pathtools==0.1.2 paver==1.3.4 -pbr==4.2.0 +pbr==5.0.0 pdfminer==20140328 piexif==1.0.2 -pillow==5.2.0 -pip-tools==2.0.2 +pillow==5.3.0 +pip-tools==3.1.0 pluggy==0.6.0 polib==1.1.0 psutil==1.2.1 py2neo==3.1.2 -py==1.6.0 +py==1.7.0 pyasn1-modules==0.2.2 pyasn1==0.4.4 pycodestyle==2.3.1 @@ -270,7 +271,7 @@ pytest-cov==2.5.1 pytest-django==3.1.2 pytest-forked==0.2 pytest-randomly==1.2.3 -pytest-xdist==1.23.0 +pytest-xdist==1.23.2 pytest==3.6.3 python-dateutil==2.4.0 python-levenshtein==0.12.0 @@ -285,9 +286,9 @@ pytz==2016.10 pyuca==1.1 pyyaml==3.13 queuelib==1.5.0 -radon==2.2.0 +radon==2.4.0 redis==2.10.6 -reportlab==3.5.6 +reportlab==3.5.9 requests-oauthlib==1.0.0 requests==2.19.1 rest-condition==1.0.3 @@ -312,7 +313,7 @@ social-auth-app-django==2.1.0 social-auth-core==1.7.0 sorl-thumbnail==12.3 sortedcontainers==0.9.2 -sphinx==1.8.0 +sphinx==1.8.1 sphinxcontrib-websupport==1.1.0 # via sphinx splinter==0.9.0 sqlparse==0.2.4 @@ -323,9 +324,9 @@ testfixtures==6.3.0 testtools==2.3.0 text-unidecode==1.2 tincan==0.0.5 -toml==0.9.6 +toml==0.10.0 tox-battery==0.5.1 -tox==3.4.0 +tox==3.5.2 traceback2==1.4.0 transifex-client==0.13.4 twisted==16.6.0 @@ -343,7 +344,7 @@ vulture==0.29 w3lib==1.19.0 watchdog==0.9.0 web-fragments==0.2.2 -webob==1.8.2 +webob==1.8.3 werkzeug==0.14.1 wrapt==1.10.5 xblock-review==1.1.5 diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index df2e7f8b04..53774b5058 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -6,7 +6,7 @@ # argh==0.26.2 # via watchdog argparse==1.4.0 # via stevedore -certifi==2018.8.24 # via requests +certifi==2018.10.15 # via requests chardet==3.0.4 # via requests edx-opaque-keys==0.4.4 idna==2.7 # via requests @@ -17,7 +17,7 @@ mock==1.0.1 path.py==8.2.1 pathtools==0.1.2 # via watchdog paver==1.3.4 -pbr==4.2.0 # via stevedore +pbr==5.0.0 # via stevedore psutil==1.2.1 pymongo==2.9.1 python-memcached==1.48 diff --git a/requirements/edx/pip-tools.txt b/requirements/edx/pip-tools.txt index e7027f3fb2..741de0eea1 100644 --- a/requirements/edx/pip-tools.txt +++ b/requirements/edx/pip-tools.txt @@ -4,7 +4,6 @@ # # make upgrade # -click==6.7 # via pip-tools -first==2.0.1 # via pip-tools -pip-tools==2.0.2 +click==7.0 # via pip-tools +pip-tools==3.1.0 six==1.11.0 # via pip-tools diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index bf01669aa7..fb8a3fe3eb 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -63,12 +63,12 @@ boto3==1.4.8 boto==2.39.0 botocore==1.8.17 celery==3.1.25 -certifi==2018.8.24 +certifi==2018.10.15 cffi==1.11.5 charade==1.0.3 chardet==3.0.4 click-log==0.1.8 # via edx-lint -click==6.7 +click==7.0 colorama==0.3.9 # via radon configparser==3.5.0 # via flake8, pylint constantly==15.1.0 # via twisted @@ -87,7 +87,7 @@ django-appconf==1.0.2 django-babel-underscore==0.5.2 django-babel==0.6.2 django-classy-tags==0.8.0 -django-config-models==0.2.0 +django-config-models==0.2.2 django-cors-headers==2.1.0 django-countries==4.6.1 django-crum==0.7.3 @@ -100,7 +100,7 @@ django-model-utils==3.0.0 django-mptt==0.8.7 django-multi-email-field==0.5.1 django-mysql==2.4.1 -django-oauth-toolkit==1.1.2 +django-oauth-toolkit==1.1.3 django-object-actions==0.10.0 django-pyfs==2.0 django-ratelimit-backend==1.1.1 @@ -116,6 +116,7 @@ django-storages==1.4.1 django-user-tasks==0.1.5 django-waffle==0.12.0 django-webpack-loader==0.6.0 +django-xforwardedfor-middleware==2.0 djangorestframework-jwt==1.11.0 djangorestframework-xml==1.3.0 dm.xmlsec.binding==1.3.3 @@ -151,14 +152,15 @@ event-tracking==0.2.4 execnet==1.5.0 # via pytest-xdist extras==1.0.0 # via python-subunit, testtools factory_boy==2.8.1 -faker==0.9.1 # via factory-boy +faker==0.9.2 # via factory-boy feedparser==5.1.3 +filelock==3.0.9 # via tox firebase-token-generator==1.3.2 fixtures==3.0.0 # via testtools flake8-polyfill==1.0.2 # via radon flake8==3.5.0 # via flake8-polyfill flask==1.0.2 # via moto -freezegun==0.3.10 +freezegun==0.3.11 fs-s3fs==0.1.8 fs==2.0.18 funcsigs==1.0.2 # via pytest @@ -175,7 +177,7 @@ httplib2==0.11.3 httpretty==0.9.5 idna==2.7 incremental==17.5.0 # via twisted -inflect==1.0.0 +inflect==1.0.1 ipaddr==2.1.11 ipaddress==1.0.22 isodate==0.6.0 @@ -198,7 +200,7 @@ lxml==3.8.0 mailsnake==1.6.2 mako==1.0.2 mando==0.6.4 # via radon -markdown==2.6.11 +markdown==3.0.1 markey==0.8 markupsafe==1.0 mccabe==0.6.1 # via flake8, pylint @@ -208,7 +210,7 @@ more-itertools==4.3.0 # via pytest moto==0.3.1 mysql-python==1.2.5 networkx==1.7 -newrelic==4.4.0.103 +newrelic==4.4.1.104 nltk==3.3.0 nodeenv==1.1.1 numpy==1.6.2 @@ -220,15 +222,15 @@ parsel==1.5.0 # via scrapy path.py==8.2.1 pathtools==0.1.2 paver==1.3.4 -pbr==4.2.0 +pbr==5.0.0 pdfminer==20140328 piexif==1.0.2 -pillow==5.2.0 +pillow==5.3.0 pluggy==0.6.0 # via pytest, tox polib==1.1.0 psutil==1.2.1 py2neo==3.1.2 -py==1.6.0 # via pytest, tox +py==1.7.0 # via pytest, tox pyasn1-modules==0.2.2 # via service-identity pyasn1==0.4.4 # via pyasn1-modules, service-identity pycodestyle==2.3.1 @@ -258,7 +260,7 @@ pytest-cov==2.5.1 pytest-django==3.1.2 pytest-forked==0.2 # via pytest-xdist pytest-randomly==1.2.3 -pytest-xdist==1.23.0 +pytest-xdist==1.23.2 pytest==3.6.3 python-dateutil==2.4.0 python-levenshtein==0.12.0 @@ -273,9 +275,9 @@ pytz==2016.10 pyuca==1.1 pyyaml==3.13 queuelib==1.5.0 # via scrapy -radon==2.2.0 +radon==2.4.0 redis==2.10.6 -reportlab==3.5.6 +reportlab==3.5.9 requests-oauthlib==1.0.0 requests==2.19.1 rest-condition==1.0.3 @@ -307,9 +309,9 @@ testfixtures==6.3.0 testtools==2.3.0 # via fixtures, python-subunit text-unidecode==1.2 # via faker tincan==0.0.5 -toml==0.9.6 # via tox +toml==0.10.0 # via tox tox-battery==0.5.1 -tox==3.4.0 +tox==3.5.2 traceback2==1.4.0 # via testtools, unittest2 transifex-client==0.13.4 twisted==16.6.0 # via pa11ycrawler, scrapy @@ -325,7 +327,7 @@ voluptuous==0.11.5 w3lib==1.19.0 # via parsel, scrapy watchdog==0.9.0 web-fragments==0.2.2 -webob==1.8.2 +webob==1.8.3 werkzeug==0.14.1 # via flask wrapt==1.10.5 xblock-review==1.1.5