Merge pull request #26914 from edx/nadeem/packer_ami_ubuntu_20.04

Pin diff-cover to fix tests on Ubuntu 20.04

requirements/constraints.txt

@@ -119,5 +119,5 @@ python3-saml<1.10.0
 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-cover==4.0.0
 

requirements/edx/coverage.txt

@@ -4,9 +4,8 @@
 #
 #    make upgrade
 #
-chardet==4.0.0            # via diff-cover
 coverage==5.5             # via -r requirements/edx/coverage.in
-diff-cover==4.2.1         # via -c requirements/edx/../constraints.txt, -r requirements/edx/coverage.in
+diff-cover==4.0.0         # 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

requirements/edx/development.txt

@@ -38,7 +38,7 @@ bridgekeeper==0.9         # via -r requirements/edx/testing.txt
 celery==4.4.7             # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, django-celery-results, django-user-tasks, edx-celeryutils, edx-enterprise, event-tracking
 certifi==2020.12.5        # via -r requirements/edx/testing.txt, elasticsearch, requests
 cffi==1.14.5              # via -r requirements/edx/testing.txt, cryptography
-chardet==4.0.0            # via -r requirements/edx/testing.txt, diff-cover, pysrt, requests
+chardet==4.0.0            # via -r requirements/edx/testing.txt, pysrt, requests
 chem==1.2.0               # via -r requirements/edx/testing.txt
 click-log==0.3.2          # via -r requirements/edx/testing.txt, edx-lint
 click==7.1.2              # via -r requirements/edx/development.in, -r requirements/edx/pip-tools.txt, -r requirements/edx/testing.txt, click-log, code-annotations, edx-lint, nltk, pip-tools, user-util
@@ -55,7 +55,7 @@ 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.7.1         # via -r requirements/edx/testing.txt, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core
-diff-cover==4.2.1         # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt
+diff-cover==4.0.0         # 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.8  # via -r requirements/edx/testing.txt, edx-enterprise

requirements/edx/testing.txt

@@ -37,7 +37,7 @@ bridgekeeper==0.9         # via -r requirements/edx/base.txt
 celery==4.4.7             # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, django-celery-results, django-user-tasks, edx-celeryutils, edx-enterprise, event-tracking
 certifi==2020.12.5        # via -r requirements/edx/base.txt, elasticsearch, requests
 cffi==1.14.5              # via -r requirements/edx/base.txt, cryptography
-chardet==4.0.0            # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, diff-cover, pysrt, requests
+chardet==4.0.0            # via -r requirements/edx/base.txt, pysrt, requests
 chem==1.2.0               # via -r requirements/edx/base.txt
 click-log==0.3.2          # via edx-lint
 click==7.1.2              # via -r requirements/edx/base.txt, click-log, code-annotations, edx-lint, nltk, user-util
@@ -54,7 +54,7 @@ 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.7.1         # via -r requirements/edx/base.txt, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core
-diff-cover==4.2.1         # via -c requirements/edx/../constraints.txt, -r requirements/edx/coverage.txt
+diff-cover==4.0.0         # 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.8  # via -r requirements/edx/base.txt, edx-enterprise