BOM-1300

Switching from nose to pytest.
edx · May 6, 2020 · 0bc8e54 · 0bc8e54
1 parent f866e66
commit 0bc8e54
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 31 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-beautifulsoup4==4.6.0     # via wagtail
+beautifulsoup4==4.8.2     # via wagtail
 certifi==2020.4.5.1       # via requests
 chardet==3.0.4            # via requests
 coreapi==2.3.3            # via django-rest-swagger, openapi-codec
@@ -25,7 +25,7 @@ drf-jwt==1.14.0           # via edx-drf-extensions
 edx-auth-backends==3.0.2  # via -r requirements/base.in
 edx-django-release-util==0.4.4  # via -r requirements/base.in
 edx-django-utils==3.2.2   # via -r requirements/base.in, edx-drf-extensions, edx-rest-api-client
-edx-drf-extensions==5.1.0  # via -r requirements/base.in
+edx-drf-extensions==6.0.0  # via -r requirements/base.in
 edx-opaque-keys==2.1.0    # via edx-drf-extensions
 edx_rest_api_client==4.0.1  # via -r requirements/base.in
 future==0.18.2            # via pyjwkest
@@ -43,7 +43,7 @@ newrelic==5.12.1.141      # via edx-django-utils
 oauthlib==3.1.0           # via requests-oauthlib, social-auth-core
 openapi-codec==1.3.2      # via django-rest-swagger
 pbr==5.4.5                # via stevedore
-pillow==6.2.2             # via wagtail
+pillow==7.1.2             # via wagtail
 psutil==1.2.1             # via edx-django-utils
 pycryptodomex==3.9.7      # via pyjwkest
 pyjwkest==1.4.2           # via edx-drf-extensions
@@ -62,12 +62,14 @@ six==1.14.0               # via django-extensions, django-waffle, edx-auth-backe
 slumber==0.7.1            # via edx-rest-api-client
 git+https://github.com/python-social-auth/social-app-django.git@c00d23c2b45c3317bd35b15ad1b959338689cef8#egg=social-auth-app-django  # via -r requirements/github.in, edx-auth-backends
 social-auth-core==3.2.0   # via -r requirements/base.in, edx-auth-backends, social-auth-app-django
+soupsieve==2.0            # via beautifulsoup4
 sqlparse==0.3.1           # via django
 stevedore==1.32.0         # via edx-opaque-keys
 unidecode==1.1.1          # via wagtail
 uritemplate==3.0.1        # via coreapi
 urllib3==1.25.9           # via requests
-wagtail==2.8.1            # via -r requirements/base.in
+wagtail==2.9              # via -r requirements/base.in
 webencodings==0.5.1       # via html5lib
 willow==1.3               # via wagtail
+xlsxwriter==1.2.8         # via wagtail
 zipp==1.2.0               # via -r requirements/base.in, importlib-metadata
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -9,13 +9,13 @@ argparse==1.4.0           # via -r requirements/quality.txt, caniusepython3
 astroid==2.3.3            # via -r requirements/quality.txt, pylint, pylint-celery
 attrs==19.3.0             # via -r requirements/quality.txt, pytest
 backports.functools-lru-cache==1.6.1  # via -r requirements/quality.txt, caniusepython3
-beautifulsoup4==4.6.0     # via -r requirements/quality.txt, wagtail
+beautifulsoup4==4.8.2     # via -r requirements/quality.txt, wagtail
 caniusepython3==7.2.0     # via -r requirements/quality.txt
 certifi==2020.4.5.1       # via -r requirements/quality.txt, requests
 chardet==3.0.4            # via -r requirements/quality.txt, requests
 click-log==0.3.2          # via -r requirements/quality.txt, edx-lint
 click==7.1.2              # via -r requirements/pip-tools.txt, -r requirements/quality.txt, click-log, code-annotations, edx-lint, pip-tools
-code-annotations==0.3.3   # via -r requirements/quality.txt
+code-annotations==0.3.4   # via -r requirements/quality.txt
 coreapi==2.3.3            # via -r requirements/quality.txt, django-rest-swagger, openapi-codec
 coreschema==0.0.4         # via -r requirements/quality.txt, coreapi
 coverage==5.1             # via -r requirements/quality.txt, pytest-cov
@@ -39,8 +39,8 @@ drf-jwt==1.14.0           # via -r requirements/quality.txt, edx-drf-extensions
 edx-auth-backends==3.0.2  # via -r requirements/quality.txt
 edx-django-release-util==0.4.4  # via -r requirements/quality.txt
 edx-django-utils==3.2.2   # via -r requirements/quality.txt, edx-drf-extensions, edx-rest-api-client
-edx-drf-extensions==5.1.0  # via -r requirements/quality.txt
-edx-i18n-tools==0.5.0     # via -r requirements/dev.in
+edx-drf-extensions==6.0.0  # via -r requirements/quality.txt
+edx-i18n-tools==0.5.1     # via -r requirements/dev.in
 edx-lint==1.4.1           # via -r requirements/quality.txt
 edx-opaque-keys==2.1.0    # via -r requirements/quality.txt, edx-drf-extensions
 edx_rest_api_client==4.0.1  # via -r requirements/quality.txt
@@ -72,7 +72,7 @@ path.py==12.4.0           # via edx-i18n-tools
 path==13.1.0              # via path.py
 pathlib2==2.3.5           # via -r requirements/quality.txt, pytest
 pbr==5.4.5                # via -r requirements/quality.txt, stevedore
-pillow==6.2.2             # via -r requirements/quality.txt, wagtail
+pillow==7.1.2             # via -r requirements/quality.txt, wagtail
 pip-tools==5.1.2          # via -r requirements/pip-tools.txt
 pluggy==0.13.1            # via -r requirements/quality.txt, diff-cover, pytest, tox
 polib==1.1.0              # via edx-i18n-tools
@@ -108,6 +108,7 @@ slumber==0.7.1            # via -r requirements/quality.txt, edx-rest-api-client
 snowballstemmer==2.0.0    # via -r requirements/quality.txt, pydocstyle
 git+https://github.com/python-social-auth/social-app-django.git@c00d23c2b45c3317bd35b15ad1b959338689cef8#egg=social-auth-app-django  # via -r requirements/quality.txt, edx-auth-backends
 social-auth-core==3.2.0   # via -r requirements/quality.txt, edx-auth-backends, social-auth-app-django
+soupsieve==2.0            # via -r requirements/quality.txt, beautifulsoup4
 sqlparse==0.3.1           # via -r requirements/quality.txt, django, django-debug-toolbar
 stevedore==1.32.0         # via -r requirements/quality.txt, code-annotations, edx-opaque-keys
 text-unidecode==1.3       # via -r requirements/quality.txt, faker, python-slugify
@@ -118,11 +119,12 @@ unidecode==1.1.1          # via -r requirements/quality.txt, wagtail
 uritemplate==3.0.1        # via -r requirements/quality.txt, coreapi
 urllib3==1.25.9           # via -r requirements/quality.txt, requests
 virtualenv==20.0.20       # via -r requirements/quality.txt, tox
-wagtail==2.8.1            # via -r requirements/quality.txt
+wagtail==2.9              # via -r requirements/quality.txt
 wcwidth==0.1.9            # via -r requirements/quality.txt, pytest
 webencodings==0.5.1       # via -r requirements/quality.txt, html5lib
 willow==1.3               # via -r requirements/quality.txt, wagtail
 wrapt==1.11.2             # via -r requirements/quality.txt, astroid
+xlsxwriter==1.2.8         # via -r requirements/quality.txt, wagtail
 zipp==1.2.0               # via -r requirements/quality.txt, importlib-metadata, importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:

diff --git a/requirements/doc.txt b/requirements/doc.txt
@@ -9,13 +9,13 @@ appdirs==1.4.3            # via -r requirements/test.txt, virtualenv
 astroid==2.3.3            # via -r requirements/test.txt, pylint, pylint-celery
 attrs==19.3.0             # via -r requirements/test.txt, pytest
 babel==2.8.0              # via sphinx
-beautifulsoup4==4.6.0     # via -r requirements/test.txt, wagtail
+beautifulsoup4==4.8.2     # via -r requirements/test.txt, wagtail
 bleach==3.1.5             # via readme-renderer
 certifi==2020.4.5.1       # via -r requirements/test.txt, requests
 chardet==3.0.4            # via -r requirements/test.txt, doc8, requests
 click-log==0.3.2          # via -r requirements/test.txt, edx-lint
 click==7.1.2              # via -r requirements/test.txt, click-log, code-annotations, edx-lint
-code-annotations==0.3.3   # via -r requirements/test.txt
+code-annotations==0.3.4   # via -r requirements/test.txt
 coreapi==2.3.3            # via -r requirements/test.txt, django-rest-swagger, openapi-codec
 coreschema==0.0.4         # via -r requirements/test.txt, coreapi
 coverage==5.1             # via -r requirements/test.txt, pytest-cov
@@ -39,7 +39,7 @@ drf-jwt==1.14.0           # via -r requirements/test.txt, edx-drf-extensions
 edx-auth-backends==3.0.2  # via -r requirements/test.txt
 edx-django-release-util==0.4.4  # via -r requirements/test.txt
 edx-django-utils==3.2.2   # via -r requirements/test.txt, edx-drf-extensions, edx-rest-api-client
-edx-drf-extensions==5.1.0  # via -r requirements/test.txt
+edx-drf-extensions==6.0.0  # via -r requirements/test.txt
 edx-lint==1.4.1           # via -r requirements/test.txt
 edx-opaque-keys==2.1.0    # via -r requirements/test.txt, edx-drf-extensions
 edx-sphinx-theme==1.5.0   # via -r requirements/doc.in
@@ -70,7 +70,7 @@ openapi-codec==1.3.2      # via -r requirements/test.txt, django-rest-swagger
 packaging==20.3           # via -r requirements/test.txt, bleach, pytest, sphinx, tox
 pathlib2==2.3.5           # via -r requirements/test.txt, pytest
 pbr==5.4.5                # via -r requirements/test.txt, stevedore
-pillow==6.2.2             # via -r requirements/test.txt, wagtail
+pillow==7.1.2             # via -r requirements/test.txt, wagtail
 pluggy==0.13.1            # via -r requirements/test.txt, pytest, tox
 psutil==1.2.1             # via -r requirements/test.txt, edx-django-utils
 py==1.8.1                 # via -r requirements/test.txt, pytest, tox
@@ -104,6 +104,7 @@ slumber==0.7.1            # via -r requirements/test.txt, edx-rest-api-client
 snowballstemmer==2.0.0    # via sphinx
 git+https://github.com/python-social-auth/social-app-django.git@c00d23c2b45c3317bd35b15ad1b959338689cef8#egg=social-auth-app-django  # via -r requirements/test.txt, edx-auth-backends
 social-auth-core==3.2.0   # via -r requirements/test.txt, edx-auth-backends, social-auth-app-django
+soupsieve==2.0            # via -r requirements/test.txt, beautifulsoup4
 sphinx==3.0.3             # via -r requirements/doc.in, edx-sphinx-theme
 sphinxcontrib-applehelp==1.0.2  # via sphinx
 sphinxcontrib-devhelp==1.0.2  # via sphinx
@@ -121,11 +122,12 @@ unidecode==1.1.1          # via -r requirements/test.txt, wagtail
 uritemplate==3.0.1        # via -r requirements/test.txt, coreapi
 urllib3==1.25.9           # via -r requirements/test.txt, requests
 virtualenv==20.0.20       # via -r requirements/test.txt, tox
-wagtail==2.8.1            # via -r requirements/test.txt
+wagtail==2.9              # via -r requirements/test.txt
 wcwidth==0.1.9            # via -r requirements/test.txt, pytest
 webencodings==0.5.1       # via -r requirements/test.txt, bleach, html5lib
 willow==1.3               # via -r requirements/test.txt, wagtail
 wrapt==1.11.2             # via -r requirements/test.txt, astroid
+xlsxwriter==1.2.8         # via -r requirements/test.txt, wagtail
 zipp==1.2.0               # via -r requirements/test.txt, importlib-metadata, importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:

diff --git a/requirements/production.txt b/requirements/production.txt
@@ -4,9 +4,9 @@
 #
 #    make upgrade
 #
-beautifulsoup4==4.6.0     # via -r requirements/base.txt, wagtail
-boto3==1.13.2             # via -r requirements/production.in
-botocore==1.16.2          # via boto3, s3transfer
+beautifulsoup4==4.8.2     # via -r requirements/base.txt, wagtail
+boto3==1.13.3             # via -r requirements/production.in
+botocore==1.16.3          # via boto3, s3transfer
 certifi==2020.4.5.1       # via -r requirements/base.txt, requests
 chardet==3.0.4            # via -r requirements/base.txt, requests
 coreapi==2.3.3            # via -r requirements/base.txt, django-rest-swagger, openapi-codec
@@ -28,7 +28,7 @@ drf-jwt==1.14.0           # via -r requirements/base.txt, edx-drf-extensions
 edx-auth-backends==3.0.2  # via -r requirements/base.txt
 edx-django-release-util==0.4.4  # via -r requirements/base.txt
 edx-django-utils==3.2.2   # via -r requirements/base.txt, edx-drf-extensions, edx-rest-api-client
-edx-drf-extensions==5.1.0  # via -r requirements/base.txt
+edx-drf-extensions==6.0.0  # via -r requirements/base.txt
 edx-opaque-keys==2.1.0    # via -r requirements/base.txt, edx-drf-extensions
 edx_rest_api_client==4.0.1  # via -r requirements/base.txt
 future==0.18.2            # via -r requirements/base.txt, pyjwkest
@@ -50,7 +50,7 @@ newrelic==5.12.1.141      # via -r requirements/base.txt, edx-django-utils
 oauthlib==3.1.0           # via -r requirements/base.txt, requests-oauthlib, social-auth-core
 openapi-codec==1.3.2      # via -r requirements/base.txt, django-rest-swagger
 pbr==5.4.5                # via -r requirements/base.txt, stevedore
-pillow==6.2.2             # via -r requirements/base.txt, wagtail
+pillow==7.1.2             # via -r requirements/base.txt, wagtail
 psutil==1.2.1             # via -r requirements/base.txt, edx-django-utils
 pycryptodomex==3.9.7      # via -r requirements/base.txt, pyjwkest
 pyjwkest==1.4.2           # via -r requirements/base.txt, edx-drf-extensions
@@ -71,14 +71,16 @@ six==1.14.0               # via -r requirements/base.txt, django-extensions, dja
 slumber==0.7.1            # via -r requirements/base.txt, edx-rest-api-client
 git+https://github.com/python-social-auth/social-app-django.git@c00d23c2b45c3317bd35b15ad1b959338689cef8#egg=social-auth-app-django  # via -r requirements/base.txt, edx-auth-backends
 social-auth-core==3.2.0   # via -r requirements/base.txt, edx-auth-backends, social-auth-app-django
+soupsieve==2.0            # via -r requirements/base.txt, beautifulsoup4
 sqlparse==0.3.1           # via -r requirements/base.txt, django
 stevedore==1.32.0         # via -r requirements/base.txt, edx-opaque-keys
 unidecode==1.1.1          # via -r requirements/base.txt, wagtail
 uritemplate==3.0.1        # via -r requirements/base.txt, coreapi
 urllib3==1.25.9           # via -r requirements/base.txt, botocore, requests
-wagtail==2.8.1            # via -r requirements/base.txt
+wagtail==2.9              # via -r requirements/base.txt
 webencodings==0.5.1       # via -r requirements/base.txt, html5lib
 willow==1.3               # via -r requirements/base.txt, wagtail
+xlsxwriter==1.2.8         # via -r requirements/base.txt, wagtail
 zipp==1.2.0               # via -r requirements/base.txt, importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:

diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -9,13 +9,13 @@ argparse==1.4.0           # via caniusepython3
 astroid==2.3.3            # via -r requirements/test.txt, pylint, pylint-celery
 attrs==19.3.0             # via -r requirements/test.txt, pytest
 backports.functools-lru-cache==1.6.1  # via caniusepython3
-beautifulsoup4==4.6.0     # via -r requirements/test.txt, wagtail
+beautifulsoup4==4.8.2     # via -r requirements/test.txt, wagtail
 caniusepython3==7.2.0     # via -r requirements/quality.in
 certifi==2020.4.5.1       # via -r requirements/test.txt, requests
 chardet==3.0.4            # via -r requirements/test.txt, requests
 click-log==0.3.2          # via -r requirements/test.txt, edx-lint
 click==7.1.2              # via -r requirements/test.txt, click-log, code-annotations, edx-lint
-code-annotations==0.3.3   # via -r requirements/test.txt
+code-annotations==0.3.4   # via -r requirements/test.txt
 coreapi==2.3.3            # via -r requirements/test.txt, django-rest-swagger, openapi-codec
 coreschema==0.0.4         # via -r requirements/test.txt, coreapi
 coverage==5.1             # via -r requirements/test.txt, pytest-cov
@@ -37,7 +37,7 @@ drf-jwt==1.14.0           # via -r requirements/test.txt, edx-drf-extensions
 edx-auth-backends==3.0.2  # via -r requirements/test.txt
 edx-django-release-util==0.4.4  # via -r requirements/test.txt
 edx-django-utils==3.2.2   # via -r requirements/test.txt, edx-drf-extensions, edx-rest-api-client
-edx-drf-extensions==5.1.0  # via -r requirements/test.txt
+edx-drf-extensions==6.0.0  # via -r requirements/test.txt
 edx-lint==1.4.1           # via -r requirements/quality.in, -r requirements/test.txt
 edx-opaque-keys==2.1.0    # via -r requirements/test.txt, edx-drf-extensions
 edx_rest_api_client==4.0.1  # via -r requirements/test.txt
@@ -66,7 +66,7 @@ openapi-codec==1.3.2      # via -r requirements/test.txt, django-rest-swagger
 packaging==20.3           # via -r requirements/test.txt, caniusepython3, pytest, tox
 pathlib2==2.3.5           # via -r requirements/test.txt, pytest
 pbr==5.4.5                # via -r requirements/test.txt, stevedore
-pillow==6.2.2             # via -r requirements/test.txt, wagtail
+pillow==7.1.2             # via -r requirements/test.txt, wagtail
 pluggy==0.13.1            # via -r requirements/test.txt, pytest, tox
 psutil==1.2.1             # via -r requirements/test.txt, edx-django-utils
 py==1.8.1                 # via -r requirements/test.txt, pytest, tox
@@ -99,6 +99,7 @@ slumber==0.7.1            # via -r requirements/test.txt, edx-rest-api-client
 snowballstemmer==2.0.0    # via pydocstyle
 git+https://github.com/python-social-auth/social-app-django.git@c00d23c2b45c3317bd35b15ad1b959338689cef8#egg=social-auth-app-django  # via -r requirements/test.txt, edx-auth-backends
 social-auth-core==3.2.0   # via -r requirements/test.txt, edx-auth-backends, social-auth-app-django
+soupsieve==2.0            # via -r requirements/test.txt, beautifulsoup4
 sqlparse==0.3.1           # via -r requirements/test.txt, django
 stevedore==1.32.0         # via -r requirements/test.txt, code-annotations, edx-opaque-keys
 text-unidecode==1.3       # via -r requirements/test.txt, faker, python-slugify
@@ -109,11 +110,12 @@ unidecode==1.1.1          # via -r requirements/test.txt, wagtail
 uritemplate==3.0.1        # via -r requirements/test.txt, coreapi
 urllib3==1.25.9           # via -r requirements/test.txt, requests
 virtualenv==20.0.20       # via -r requirements/test.txt, tox
-wagtail==2.8.1            # via -r requirements/test.txt
+wagtail==2.9              # via -r requirements/test.txt
 wcwidth==0.1.9            # via -r requirements/test.txt, pytest
 webencodings==0.5.1       # via -r requirements/test.txt, html5lib
 willow==1.3               # via -r requirements/test.txt, wagtail
 wrapt==1.11.2             # via -r requirements/test.txt, astroid
+xlsxwriter==1.2.8         # via -r requirements/test.txt, wagtail
 zipp==1.2.0               # via -r requirements/test.txt, importlib-metadata, importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file: