From 5d7bdf91b14657c81b0d3367c02e17a4186ad306 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Wed, 9 Oct 2019 16:47:26 -0400 Subject: [PATCH 1/2] Revert requirements changes due to memory issues. Some change in the requirements here may be responsible for increased CPU and memory usage. This is causing production LMS for edx.org to run into lots of performance issues. Reverting for now until we can narrow it down to which change caused the issue. --- requirements/edx-sandbox/base.txt | 6 ++--- requirements/edx-sandbox/shared.txt | 2 +- requirements/edx/base.txt | 22 ++++++++--------- requirements/edx/coverage.txt | 2 +- requirements/edx/development.txt | 38 ++++++++++++++--------------- requirements/edx/paver.txt | 2 +- requirements/edx/testing.in | 2 +- requirements/edx/testing.txt | 34 +++++++++++++------------- scripts/Jenkinsfiles/quality | 2 +- 9 files changed, 55 insertions(+), 55 deletions(-) diff --git a/requirements/edx-sandbox/base.txt b/requirements/edx-sandbox/base.txt index 92bc1375fc..83e71ba4b9 100644 --- a/requirements/edx-sandbox/base.txt +++ b/requirements/edx-sandbox/base.txt @@ -6,7 +6,7 @@ # common/lib/sandbox-packages common/lib/symmath -asn1crypto==1.0.1 +asn1crypto==0.24.0 backports.functools-lru-cache==1.5 # via matplotlib git+https://github.com/edx/openedx-calc.git@e9b698c85ad1152002bc0868f475f153dce88952#egg=calc==0.4 cffi==1.12.3 @@ -25,7 +25,7 @@ numpy==1.7.2 pycparser==2.19 pyparsing==2.2.0 python-dateutil==2.8.0 # via matplotlib -pytz==2019.3 # via matplotlib +pytz==2019.2 # via matplotlib scipy==0.14.0 singledispatch==3.4.0.3 six==1.12.0 @@ -33,4 +33,4 @@ subprocess32==3.5.4 # via matplotlib sympy==0.7.1 # The following packages are considered to be unsafe in a requirements file: -# setuptools==41.4.0 # via kiwisolver +# setuptools==41.2.0 # via kiwisolver diff --git a/requirements/edx-sandbox/shared.txt b/requirements/edx-sandbox/shared.txt index 5e238e97a9..0a143b8f07 100644 --- a/requirements/edx-sandbox/shared.txt +++ b/requirements/edx-sandbox/shared.txt @@ -4,7 +4,7 @@ # # make upgrade # -asn1crypto==1.0.1 # via cryptography +asn1crypto==0.24.0 # via cryptography cffi==1.12.3 # via cryptography cryptography==2.7 enum34==1.1.6 # via cryptography diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 18bb277c96..cdc5dd7693 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -25,11 +25,11 @@ aniso8601==8.0.0 # via tincan anyjson==0.3.3 # via kombu appdirs==1.4.3 # via fs argh==0.26.2 -asn1crypto==1.0.1 +asn1crypto==0.24.0 attrs==17.4.0 babel==1.3 backports.functools-lru-cache==1.5 # via soupsieve -beautifulsoup4==4.8.1 # via pynliner +beautifulsoup4==4.8.0 # via pynliner billiard==3.3.0.23 # via celery bleach==2.1.4 boto3==1.4.8 @@ -105,8 +105,8 @@ edx-django-oauth2-provider==1.3.5 edx-django-release-util==0.3.1 edx-django-sites-extensions==2.3.1 edx-django-utils==2.0.0 -edx-drf-extensions==2.4.1 -edx-enterprise==2.0.1 +edx-drf-extensions==2.4.0 +edx-enterprise==1.10.8 edx-i18n-tools==0.4.8 edx-milestones==0.2.3 edx-oauth2-provider==1.3.1 @@ -120,8 +120,8 @@ edx-search==1.2.2 git+https://github.com/mitodl/edx-sga.git@237ad328ba3f03d189c421073c85e48091041f8b#egg=edx-sga==0.0 edx-submissions==3.0.1 edx-user-state-client==1.1.2 -edx-when==0.5.1 -edxval==1.1.28 +edx-when==0.4 +edxval==1.1.27 elasticsearch==1.9.0 # via edx-search enum34==1.1.6 event-tracking==0.2.9 @@ -142,7 +142,7 @@ inflection==0.3.1 # via drf-yasg ipaddress==1.0.22 isodate==0.6.0 # via python3-saml itypes==1.1.0 # via coreapi -jinja2==2.10.3 # via code-annotations, coreschema +jinja2==2.10.1 # via code-annotations, coreschema jmespath==0.9.4 # via boto3, botocore jsondiff==1.1.1 # via edx-enterprise jsonfield==2.0.2 @@ -166,7 +166,7 @@ mongoengine==0.10.0 mpmath==1.1.0 # via sympy mysqlclient==1.4.4 networkx==1.7 -newrelic==5.2.0.127 +newrelic==5.0.2.126 nltk==3.4.5 nodeenv==1.1.1 numpy==1.16.5 @@ -179,7 +179,7 @@ paver==1.3.4 pbr==5.4.3 pdfminer.six==20181108 piexif==1.0.2 -pillow==6.2.0 +pillow==6.1.0 pkgconfig==1.5.1 # via xmlsec polib==1.1.0 # via edx-i18n-tools psutil==1.2.1 @@ -204,7 +204,7 @@ python-openid==2.2.5 ; python_version == "2.7" # via social-auth-core python-slugify==3.0.4 # via code-annotations python-swiftclient==3.8.1 python3-saml==1.5.0 -pytz==2019.3 +pytz==2019.2 pyuca==1.1 pyyaml==5.1.2 recommender-xblock==1.4.4 @@ -258,4 +258,4 @@ xmlsec==1.3.3 # via python3-saml xss-utils==0.1.1 # The following packages are considered to be unsafe in a requirements file: -# setuptools==41.4.0 # via fs, lazy, python-levenshtein +# setuptools==41.2.0 # via fs, lazy, python-levenshtein diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt index 1520bc9911..14337c8ebf 100644 --- a/requirements/edx/coverage.txt +++ b/requirements/edx/coverage.txt @@ -8,7 +8,7 @@ coverage==5.0a6 diff-cover==0.9.8 inflect==2.1.0 # via jinja2-pluralize jinja2-pluralize==0.3.0 # via diff-cover -jinja2==2.10.3 # via diff-cover, jinja2-pluralize +jinja2==2.10.1 # via diff-cover, jinja2-pluralize markupsafe==1.1.1 # via jinja2 pygments==2.4.2 # via diff-cover six==1.12.0 # via diff-cover diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 25b2c82862..2c6a5bf7fd 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -28,8 +28,8 @@ apipkg==1.5 appdirs==1.4.3 argh==0.26.2 argparse==1.4.0 -asn1crypto==1.0.1 -astroid==1.5.3 +asn1crypto==0.24.0 +astroid==1.6.6 atomicwrites==1.3.0 attrs==17.4.0 aws-xray-sdk==0.95 @@ -38,7 +38,7 @@ backports.functools-lru-cache==1.5 backports.ssl-match-hostname==3.7.0.1 backports.tempfile==1.0 backports.weakref==1.0.post1 -beautifulsoup4==4.8.1 +beautifulsoup4==4.8.0 billiard==3.3.0.23 bleach==2.1.4 bok-choy==1.0.0 @@ -57,7 +57,7 @@ click-log==0.3.2 click==7.0 code-annotations==0.3.2 colorama==0.4.1 -commonmark==0.9.1 # via recommonmark +commonmark==0.9.0 # via recommonmark configparser==4.0.2 contextlib2==0.6.0 cookies==2.2.1 @@ -114,7 +114,7 @@ djangorestframework-jwt==1.11.0 git+https://github.com/edx/django-rest-framework-oauth.git@0a43e8525f1e3048efe4bc70c03de308a277197c#egg=djangorestframework-oauth==1.1.1 djangorestframework-xml==1.4.0 djangorestframework==3.7.7 -docker==4.1.0 +docker==4.0.2 docopt==0.6.2 docutils==0.15.2 drf-yasg==1.16 @@ -128,10 +128,10 @@ edx-django-oauth2-provider==1.3.5 edx-django-release-util==0.3.1 edx-django-sites-extensions==2.3.1 edx-django-utils==2.0.0 -edx-drf-extensions==2.4.1 -edx-enterprise==2.0.1 +edx-drf-extensions==2.4.0 +edx-enterprise==1.10.8 edx-i18n-tools==0.4.8 -edx-lint==1.3.0 +edx-lint==1.4.0 edx-milestones==0.2.3 edx-oauth2-provider==1.3.1 edx-opaque-keys[django]==2.0.0 @@ -145,8 +145,8 @@ git+https://github.com/mitodl/edx-sga.git@237ad328ba3f03d189c421073c85e48091041f edx-sphinx-theme==1.5.0 edx-submissions==3.0.1 edx-user-state-client==1.1.2 -edx-when==0.5.1 -edxval==1.1.28 +edx-when==0.4 +edxval==1.1.27 elasticsearch==1.9.0 entrypoints==0.3 enum34==1.1.6 @@ -183,7 +183,7 @@ isodate==0.6.0 isort==4.3.21 itypes==1.1.0 jinja2-pluralize==0.3.0 -jinja2==2.10.3 +jinja2==2.10.1 jmespath==0.9.4 jsondiff==1.1.1 jsonfield==2.0.2 @@ -214,7 +214,7 @@ moto==1.3.1 mpmath==1.1.0 mysqlclient==1.4.4 networkx==1.7 -newrelic==5.2.0.127 +newrelic==5.0.2.126 nltk==3.4.5 nodeenv==1.1.1 numpy==1.16.5 @@ -229,7 +229,7 @@ paver==1.3.4 pbr==5.4.3 pdfminer.six==20181108 piexif==1.0.2 -pillow==6.2.0 +pillow==6.1.0 pip-tools==4.1.0 pkgconfig==1.5.1 pluggy==0.13.0 @@ -251,9 +251,9 @@ pyinotify==0.9.6 pyjwkest==1.3.2 pyjwt==1.5.2 pylint-celery==0.3 -pylint-django==0.7.2 +pylint-django==0.11.1 pylint-plugin-utils==0.3 -pylint==1.7.6 +pylint==1.9.5 pymongo==2.9.1 pynliner==0.8.0 pyparsing==2.2.0 @@ -266,7 +266,7 @@ pytest-django==3.5.1 pytest-faulthandler==1.6.0 pytest-forked==1.0.2 pytest-randomly==1.2.3 -pytest-xdist==1.30.0 +pytest-xdist==1.29.0 pytest==4.5.0 python-dateutil==2.4.0 python-levenshtein==0.12.0 @@ -275,7 +275,7 @@ python-openid==2.2.5 ; python_version == "2.7" python-slugify==3.0.4 python-swiftclient==3.8.1 python3-saml==1.5.0 -pytz==2019.3 +pytz==2019.2 pyuca==1.1 pyyaml==5.1.2 radon==4.0.0 @@ -302,7 +302,7 @@ simplejson==3.16.0 singledispatch==3.4.0.3 six==1.12.0 slumber==0.7.1 -snowballstemmer==2.0.0 # via sphinx +snowballstemmer==1.9.1 # via sphinx social-auth-app-django==2.1.0 social-auth-core==1.7.0 sorl-thumbnail==12.3 @@ -349,4 +349,4 @@ xss-utils==0.1.1 zipp==0.6.0 # The following packages are considered to be unsafe in a requirements file: -# setuptools==41.4.0 # via caniusepython3, fs, lazy, pytest, python-levenshtein, sphinx +# setuptools==41.2.0 # via caniusepython3, fs, lazy, pytest, python-levenshtein, sphinx diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index 62ab2d9775..cd993d3150 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -30,4 +30,4 @@ watchdog==0.9.0 wrapt==1.10.5 # The following packages are considered to be unsafe in a requirements file: -# setuptools==41.4.0 # via lazy +# setuptools==41.2.0 # via lazy diff --git a/requirements/edx/testing.in b/requirements/edx/testing.in index 269bcdaf4b..71a311945a 100644 --- a/requirements/edx/testing.in +++ b/requirements/edx/testing.in @@ -24,7 +24,7 @@ code-annotations # Perform code annotation checking, such as for PII an cssselect # Used to extract HTML fragments via CSS selectors in 2 test cases and pyquery ddt # Run a test case multiple times with different input; used in many, many of our tests edx-i18n-tools>=0.4.6 # Commands for developers and translators to extract, compile and validate translations -edx-lint==1.3.0 # pylint extensions for Open edX repositories +edx-lint==1.4.0 # pylint extensions for Open edX repositories factory_boy==2.8.1 # Library for creating test fixtures, used in many tests freezegun # Allows tests to mock the output of assorted datetime module functions httpretty # Library for mocking HTTP requests, used in many tests diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index e98b0cb21d..911c2b5bc9 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -27,8 +27,8 @@ apipkg==1.5 # via execnet appdirs==1.4.3 argh==0.26.2 argparse==1.4.0 # via caniusepython3 -asn1crypto==1.0.1 -astroid==1.5.3 # via pylint, pylint-celery +asn1crypto==0.24.0 +astroid==1.6.6 # via pylint, pylint-celery atomicwrites==1.3.0 # via pytest attrs==17.4.0 aws-xray-sdk==0.95 # via moto @@ -37,7 +37,7 @@ backports.functools-lru-cache==1.5 backports.ssl-match-hostname==3.7.0.1 # via docker backports.tempfile==1.0 # via moto backports.weakref==1.0.post1 # via backports.tempfile -beautifulsoup4==4.8.1 +beautifulsoup4==4.8.0 billiard==3.3.0.23 bleach==2.1.4 bok-choy==1.0.0 @@ -110,7 +110,7 @@ djangorestframework-jwt==1.11.0 git+https://github.com/edx/django-rest-framework-oauth.git@0a43e8525f1e3048efe4bc70c03de308a277197c#egg=djangorestframework-oauth==1.1.1 djangorestframework-xml==1.4.0 djangorestframework==3.7.7 -docker==4.1.0 # via moto +docker==4.0.2 # via moto docopt==0.6.2 docutils==0.15.2 drf-yasg==1.16 @@ -124,10 +124,10 @@ edx-django-oauth2-provider==1.3.5 edx-django-release-util==0.3.1 edx-django-sites-extensions==2.3.1 edx-django-utils==2.0.0 -edx-drf-extensions==2.4.1 -edx-enterprise==2.0.1 +edx-drf-extensions==2.4.0 +edx-enterprise==1.10.8 edx-i18n-tools==0.4.8 -edx-lint==1.3.0 +edx-lint==1.4.0 edx-milestones==0.2.3 edx-oauth2-provider==1.3.1 edx-opaque-keys[django]==2.0.0 @@ -140,8 +140,8 @@ edx-search==1.2.2 git+https://github.com/mitodl/edx-sga.git@237ad328ba3f03d189c421073c85e48091041f8b#egg=edx-sga==0.0 edx-submissions==3.0.1 edx-user-state-client==1.1.2 -edx-when==0.5.1 -edxval==1.1.28 +edx-when==0.4 +edxval==1.1.27 elasticsearch==1.9.0 entrypoints==0.3 # via flake8 enum34==1.1.6 @@ -177,7 +177,7 @@ isodate==0.6.0 isort==4.3.21 itypes==1.1.0 jinja2-pluralize==0.3.0 -jinja2==2.10.3 +jinja2==2.10.1 jmespath==0.9.4 jsondiff==1.1.1 jsonfield==2.0.2 @@ -207,7 +207,7 @@ moto==1.3.1 mpmath==1.1.0 mysqlclient==1.4.4 networkx==1.7 -newrelic==5.2.0.127 +newrelic==5.0.2.126 nltk==3.4.5 nodeenv==1.1.1 numpy==1.16.5 @@ -222,7 +222,7 @@ paver==1.3.4 pbr==5.4.3 pdfminer.six==20181108 piexif==1.0.2 -pillow==6.2.0 +pillow==6.1.0 pkgconfig==1.5.1 pluggy==0.13.0 # via pytest, tox polib==1.1.0 @@ -242,9 +242,9 @@ pygraphviz==1.5 pyjwkest==1.3.2 pyjwt==1.5.2 pylint-celery==0.3 # via edx-lint -pylint-django==0.7.2 # via edx-lint +pylint-django==0.11.1 # via edx-lint pylint-plugin-utils==0.3 # via pylint-celery, pylint-django -pylint==1.7.6 # via edx-lint, pylint-celery, pylint-django +pylint==1.9.5 # via edx-lint, pylint-celery, pylint-django pymongo==2.9.1 pynliner==0.8.0 pyparsing==2.2.0 @@ -257,7 +257,7 @@ pytest-django==3.5.1 pytest-faulthandler==1.6.0 pytest-forked==1.0.2 # via pytest-xdist pytest-randomly==1.2.3 -pytest-xdist==1.30.0 +pytest-xdist==1.29.0 pytest==4.5.0 python-dateutil==2.4.0 python-levenshtein==0.12.0 @@ -266,7 +266,7 @@ python-openid==2.2.5 ; python_version == "2.7" python-slugify==3.0.4 python-swiftclient==3.8.1 python3-saml==1.5.0 -pytz==2019.3 +pytz==2019.2 pyuca==1.1 pyyaml==5.1.2 radon==4.0.0 @@ -335,4 +335,4 @@ xss-utils==0.1.1 zipp==0.6.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: -# setuptools==41.4.0 # via caniusepython3, fs, lazy, pytest, python-levenshtein +# setuptools==41.2.0 # via caniusepython3, fs, lazy, pytest, python-levenshtein diff --git a/scripts/Jenkinsfiles/quality b/scripts/Jenkinsfiles/quality index bc849032e9..483020d242 100644 --- a/scripts/Jenkinsfiles/quality +++ b/scripts/Jenkinsfiles/quality @@ -45,7 +45,7 @@ pipeline { options { sendSplunkConsoleLog() timestamps() - timeout(60) + timeout(120) } stages { stage('Mark build as pending on Github') { From b6638d21cacede867ab7c92731290de2dc211e67 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Thu, 10 Oct 2019 14:02:37 -0400 Subject: [PATCH 2/2] Update everything but the constrained packages. --- requirements/constraints.txt | 6 ++++++ requirements/edx-sandbox/base.txt | 6 +++--- requirements/edx-sandbox/shared.txt | 2 +- requirements/edx/base.txt | 20 ++++++++++---------- requirements/edx/coverage.txt | 2 +- requirements/edx/development.txt | 28 ++++++++++++++-------------- requirements/edx/paver.txt | 2 +- requirements/edx/testing.txt | 24 ++++++++++++------------ 8 files changed, 48 insertions(+), 42 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 71b3d85ab8..0f2ee9ee13 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -76,3 +76,9 @@ numpy<1.17.0 # jsondiff==1.1.1 (from moto==1.2.0->-r requirements/edx/testing.in (line 33)) # jsondiff==1.2.0 (from -r requirements/edx/base.txt (line 146)) jsondiff==1.1.1 + + +# Constraining these so that we can slow-roll their deploy to find out which one is causing the production performance issues. +edx-when==0.4 +edx-enterprise==1.10.8 +edx-drf-extensions==2.4.0 diff --git a/requirements/edx-sandbox/base.txt b/requirements/edx-sandbox/base.txt index 83e71ba4b9..92bc1375fc 100644 --- a/requirements/edx-sandbox/base.txt +++ b/requirements/edx-sandbox/base.txt @@ -6,7 +6,7 @@ # common/lib/sandbox-packages common/lib/symmath -asn1crypto==0.24.0 +asn1crypto==1.0.1 backports.functools-lru-cache==1.5 # via matplotlib git+https://github.com/edx/openedx-calc.git@e9b698c85ad1152002bc0868f475f153dce88952#egg=calc==0.4 cffi==1.12.3 @@ -25,7 +25,7 @@ numpy==1.7.2 pycparser==2.19 pyparsing==2.2.0 python-dateutil==2.8.0 # via matplotlib -pytz==2019.2 # via matplotlib +pytz==2019.3 # via matplotlib scipy==0.14.0 singledispatch==3.4.0.3 six==1.12.0 @@ -33,4 +33,4 @@ subprocess32==3.5.4 # via matplotlib sympy==0.7.1 # The following packages are considered to be unsafe in a requirements file: -# setuptools==41.2.0 # via kiwisolver +# setuptools==41.4.0 # via kiwisolver diff --git a/requirements/edx-sandbox/shared.txt b/requirements/edx-sandbox/shared.txt index 0a143b8f07..5e238e97a9 100644 --- a/requirements/edx-sandbox/shared.txt +++ b/requirements/edx-sandbox/shared.txt @@ -4,7 +4,7 @@ # # make upgrade # -asn1crypto==0.24.0 # via cryptography +asn1crypto==1.0.1 # via cryptography cffi==1.12.3 # via cryptography cryptography==2.7 enum34==1.1.6 # via cryptography diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 01dae01c17..9850a1e681 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -25,11 +25,11 @@ aniso8601==8.0.0 # via tincan anyjson==0.3.3 # via kombu appdirs==1.4.3 # via fs argh==0.26.2 -asn1crypto==0.24.0 +asn1crypto==1.0.1 attrs==17.4.0 babel==1.3 backports.functools-lru-cache==1.5 # via soupsieve -beautifulsoup4==4.8.0 # via pynliner +beautifulsoup4==4.8.1 # via pynliner billiard==3.3.0.23 # via celery bleach==2.1.4 boto3==1.4.8 @@ -44,7 +44,7 @@ chardet==3.0.4 git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0 click==7.0 # via code-annotations, user-util code-annotations==0.3.2 # via edx-enterprise -contextlib2==0.6.0 +contextlib2==0.6.0.post1 coreapi==2.3.3 # via drf-yasg coreschema==0.0.4 # via coreapi, drf-yasg git+https://github.com/edx/crowdsourcehinter.git@a7ffc85b134b7d8909bf1fefd23dbdb8eb28e467#egg=crowdsourcehinter-xblock==0.2 @@ -104,7 +104,7 @@ edx-completion==2.0.0 edx-django-oauth2-provider==1.3.5 edx-django-release-util==0.3.1 edx-django-sites-extensions==2.3.1 -edx-django-utils==2.0.0 +edx-django-utils==2.0.1 edx-drf-extensions==2.4.0 edx-enterprise==1.10.8 edx-i18n-tools==0.4.8 @@ -121,7 +121,7 @@ git+https://github.com/mitodl/edx-sga.git@237ad328ba3f03d189c421073c85e48091041f edx-submissions==3.0.1 edx-user-state-client==1.1.2 edx-when==0.4 -edxval==1.1.27 +edxval==1.1.28 elasticsearch==1.9.0 # via edx-search enum34==1.1.6 event-tracking==0.2.9 @@ -142,7 +142,7 @@ inflection==0.3.1 # via drf-yasg ipaddress==1.0.22 isodate==0.6.0 # via python3-saml itypes==1.1.0 # via coreapi -jinja2==2.10.1 # via code-annotations, coreschema +jinja2==2.10.3 # via code-annotations, coreschema jmespath==0.9.4 # via boto3, botocore jsondiff==1.1.1 # via edx-enterprise jsonfield==2.0.2 @@ -166,7 +166,7 @@ mongoengine==0.10.0 mpmath==1.1.0 # via sympy mysqlclient==1.4.4 networkx==1.7 -newrelic==5.0.2.126 +newrelic==5.2.1.129 nltk==3.4.5 nodeenv==1.1.1 numpy==1.16.5 @@ -179,7 +179,7 @@ paver==1.3.4 pbr==5.4.3 pdfminer.six==20181108 piexif==1.0.2 -pillow==6.1.0 +pillow==6.2.0 pkgconfig==1.5.1 # via xmlsec polib==1.1.0 # via edx-i18n-tools psutil==1.2.1 @@ -204,7 +204,7 @@ python-openid==2.2.5 ; python_version == "2.7" # via social-auth-core python-slugify==3.0.4 # via code-annotations python-swiftclient==3.8.1 python3-saml==1.5.0 -pytz==2019.2 +pytz==2019.3 pyuca==1.1 pyyaml==5.1.2 random2==1.0.1 @@ -259,4 +259,4 @@ xmlsec==1.3.3 # via python3-saml xss-utils==0.1.1 # The following packages are considered to be unsafe in a requirements file: -# setuptools==41.2.0 # via fs, lazy, python-levenshtein +# setuptools==41.4.0 # via fs, lazy, python-levenshtein diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt index 14337c8ebf..1520bc9911 100644 --- a/requirements/edx/coverage.txt +++ b/requirements/edx/coverage.txt @@ -8,7 +8,7 @@ coverage==5.0a6 diff-cover==0.9.8 inflect==2.1.0 # via jinja2-pluralize jinja2-pluralize==0.3.0 # via diff-cover -jinja2==2.10.1 # via diff-cover, jinja2-pluralize +jinja2==2.10.3 # via diff-cover, jinja2-pluralize markupsafe==1.1.1 # via jinja2 pygments==2.4.2 # via diff-cover six==1.12.0 # via diff-cover diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 204c1d2cb6..045041f20f 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -28,7 +28,7 @@ apipkg==1.5 appdirs==1.4.3 argh==0.26.2 argparse==1.4.0 -asn1crypto==0.24.0 +asn1crypto==1.0.1 astroid==1.6.6 atomicwrites==1.3.0 attrs==17.4.0 @@ -38,7 +38,7 @@ backports.functools-lru-cache==1.5 backports.ssl-match-hostname==3.7.0.1 backports.tempfile==1.0 backports.weakref==1.0.post1 -beautifulsoup4==4.8.0 +beautifulsoup4==4.8.1 billiard==3.3.0.23 bleach==2.1.4 bok-choy==1.0.0 @@ -57,9 +57,9 @@ click-log==0.3.2 click==7.0 code-annotations==0.3.2 colorama==0.4.1 -commonmark==0.9.0 # via recommonmark +commonmark==0.9.1 # via recommonmark configparser==4.0.2 -contextlib2==0.6.0 +contextlib2==0.6.0.post1 cookies==2.2.1 coreapi==2.3.3 coreschema==0.0.4 @@ -114,7 +114,7 @@ djangorestframework-jwt==1.11.0 git+https://github.com/edx/django-rest-framework-oauth.git@0a43e8525f1e3048efe4bc70c03de308a277197c#egg=djangorestframework-oauth==1.1.1 djangorestframework-xml==1.4.0 djangorestframework==3.7.7 -docker==4.0.2 +docker==4.1.0 docopt==0.6.2 docutils==0.15.2 drf-yasg==1.16 @@ -127,7 +127,7 @@ edx-completion==2.0.0 edx-django-oauth2-provider==1.3.5 edx-django-release-util==0.3.1 edx-django-sites-extensions==2.3.1 -edx-django-utils==2.0.0 +edx-django-utils==2.0.1 edx-drf-extensions==2.4.0 edx-enterprise==1.10.8 edx-i18n-tools==0.4.8 @@ -146,7 +146,7 @@ edx-sphinx-theme==1.5.0 edx-submissions==3.0.1 edx-user-state-client==1.1.2 edx-when==0.4 -edxval==1.1.27 +edxval==1.1.28 elasticsearch==1.9.0 entrypoints==0.3 enum34==1.1.6 @@ -183,7 +183,7 @@ isodate==0.6.0 isort==4.3.21 itypes==1.1.0 jinja2-pluralize==0.3.0 -jinja2==2.10.1 +jinja2==2.10.3 jmespath==0.9.4 jsondiff==1.1.1 jsonfield==2.0.2 @@ -214,7 +214,7 @@ moto==1.3.1 mpmath==1.1.0 mysqlclient==1.4.4 networkx==1.7 -newrelic==5.0.2.126 +newrelic==5.2.1.129 nltk==3.4.5 nodeenv==1.1.1 numpy==1.16.5 @@ -229,7 +229,7 @@ paver==1.3.4 pbr==5.4.3 pdfminer.six==20181108 piexif==1.0.2 -pillow==6.1.0 +pillow==6.2.0 pip-tools==4.1.0 pkgconfig==1.5.1 pluggy==0.13.0 @@ -266,7 +266,7 @@ pytest-django==3.5.1 pytest-faulthandler==1.6.0 pytest-forked==1.0.2 pytest-randomly==1.2.3 -pytest-xdist==1.29.0 +pytest-xdist==1.30.0 pytest==4.5.0 python-dateutil==2.4.0 python-levenshtein==0.12.0 @@ -275,7 +275,7 @@ python-openid==2.2.5 ; python_version == "2.7" python-slugify==3.0.4 python-swiftclient==3.8.1 python3-saml==1.5.0 -pytz==2019.2 +pytz==2019.3 pyuca==1.1 pyyaml==5.1.2 radon==4.0.0 @@ -303,7 +303,7 @@ simplejson==3.16.0 singledispatch==3.4.0.3 six==1.12.0 slumber==0.7.1 -snowballstemmer==1.9.1 # via sphinx +snowballstemmer==2.0.0 # via sphinx social-auth-app-django==2.1.0 social-auth-core==1.7.0 sorl-thumbnail==12.3 @@ -350,4 +350,4 @@ xss-utils==0.1.1 zipp==0.6.0 # The following packages are considered to be unsafe in a requirements file: -# setuptools==41.2.0 # via caniusepython3, fs, lazy, pytest, python-levenshtein, sphinx +# setuptools==41.4.0 # via caniusepython3, fs, lazy, pytest, python-levenshtein, sphinx diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index cd993d3150..62ab2d9775 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -30,4 +30,4 @@ watchdog==0.9.0 wrapt==1.10.5 # The following packages are considered to be unsafe in a requirements file: -# setuptools==41.2.0 # via lazy +# setuptools==41.4.0 # via lazy diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 733770aa4d..1a4952fb3f 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -27,7 +27,7 @@ apipkg==1.5 # via execnet appdirs==1.4.3 argh==0.26.2 argparse==1.4.0 # via caniusepython3 -asn1crypto==0.24.0 +asn1crypto==1.0.1 astroid==1.6.6 # via pylint, pylint-celery atomicwrites==1.3.0 # via pytest attrs==17.4.0 @@ -37,7 +37,7 @@ backports.functools-lru-cache==1.5 backports.ssl-match-hostname==3.7.0.1 # via docker backports.tempfile==1.0 # via moto backports.weakref==1.0.post1 # via backports.tempfile -beautifulsoup4==4.8.0 +beautifulsoup4==4.8.1 billiard==3.3.0.23 bleach==2.1.4 bok-choy==1.0.0 @@ -57,7 +57,7 @@ click==7.0 code-annotations==0.3.2 colorama==0.4.1 # via radon configparser==4.0.2 # via entrypoints, flake8, importlib-metadata, pylint -contextlib2==0.6.0 +contextlib2==0.6.0.post1 cookies==2.2.1 # via moto coreapi==2.3.3 coreschema==0.0.4 @@ -110,7 +110,7 @@ djangorestframework-jwt==1.11.0 git+https://github.com/edx/django-rest-framework-oauth.git@0a43e8525f1e3048efe4bc70c03de308a277197c#egg=djangorestframework-oauth==1.1.1 djangorestframework-xml==1.4.0 djangorestframework==3.7.7 -docker==4.0.2 # via moto +docker==4.1.0 # via moto docopt==0.6.2 docutils==0.15.2 drf-yasg==1.16 @@ -123,7 +123,7 @@ edx-completion==2.0.0 edx-django-oauth2-provider==1.3.5 edx-django-release-util==0.3.1 edx-django-sites-extensions==2.3.1 -edx-django-utils==2.0.0 +edx-django-utils==2.0.1 edx-drf-extensions==2.4.0 edx-enterprise==1.10.8 edx-i18n-tools==0.4.8 @@ -141,7 +141,7 @@ git+https://github.com/mitodl/edx-sga.git@237ad328ba3f03d189c421073c85e48091041f edx-submissions==3.0.1 edx-user-state-client==1.1.2 edx-when==0.4 -edxval==1.1.27 +edxval==1.1.28 elasticsearch==1.9.0 entrypoints==0.3 # via flake8 enum34==1.1.6 @@ -177,7 +177,7 @@ isodate==0.6.0 isort==4.3.21 itypes==1.1.0 jinja2-pluralize==0.3.0 -jinja2==2.10.1 +jinja2==2.10.3 jmespath==0.9.4 jsondiff==1.1.1 jsonfield==2.0.2 @@ -207,7 +207,7 @@ moto==1.3.1 mpmath==1.1.0 mysqlclient==1.4.4 networkx==1.7 -newrelic==5.0.2.126 +newrelic==5.2.1.129 nltk==3.4.5 nodeenv==1.1.1 numpy==1.16.5 @@ -222,7 +222,7 @@ paver==1.3.4 pbr==5.4.3 pdfminer.six==20181108 piexif==1.0.2 -pillow==6.1.0 +pillow==6.2.0 pkgconfig==1.5.1 pluggy==0.13.0 # via pytest, tox polib==1.1.0 @@ -257,7 +257,7 @@ pytest-django==3.5.1 pytest-faulthandler==1.6.0 pytest-forked==1.0.2 # via pytest-xdist pytest-randomly==1.2.3 -pytest-xdist==1.29.0 +pytest-xdist==1.30.0 pytest==4.5.0 python-dateutil==2.4.0 python-levenshtein==0.12.0 @@ -266,7 +266,7 @@ python-openid==2.2.5 ; python_version == "2.7" python-slugify==3.0.4 python-swiftclient==3.8.1 python3-saml==1.5.0 -pytz==2019.2 +pytz==2019.3 pyuca==1.1 pyyaml==5.1.2 radon==4.0.0 @@ -336,4 +336,4 @@ xss-utils==0.1.1 zipp==0.6.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: -# setuptools==41.2.0 # via caniusepython3, fs, lazy, pytest, python-levenshtein +# setuptools==41.4.0 # via caniusepython3, fs, lazy, pytest, python-levenshtein