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/base.txt b/requirements/edx/base.txt index e8e3e94d60..9850a1e681 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -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,9 +104,9 @@ 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-drf-extensions==2.4.1 -edx-enterprise==2.0.3 +edx-django-utils==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,7 +120,7 @@ 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 +edx-when==0.4 edxval==1.1.28 elasticsearch==1.9.0 # via edx-search enum34==1.1.6 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 113e26e3b6..045041f20f 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -29,7 +29,7 @@ appdirs==1.4.3 argh==0.26.2 argparse==1.4.0 asn1crypto==1.0.1 -astroid==1.5.3 +astroid==1.6.6 atomicwrites==1.3.0 attrs==17.4.0 aws-xray-sdk==0.95 @@ -59,7 +59,7 @@ code-annotations==0.3.2 colorama==0.4.1 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 @@ -127,11 +127,11 @@ 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-drf-extensions==2.4.1 -edx-enterprise==2.0.3 +edx-django-utils==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,7 +145,7 @@ 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 +edx-when==0.4 edxval==1.1.28 elasticsearch==1.9.0 entrypoints==0.3 @@ -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 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 1f747667d1..1a4952fb3f 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -28,7 +28,7 @@ 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 +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 @@ -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 @@ -123,11 +123,11 @@ 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-drf-extensions==2.4.1 -edx-enterprise==2.0.3 +edx-django-utils==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,7 +140,7 @@ 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 +edx-when==0.4 edxval==1.1.28 elasticsearch==1.9.0 entrypoints==0.3 # via flake8 @@ -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 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') {