Switch edx-analytics-data-api from nose to pytest (openedx-unsupporte…

…d#299)

Move nose tests to pytest. https://openedx.atlassian.net/projects/BOM/issues/BOM-1359

Packages removed:

nose-exclude==0.5.0
nose-ignore-docstring==0.2
nose==1.3.7
django-nose==1.4.4

New packages:

packaging==20.1 # via pytest
pyparsing==2.4.6 # via packaging
pytest-cov==2.8.1 # via -r requirements/test.in
pytest-django==3.8.0 # via -r requirements/test.in
pytest==4.6.9 # via pytest-cov, pytest-django

Makefile

@@ -4,7 +4,6 @@ PACKAGES = analyticsdataserver analytics_data_api
 DATABASES = default analytics
 ELASTICSEARCH_VERSION = 1.5.2
 ELASTICSEARCH_PORT = 9223
-TEST_SETTINGS = analyticsdataserver.settings.test
 
 .PHONY: requirements develop clean diff.report view.diff.report quality static
 
@@ -51,8 +50,7 @@ clean:
 
 test: clean
 	if [ -e elasticsearch-$(ELASTICSEARCH_VERSION) ]; then curl --silent --head http://localhost:$(ELASTICSEARCH_PORT)/roster_test > /dev/null || make test.run_elasticsearch; fi  # Launch ES if installed and not running
-	coverage run ./manage.py test --settings=$(TEST_SETTINGS) \
-		--with-ignore-docstrings --exclude-dir=analyticsdataserver/settings \
+	coverage run -m pytest --ignore=analyticsdataserver/settings \
 		$(PACKAGES)
 	export COVERAGE_DIR=$(COVERAGE_DIR) && \
 		coverage html && \

analyticsdataserver/settings/test.py

@@ -17,16 +17,10 @@
 # Silence elasticsearch during tests
 LOGGING['loggers']['elasticsearch']['handlers'] = ['null']
 
-INSTALLED_APPS += (
-    'django_nose',
-)
-
 LMS_BASE_URL = 'http://lms-host'
 
 LMS_USER_ACCOUNT_BASE_URL = 'http://lms-host'
 
-TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
-
 # Default elasticsearch port when running locally
 ELASTICSEARCH_LEARNERS_HOST = environ.get("ELASTICSEARCH_LEARNERS_HOST", 'http://localhost:9223/')
 ELASTICSEARCH_LEARNERS_INDEX = 'roster_test'

pytest.ini

@@ -0,0 +1,2 @@
+[pytest]
+DJANGO_SETTINGS_MODULE = analyticsdataserver.settings.test

requirements/base.txt

@@ -10,7 +10,7 @@ awscli==1.11.178          # via edx-enterprise-data
 bcrypt==3.1.7             # via edx-enterprise-data, paramiko
 billiard==3.3.0.23        # via celery, edx-enterprise-data
 boto3==1.4.7              # via edx-enterprise-data
-boto==2.42.0
+boto==2.42.0              # via -r requirements/base.in
 botocore==1.7.36          # via awscli, boto3, edx-enterprise-data, s3transfer
 celery==3.1.18            # via edx-enterprise-data
 certifi==2019.11.28       # via edx-enterprise-data, py2neo, requests
@@ -23,28 +23,28 @@ contextlib2==0.6.0.post1  # via edx-enterprise-data, importlib-metadata
 coreapi==2.3.3            # via django-rest-swagger, openapi-codec
 coreschema==0.0.4         # via coreapi
 cryptography==2.8         # via django-fernet-fields, edx-enterprise-data, paramiko, pgpy, pyopenssl
-django-cors-headers==3.0.2
-django-countries==4.5
+django-cors-headers==3.0.2  # via -r requirements/base.in
+django-countries==4.5     # via -r requirements/base.in
 django-crum==0.7.5        # via edx-enterprise-data, edx-rbac
 django-fernet-fields==0.5  # via edx-enterprise-data
 django-model-utils==3.2.0  # via edx-enterprise-data, edx-rbac
-django-rest-swagger==2.2.0
-django-storages==1.8
+django-rest-swagger==2.2.0  # via -r requirements/base.in
+django-storages==1.8      # via -r requirements/base.in
 django-waffle==0.18.0     # via edx-django-utils, edx-drf-extensions, edx-enterprise-data
-django==1.11.27
-djangorestframework-csv==2.1.0
+django==1.11.27           # via -r requirements/base.in, django-cors-headers, django-crum, django-fernet-fields, django-model-utils, django-storages, edx-django-release-util, edx-django-utils, edx-drf-extensions, edx-enterprise-data, edx-rbac, rest-condition
+djangorestframework-csv==2.1.0  # via -r requirements/base.in
 djangorestframework-jwt==1.11.0  # via edx-drf-extensions, edx-enterprise-data
-djangorestframework==3.9.4
+djangorestframework==3.9.4  # via -r requirements/base.in, django-rest-swagger, djangorestframework-csv, edx-drf-extensions, edx-enterprise-data, rest-condition
 docutils==0.15.2          # via awscli, botocore, edx-enterprise-data
-edx-ccx-keys==1.0.0
-edx-django-release-util==0.3.6
-edx-django-utils==2.0.2
-edx-drf-extensions==2.4.5
-edx-enterprise-data==1.3.13
-edx-opaque-keys==2.0.1
+edx-ccx-keys==1.0.0       # via -r requirements/base.in
+edx-django-release-util==0.3.6  # via -r requirements/base.in
+edx-django-utils==2.0.2   # via -r requirements/base.in, edx-drf-extensions, edx-enterprise-data
+edx-drf-extensions==2.4.5  # via -r requirements/base.in, edx-enterprise-data, edx-rbac
+edx-enterprise-data==1.3.13  # via -r requirements/base.in
+edx-opaque-keys==2.0.1    # via -r requirements/base.in, edx-ccx-keys, edx-drf-extensions, edx-enterprise-data
 edx-rbac==1.0.5           # via edx-enterprise-data
-edx-rest-api-client==1.9.2
-elasticsearch-dsl==0.0.11
+edx-rest-api-client==1.9.2  # via -r requirements/base.in, edx-enterprise-data
+elasticsearch-dsl==0.0.11  # via -r requirements/base.in
 elasticsearch==1.9.0      # via elasticsearch-dsl
 enum34==1.1.6             # via cryptography, edx-enterprise-data, pgpy
 future==0.18.2            # via edx-enterprise-data, pyjwkest, vertica-python
@@ -56,14 +56,14 @@ itypes==1.1.0             # via coreapi
 jinja2==2.11.1            # via coreschema
 jmespath==0.9.4           # via boto3, botocore, edx-enterprise-data
 kombu==3.0.37             # via celery, edx-enterprise-data
-markdown==2.6.6
+markdown==2.6.6           # via -r requirements/base.in
 markupsafe==1.1.1         # via jinja2
 more-itertools==5.0.0     # via edx-enterprise-data, zipp
 neobolt==1.7.16           # via edx-enterprise-data, py2neo
 neotime==1.7.4            # via edx-enterprise-data, py2neo
 newrelic==5.4.1.134       # via edx-django-utils, edx-enterprise-data
 openapi-codec==1.3.2      # via django-rest-swagger
-ordered-set==2.0.2
+ordered-set==2.0.2        # via -r requirements/base.in
 paramiko==2.4             # via edx-enterprise-data
 pathlib2==2.3.5           # via edx-enterprise-data, importlib-metadata
 pbr==5.4.4                # via edx-enterprise-data, stevedore
@@ -85,7 +85,7 @@ pymongo==3.10.0           # via edx-enterprise-data, edx-opaque-keys
 pynacl==1.3.0             # via edx-enterprise-data, paramiko
 pyopenssl==17.4.0         # via edx-enterprise-data
 python-dateutil==2.8.1    # via botocore, edx-drf-extensions, edx-enterprise-data, elasticsearch-dsl, vertica-python
-python-memcached==1.59
+python-memcached==1.59    # via -r requirements/base.in
 pytz==2019.3              # via celery, django, edx-enterprise-data, neotime, py2neo, vertica-python
 pyyaml==3.12              # via awscli, edx-django-release-util, edx-enterprise-data
 requests==2.22.0          # via coreapi, edx-drf-extensions, edx-enterprise-data, edx-rest-api-client, pyjwkest, slumber
@@ -101,10 +101,10 @@ six==1.10.0               # via bcrypt, cryptography, djangorestframework-csv, e
 slumber==0.7.1            # via edx-enterprise-data, edx-rest-api-client
 stevedore==1.31.0         # via edx-enterprise-data, edx-opaque-keys
 tox==3.0.0                # via edx-enterprise-data
-tqdm==4.11.2
+tqdm==4.11.2              # via -r requirements/base.in
 unicodecsv==0.14.1        # via djangorestframework-csv, edx-enterprise-data
 uritemplate==3.0.1        # via coreapi
-urllib3==1.24.3
+urllib3==1.24.3           # via -r requirements/base.in, edx-enterprise-data, elasticsearch, py2neo, requests
 vertica-python==0.7.3     # via edx-enterprise-data
 virtualenv==16.7.9        # via edx-enterprise-data, tox
 wcwidth==0.1.7            # via edx-enterprise-data, prompt-toolkit

requirements/dev.txt

@@ -10,7 +10,7 @@ awscli==1.11.178          # via edx-enterprise-data
 bcrypt==3.1.7             # via edx-enterprise-data, paramiko
 billiard==3.3.0.23        # via celery, edx-enterprise-data
 boto3==1.4.7              # via edx-enterprise-data
-boto==2.42.0
+boto==2.42.0              # via -r requirements/base.in
 botocore==1.7.36          # via awscli, boto3, edx-enterprise-data, s3transfer
 celery==3.1.18            # via edx-enterprise-data
 certifi==2019.11.28       # via edx-enterprise-data, py2neo, requests
@@ -23,28 +23,28 @@ contextlib2==0.6.0.post1  # via edx-enterprise-data, importlib-metadata
 coreapi==2.3.3            # via django-rest-swagger, openapi-codec
 coreschema==0.0.4         # via coreapi
 cryptography==2.8         # via django-fernet-fields, edx-enterprise-data, paramiko, pgpy, pyopenssl
-django-cors-headers==3.0.2
-django-countries==4.5
+django-cors-headers==3.0.2  # via -r requirements/base.in
+django-countries==4.5     # via -r requirements/base.in
 django-crum==0.7.5        # via edx-enterprise-data, edx-rbac
 django-fernet-fields==0.5  # via edx-enterprise-data
 django-model-utils==3.2.0  # via edx-enterprise-data, edx-rbac
-django-rest-swagger==2.2.0
-django-storages==1.8
+django-rest-swagger==2.2.0  # via -r requirements/base.in
+django-storages==1.8      # via -r requirements/base.in
 django-waffle==0.18.0     # via edx-django-utils, edx-drf-extensions, edx-enterprise-data
-django==1.11.27
-djangorestframework-csv==2.1.0
+django==1.11.27           # via -r requirements/base.in, django-cors-headers, django-crum, django-fernet-fields, django-model-utils, django-storages, edx-django-release-util, edx-django-utils, edx-drf-extensions, edx-enterprise-data, edx-rbac, rest-condition
+djangorestframework-csv==2.1.0  # via -r requirements/base.in
 djangorestframework-jwt==1.11.0  # via edx-drf-extensions, edx-enterprise-data
-djangorestframework==3.9.4
+djangorestframework==3.9.4  # via -r requirements/base.in, django-rest-swagger, djangorestframework-csv, edx-drf-extensions, edx-enterprise-data, rest-condition
 docutils==0.15.2          # via awscli, botocore, edx-enterprise-data
-edx-ccx-keys==1.0.0
-edx-django-release-util==0.3.6
-edx-django-utils==2.0.2
-edx-drf-extensions==2.4.5
-edx-enterprise-data==1.3.13
-edx-opaque-keys==2.0.1
+edx-ccx-keys==1.0.0       # via -r requirements/base.in
+edx-django-release-util==0.3.6  # via -r requirements/base.in
+edx-django-utils==2.0.2   # via -r requirements/base.in, edx-drf-extensions, edx-enterprise-data
+edx-drf-extensions==2.4.5  # via -r requirements/base.in, edx-enterprise-data, edx-rbac
+edx-enterprise-data==1.3.13  # via -r requirements/base.in
+edx-opaque-keys==2.0.1    # via -r requirements/base.in, edx-ccx-keys, edx-drf-extensions, edx-enterprise-data
 edx-rbac==1.0.5           # via edx-enterprise-data
-edx-rest-api-client==1.9.2
-elasticsearch-dsl==0.0.11
+edx-rest-api-client==1.9.2  # via -r requirements/base.in, edx-enterprise-data
+elasticsearch-dsl==0.0.11  # via -r requirements/base.in
 elasticsearch==1.9.0      # via elasticsearch-dsl
 enum34==1.1.6             # via cryptography, edx-enterprise-data, pgpy
 future==0.18.2            # via edx-enterprise-data, pyjwkest, vertica-python
@@ -56,14 +56,14 @@ itypes==1.1.0             # via coreapi
 jinja2==2.11.1            # via coreschema
 jmespath==0.9.4           # via boto3, botocore, edx-enterprise-data
 kombu==3.0.37             # via celery, edx-enterprise-data
-markdown==2.6.6
+markdown==2.6.6           # via -r requirements/base.in
 markupsafe==1.1.1         # via jinja2
 more-itertools==5.0.0     # via edx-enterprise-data, zipp
 neobolt==1.7.16           # via edx-enterprise-data, py2neo
 neotime==1.7.4            # via edx-enterprise-data, py2neo
 newrelic==5.4.1.134       # via edx-django-utils, edx-enterprise-data
 openapi-codec==1.3.2      # via django-rest-swagger
-ordered-set==2.0.2
+ordered-set==2.0.2        # via -r requirements/base.in
 paramiko==2.4             # via edx-enterprise-data
 pathlib2==2.3.5           # via edx-enterprise-data, importlib-metadata
 pbr==5.4.4                # via edx-enterprise-data, stevedore
@@ -85,7 +85,7 @@ pymongo==3.10.0           # via edx-enterprise-data, edx-opaque-keys
 pynacl==1.3.0             # via edx-enterprise-data, paramiko
 pyopenssl==17.4.0         # via edx-enterprise-data
 python-dateutil==2.8.1    # via botocore, edx-drf-extensions, edx-enterprise-data, elasticsearch-dsl, vertica-python
-python-memcached==1.59
+python-memcached==1.59    # via -r requirements/base.in
 pytz==2019.3              # via celery, django, edx-enterprise-data, neotime, py2neo, vertica-python
 pyyaml==3.12              # via awscli, edx-django-release-util, edx-enterprise-data
 requests==2.22.0          # via coreapi, edx-drf-extensions, edx-enterprise-data, edx-rest-api-client, pyjwkest, slumber
@@ -101,10 +101,10 @@ six==1.10.0               # via bcrypt, cryptography, djangorestframework-csv, e
 slumber==0.7.1            # via edx-enterprise-data, edx-rest-api-client
 stevedore==1.31.0         # via edx-enterprise-data, edx-opaque-keys
 tox==3.0.0                # via edx-enterprise-data
-tqdm==4.11.2
+tqdm==4.11.2              # via -r requirements/base.in
 unicodecsv==0.14.1        # via djangorestframework-csv, edx-enterprise-data
 uritemplate==3.0.1        # via coreapi
-urllib3==1.24.3
+urllib3==1.24.3           # via -r requirements/base.in, edx-enterprise-data, elasticsearch, py2neo, requests
 vertica-python==0.7.3     # via edx-enterprise-data
 virtualenv==16.7.9        # via edx-enterprise-data, tox
 wcwidth==0.1.7            # via edx-enterprise-data, prompt-toolkit

requirements/doc.txt

@@ -10,7 +10,7 @@ awscli==1.11.178          # via edx-enterprise-data
 bcrypt==3.1.7             # via edx-enterprise-data, paramiko
 billiard==3.3.0.23        # via celery, edx-enterprise-data
 boto3==1.4.7              # via edx-enterprise-data
-boto==2.42.0
+boto==2.42.0              # via -r requirements/base.in
 botocore==1.7.36          # via awscli, boto3, edx-enterprise-data, s3transfer
 celery==3.1.18            # via edx-enterprise-data
 certifi==2019.11.28       # via edx-enterprise-data, py2neo, requests
@@ -23,28 +23,28 @@ contextlib2==0.6.0.post1  # via edx-enterprise-data, importlib-metadata
 coreapi==2.3.3            # via django-rest-swagger, openapi-codec
 coreschema==0.0.4         # via coreapi
 cryptography==2.8         # via django-fernet-fields, edx-enterprise-data, paramiko, pgpy, pyopenssl
-django-cors-headers==3.0.2
-django-countries==4.5
+django-cors-headers==3.0.2  # via -r requirements/base.in
+django-countries==4.5     # via -r requirements/base.in
 django-crum==0.7.5        # via edx-enterprise-data, edx-rbac
 django-fernet-fields==0.5  # via edx-enterprise-data
 django-model-utils==3.2.0  # via edx-enterprise-data, edx-rbac
-django-rest-swagger==2.2.0
-django-storages==1.8
+django-rest-swagger==2.2.0  # via -r requirements/base.in
+django-storages==1.8      # via -r requirements/base.in
 django-waffle==0.18.0     # via edx-django-utils, edx-drf-extensions, edx-enterprise-data
-django==1.11.27
-djangorestframework-csv==2.1.0
+django==1.11.27           # via -r requirements/base.in, django-cors-headers, django-crum, django-fernet-fields, django-model-utils, django-storages, edx-django-release-util, edx-django-utils, edx-drf-extensions, edx-enterprise-data, edx-rbac, rest-condition
+djangorestframework-csv==2.1.0  # via -r requirements/base.in
 djangorestframework-jwt==1.11.0  # via edx-drf-extensions, edx-enterprise-data
-djangorestframework==3.9.4
+djangorestframework==3.9.4  # via -r requirements/base.in, django-rest-swagger, djangorestframework-csv, edx-drf-extensions, edx-enterprise-data, rest-condition
 docutils==0.15.2          # via awscli, botocore, edx-enterprise-data, sphinx
-edx-ccx-keys==1.0.0
-edx-django-release-util==0.3.6
-edx-django-utils==2.0.2
-edx-drf-extensions==2.4.5
-edx-enterprise-data==1.3.13
-edx-opaque-keys==2.0.1
+edx-ccx-keys==1.0.0       # via -r requirements/base.in
+edx-django-release-util==0.3.6  # via -r requirements/base.in
+edx-django-utils==2.0.2   # via -r requirements/base.in, edx-drf-extensions, edx-enterprise-data
+edx-drf-extensions==2.4.5  # via -r requirements/base.in, edx-enterprise-data, edx-rbac
+edx-enterprise-data==1.3.13  # via -r requirements/base.in
+edx-opaque-keys==2.0.1    # via -r requirements/base.in, edx-ccx-keys, edx-drf-extensions, edx-enterprise-data
 edx-rbac==1.0.5           # via edx-enterprise-data
-edx-rest-api-client==1.9.2
-elasticsearch-dsl==0.0.11
+edx-rest-api-client==1.9.2  # via -r requirements/base.in, edx-enterprise-data
+elasticsearch-dsl==0.0.11  # via -r requirements/base.in
 elasticsearch==1.9.0      # via elasticsearch-dsl
 enum34==1.1.6             # via cryptography, edx-enterprise-data, pgpy
 future==0.18.2            # via edx-enterprise-data, pyjwkest, vertica-python
@@ -53,17 +53,17 @@ idna==2.8                 # via edx-enterprise-data, requests
 importlib-metadata==1.3.0  # via edx-enterprise-data, pluggy
 ipaddress==1.0.23         # via cryptography, edx-enterprise-data
 itypes==1.1.0             # via coreapi
-jinja2==2.11.1            # via coreschema, sphinx
+jinja2==2.11.1            # via sphinx
 jmespath==0.9.4           # via boto3, botocore, edx-enterprise-data
 kombu==3.0.37             # via celery, edx-enterprise-data
-markdown==2.6.6
+markdown==2.6.6           # via -r requirements/base.in
 markupsafe==1.1.1         # via jinja2
 more-itertools==5.0.0     # via edx-enterprise-data, zipp
 neobolt==1.7.16           # via edx-enterprise-data, py2neo
 neotime==1.7.4            # via edx-enterprise-data, py2neo
 newrelic==5.4.1.134       # via edx-django-utils, edx-enterprise-data
 openapi-codec==1.3.2      # via django-rest-swagger
-ordered-set==2.0.2
+ordered-set==2.0.2        # via -r requirements/base.in
 paramiko==2.4             # via edx-enterprise-data
 pathlib2==2.3.5           # via edx-enterprise-data, importlib-metadata
 pbr==5.4.4                # via edx-enterprise-data, stevedore
@@ -85,7 +85,7 @@ pymongo==3.10.0           # via edx-enterprise-data, edx-opaque-keys
 pynacl==1.3.0             # via edx-enterprise-data, paramiko
 pyopenssl==17.4.0         # via edx-enterprise-data
 python-dateutil==2.8.1    # via botocore, edx-drf-extensions, edx-enterprise-data, elasticsearch-dsl, vertica-python
-python-memcached==1.59
+python-memcached==1.59    # via -r requirements/base.in
 pytz==2019.3              # via celery, django, edx-enterprise-data, neotime, py2neo, vertica-python
 pyyaml==3.12              # via awscli, edx-django-release-util, edx-enterprise-data
 requests==2.22.0          # via coreapi, edx-drf-extensions, edx-enterprise-data, edx-rest-api-client, pyjwkest, slumber
@@ -99,13 +99,13 @@ simplejson==3.17.0        # via django-rest-swagger
 singledispatch==3.4.0.3   # via edx-enterprise-data, pgpy
 six==1.10.0               # via bcrypt, cryptography, djangorestframework-csv, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise-data, edx-opaque-keys, edx-rbac, elasticsearch-dsl, more-itertools, neotime, pathlib2, pgpy, pip-tools, prompt-toolkit, pyjwkest, pynacl, pyopenssl, python-dateutil, python-memcached, singledispatch, stevedore, tox, vertica-python
 slumber==0.7.1            # via edx-enterprise-data, edx-rest-api-client
-sphinx==1.2.1
+sphinx==1.2.1             # via -r requirements/doc.in
 stevedore==1.31.0         # via edx-enterprise-data, edx-opaque-keys
 tox==3.0.0                # via edx-enterprise-data
-tqdm==4.11.2
+tqdm==4.11.2              # via -r requirements/base.in
 unicodecsv==0.14.1        # via djangorestframework-csv, edx-enterprise-data
 uritemplate==3.0.1        # via coreapi
-urllib3==1.24.3
+urllib3==1.24.3           # via -r requirements/base.in, edx-enterprise-data, elasticsearch, py2neo, requests
 vertica-python==0.7.3     # via edx-enterprise-data
 virtualenv==16.7.9        # via edx-enterprise-data, tox
 wcwidth==0.1.7            # via edx-enterprise-data, prompt-toolkit

requirements/pip_tools.txt

@@ -5,5 +5,5 @@
 #    make upgrade
 #
 click==7.0                # via pip-tools
-pip-tools==4.4.1
-six==1.10.0
+pip-tools==4.5.1          # via -r requirements/pip_tools.in
+six==1.10.0               # via -r requirements/pip_tools.in, pip-tools