From 059d68344180cbc06a110b9521acc4a32cd90b58 Mon Sep 17 00:00:00 2001 From: Aarif <MrAarif@outlook.com> Date: Wed, 3 Mar 2021 23:04:41 +0500 Subject: [PATCH] Constrained diff-cover to fix upgrade job (#26830) --- requirements/constraints.txt | 3 +++ requirements/edx/base.txt | 4 ++-- requirements/edx/coverage.txt | 2 +- requirements/edx/development.txt | 8 ++++---- requirements/edx/testing.txt | 8 ++++---- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 869c04dcb14..52252fa5d03 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -118,3 +118,6 @@ python3-saml<1.10.0 # With greater version these tests `common.djangoapps.terrain.stubs.tests` becomes flaky on jenkins. httpretty<1.0 +# latest version of diff-cover conflicts with pygments version see https://github.com/Bachmann1234/diff_cover/commit/01f91760321cee1ad28cfa0d801c4acd8b9765a6 +diff-cover<4.2.2 + diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 779e9be52b3..0ad6b541d5f 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -48,7 +48,7 @@ ddt==1.4.1 # via xblock-drag-and-drop-v2, xblock-poll decorator==4.4.2 # via pycontracts defusedxml==0.6.0 # via -r requirements/edx/base.in, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core django-appconf==1.0.4 # via -r requirements/edx/base.in, django-statici18n -django-cache-memoize==0.1.7 # via edx-enterprise +django-cache-memoize==0.1.8 # via edx-enterprise django-celery-results==2.0.1 # via -r requirements/edx/base.in django-classy-tags==2.0.0 # via django-sekizai django-config-models==2.1.1 # via -r requirements/edx/base.in, edx-enterprise, edx-event-routing-backends @@ -164,7 +164,7 @@ nodeenv==1.5.0 # via -r requirements/edx/base.in numpy==1.20.1 # via chem, openedx-calc, scipy oauthlib==3.0.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, django-oauth-toolkit, lti-consumer-xblock, requests-oauthlib, social-auth-core openedx-calc==2.0.1 # via -r requirements/edx/base.in -ora2==3.2.0 # via -r requirements/edx/base.in +ora2==3.3.1 # via -r requirements/edx/base.in packaging==20.9 # via bleach, drf-yasg path.py==12.5.0 # via edx-enterprise, edx-i18n-tools, ora2, staff-graded-xblock, xmodule path==13.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.txt, path.py diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt index ee31e8dcfe1..334fc5507d1 100644 --- a/requirements/edx/coverage.txt +++ b/requirements/edx/coverage.txt @@ -6,7 +6,7 @@ # chardet==4.0.0 # via diff-cover coverage==5.5 # via -r requirements/edx/coverage.in -diff-cover==4.2.1 # via -r requirements/edx/coverage.in +diff-cover==4.2.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/coverage.in importlib-metadata==1.7.0 # via -c requirements/edx/../constraints.txt, inflect inflect==3.0.2 # via -c requirements/edx/../constraints.txt, jinja2-pluralize jinja2-pluralize==0.3.0 # via diff-cover diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index a307efef679..0b52127d6b5 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -55,10 +55,10 @@ cssutils==1.0.2 # via -r requirements/edx/testing.txt, pynliner ddt==1.4.1 # via -r requirements/edx/testing.txt, xblock-drag-and-drop-v2, xblock-poll decorator==4.4.2 # via -r requirements/edx/testing.txt, pycontracts defusedxml==0.6.0 # via -r requirements/edx/testing.txt, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core -diff-cover==4.2.1 # via -r requirements/edx/testing.txt +diff-cover==4.2.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt distlib==0.3.1 # via -r requirements/edx/testing.txt, virtualenv django-appconf==1.0.4 # via -r requirements/edx/testing.txt, django-statici18n -django-cache-memoize==0.1.7 # via -r requirements/edx/testing.txt, edx-enterprise +django-cache-memoize==0.1.8 # via -r requirements/edx/testing.txt, edx-enterprise django-celery-results==2.0.1 # via -r requirements/edx/testing.txt django-classy-tags==2.0.0 # via -r requirements/edx/testing.txt, django-sekizai django-config-models==2.1.1 # via -r requirements/edx/testing.txt, edx-enterprise, edx-event-routing-backends @@ -197,7 +197,7 @@ nodeenv==1.5.0 # via -r requirements/edx/testing.txt numpy==1.20.1 # via -r requirements/edx/testing.txt, chem, openedx-calc, scipy oauthlib==3.0.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, django-oauth-toolkit, lti-consumer-xblock, requests-oauthlib, social-auth-core openedx-calc==2.0.1 # via -r requirements/edx/testing.txt -ora2==3.2.0 # via -r requirements/edx/testing.txt +ora2==3.3.1 # via -r requirements/edx/testing.txt packaging==20.9 # via -r requirements/edx/testing.txt, bleach, drf-yasg, pytest, sphinx, tox path.py==12.5.0 # via -r requirements/edx/testing.txt, edx-enterprise, edx-i18n-tools, ora2, staff-graded-xblock, xmodule path==13.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, path.py @@ -296,7 +296,7 @@ text-unidecode==1.3 # via -r requirements/edx/testing.txt, faker, python-s tincan==1.0.0 # via -r requirements/edx/testing.txt, edx-event-routing-backends toml==0.10.2 # via -r requirements/edx/testing.txt, pylint, pytest, tox, vulture tox-battery==0.6.1 # via -r requirements/edx/testing.txt -tox==3.22.0 # via -r requirements/edx/testing.txt, tox-battery +tox==3.23.0 # via -r requirements/edx/testing.txt, tox-battery tqdm==4.58.0 # via -r requirements/edx/testing.txt, nltk transifex-client==0.14.2 # via -r requirements/edx/testing.txt ua-parser==0.10.0 # via -r requirements/edx/testing.txt, django-cookies-samesite diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 5cb026eee46..a6d0ef28169 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -54,10 +54,10 @@ cssutils==1.0.2 # via -r requirements/edx/base.txt, pynliner ddt==1.4.1 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, xblock-drag-and-drop-v2, xblock-poll decorator==4.4.2 # via -r requirements/edx/base.txt, pycontracts defusedxml==0.6.0 # via -r requirements/edx/base.txt, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core -diff-cover==4.2.1 # via -r requirements/edx/coverage.txt +diff-cover==4.2.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/coverage.txt distlib==0.3.1 # via virtualenv django-appconf==1.0.4 # via -r requirements/edx/base.txt, django-statici18n -django-cache-memoize==0.1.7 # via -r requirements/edx/base.txt, edx-enterprise +django-cache-memoize==0.1.8 # via -r requirements/edx/base.txt, edx-enterprise django-celery-results==2.0.1 # via -r requirements/edx/base.txt django-classy-tags==2.0.0 # via -r requirements/edx/base.txt, django-sekizai django-config-models==2.1.1 # via -r requirements/edx/base.txt, edx-enterprise, edx-event-routing-backends @@ -189,7 +189,7 @@ nodeenv==1.5.0 # via -r requirements/edx/base.txt numpy==1.20.1 # via -r requirements/edx/base.txt, chem, openedx-calc, scipy oauthlib==3.0.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, django-oauth-toolkit, lti-consumer-xblock, requests-oauthlib, social-auth-core openedx-calc==2.0.1 # via -r requirements/edx/base.txt -ora2==3.2.0 # via -r requirements/edx/base.txt +ora2==3.3.1 # via -r requirements/edx/base.txt packaging==20.9 # via -r requirements/edx/base.txt, bleach, drf-yasg, pytest, tox path.py==12.5.0 # via -r requirements/edx/base.txt, edx-enterprise, edx-i18n-tools, ora2, staff-graded-xblock, xmodule path==13.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, path.py @@ -275,7 +275,7 @@ text-unidecode==1.3 # via -r requirements/edx/base.txt, faker, python-slug tincan==1.0.0 # via -r requirements/edx/base.txt, edx-event-routing-backends toml==0.10.2 # via pylint, pytest, tox tox-battery==0.6.1 # via -r requirements/edx/testing.in -tox==3.22.0 # via -r requirements/edx/testing.in, tox-battery +tox==3.23.0 # via -r requirements/edx/testing.in, tox-battery tqdm==4.58.0 # via -r requirements/edx/base.txt, nltk transifex-client==0.14.2 # via -r requirements/edx/testing.in ua-parser==0.10.0 # via -r requirements/edx/base.txt, django-cookies-samesite -- GitLab