OeX_ES-28: updates requirements and testing with ES command

Makefile

@@ -29,7 +29,7 @@ test.run_elasticsearch:
 test.stop_elasticsearch:
 	docker-compose stop
 
-test: clean test.run_elasticsearch
+test_with_es: clean test.run_elasticsearch
 	coverage run --source='.' manage.py test
 	make test.stop_elasticsearch
 

requirements/base.txt

@@ -4,11 +4,12 @@
 #
 #    make upgrade
 #
-django==2.2.14            # via -r requirements/base.in, event-tracking
-elasticsearch==1.9.0      # via -r requirements/base.in
+certifi==2020.6.20        # via elasticsearch
+django==2.2.15            # via -r requirements/base.in, event-tracking
+elasticsearch==7.8.1      # via -r requirements/base.in
 event-tracking==0.3.3     # via -r requirements/base.in
-pymongo==3.10.1           # via event-tracking
+pymongo==3.11.0           # via event-tracking
 pytz==2020.1              # via django, event-tracking
 six==1.15.0               # via event-tracking
 sqlparse==0.3.1           # via django
-urllib3==1.25.9           # via elasticsearch
+urllib3==1.25.10          # via elasticsearch

requirements/dev.txt

@@ -7,52 +7,52 @@
 appdirs==1.4.4            # via -r requirements/travis.txt, virtualenv
 astroid==2.3.3            # via -r requirements/quality.txt, pylint, pylint-celery
 attrs==19.3.0             # via -r requirements/quality.txt, -r requirements/testing.txt, pytest
-certifi==2020.6.20        # via -r requirements/travis.txt, requests
+certifi==2020.6.20        # via -r requirements/quality.txt, -r requirements/testing.txt, -r requirements/travis.txt, elasticsearch, requests
 chardet==3.0.4            # via -r requirements/travis.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, edx-lint, pip-tools
 codecov==2.1.8            # via -r requirements/travis.txt
 coverage==5.0.4           # via -c requirements/constraints.txt, -r requirements/quality.txt, -r requirements/testing.txt, -r requirements/travis.txt, codecov, pytest-cov
 ddt==1.3.1                # via -c requirements/constraints.txt, -r requirements/quality.txt, -r requirements/testing.txt
 distlib==0.3.1            # via -r requirements/travis.txt, virtualenv
-django==2.2.14            # via -r requirements/quality.txt, -r requirements/testing.txt, event-tracking
+django==2.2.15            # via -r requirements/quality.txt, -r requirements/testing.txt, event-tracking
 edx-lint==1.5.0           # via -r requirements/quality.txt
-elasticsearch==1.9.0      # via -r requirements/quality.txt, -r requirements/testing.txt
+elasticsearch==7.8.1      # via -r requirements/quality.txt, -r requirements/testing.txt
 event-tracking==0.3.3     # via -r requirements/quality.txt, -r requirements/testing.txt
 filelock==3.0.12          # via -r requirements/travis.txt, tox, virtualenv
 idna==2.10                # via -r requirements/travis.txt, requests
 importlib-metadata==1.7.0  # via -r requirements/quality.txt, -r requirements/testing.txt, -r requirements/travis.txt, pluggy, pytest, tox, virtualenv
 importlib-resources==3.0.0  # via -r requirements/travis.txt, virtualenv
+iniconfig==1.0.1          # via -r requirements/quality.txt, -r requirements/testing.txt, pytest
 isort==4.3.21             # via -r requirements/quality.txt, pylint
 lazy-object-proxy==1.4.3  # via -r requirements/quality.txt, astroid
 mccabe==0.6.1             # via -r requirements/quality.txt, pylint
 mock==3.0.5               # via -r requirements/quality.txt, -r requirements/testing.txt
 more-itertools==8.4.0     # via -r requirements/quality.txt, -r requirements/testing.txt, pytest
 packaging==20.4           # via -r requirements/quality.txt, -r requirements/testing.txt, -r requirements/travis.txt, pytest, tox
 pathlib2==2.3.5           # via -r requirements/quality.txt, -r requirements/testing.txt, pytest
-pip-tools==5.2.1          # via -r requirements/pip-tools.txt
+pip-tools==5.3.1          # via -r requirements/pip-tools.txt
 pluggy==0.13.1            # via -r requirements/quality.txt, -r requirements/testing.txt, -r requirements/travis.txt, pytest, tox
 py==1.9.0                 # via -r requirements/quality.txt, -r requirements/testing.txt, -r requirements/travis.txt, pytest, tox
 pycodestyle==2.6.0        # via -r requirements/quality.txt
 pylint-celery==0.3        # via -r requirements/quality.txt, edx-lint
 pylint-django==2.0.11     # via -r requirements/quality.txt, edx-lint
 pylint-plugin-utils==0.6  # via -r requirements/quality.txt, pylint-celery, pylint-django
 pylint==2.4.4             # via -r requirements/quality.txt, edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
-pymongo==3.10.1           # via -r requirements/quality.txt, -r requirements/testing.txt, event-tracking
+pymongo==3.11.0           # via -r requirements/quality.txt, -r requirements/testing.txt, event-tracking
 pyparsing==2.4.7          # via -r requirements/quality.txt, -r requirements/testing.txt, -r requirements/travis.txt, packaging
 pytest-cov==2.10.0        # via -r requirements/quality.txt, -r requirements/testing.txt
-pytest==5.4.3             # via -r requirements/quality.txt, -r requirements/testing.txt, pytest-cov
+pytest==6.0.1             # via -r requirements/quality.txt, -r requirements/testing.txt, pytest-cov
 pytz==2020.1              # via -r requirements/quality.txt, -r requirements/testing.txt, django, event-tracking
 requests==2.24.0          # via -r requirements/travis.txt, codecov
 six==1.15.0               # via -r requirements/pip-tools.txt, -r requirements/quality.txt, -r requirements/testing.txt, -r requirements/travis.txt, astroid, edx-lint, event-tracking, mock, packaging, pathlib2, pip-tools, tox, virtualenv
 sqlparse==0.3.1           # via -r requirements/quality.txt, -r requirements/testing.txt, django
-toml==0.10.1              # via -r requirements/travis.txt, tox
-tox-battery==0.5.2        # via -c requirements/constraints.txt, -r requirements/travis.txt
-tox==3.17.1               # via -r requirements/travis.txt, tox-battery
+toml==0.10.1              # via -r requirements/quality.txt, -r requirements/testing.txt, -r requirements/travis.txt, pytest, tox
+tox-battery==0.6.1        # via -c requirements/constraints.txt, -r requirements/travis.txt
+tox==3.18.1               # via -r requirements/travis.txt, tox-battery
 typed-ast==1.4.1          # via -r requirements/quality.txt, astroid
-urllib3==1.25.9           # via -r requirements/quality.txt, -r requirements/testing.txt, -r requirements/travis.txt, elasticsearch, requests
-virtualenv==20.0.27       # via -r requirements/travis.txt, tox
-wcwidth==0.2.5            # via -r requirements/quality.txt, -r requirements/testing.txt, pytest
+urllib3==1.25.10          # via -r requirements/quality.txt, -r requirements/testing.txt, -r requirements/travis.txt, elasticsearch, requests
+virtualenv==20.0.29       # via -r requirements/travis.txt, tox
 wrapt==1.11.2             # via -r requirements/quality.txt, astroid
 zipp==1.2.0               # via -r requirements/quality.txt, -r requirements/testing.txt, -r requirements/travis.txt, importlib-metadata, importlib-resources
 

requirements/pip-tools.txt

@@ -5,7 +5,7 @@
 #    make upgrade
 #
 click==7.1.2              # via pip-tools
-pip-tools==5.2.1          # via -r requirements/pip-tools.in
+pip-tools==5.3.1          # via -r requirements/pip-tools.in
 six==1.15.0               # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/quality.txt

@@ -6,15 +6,17 @@
 #
 astroid==2.3.3            # via pylint, pylint-celery
 attrs==19.3.0             # via -r requirements/testing.txt, pytest
+certifi==2020.6.20        # via -r requirements/testing.txt, elasticsearch
 click-log==0.3.2          # via edx-lint
 click==7.1.2              # via click-log, edx-lint
 coverage==5.0.4           # via -c requirements/constraints.txt, -r requirements/quality.in, -r requirements/testing.txt, pytest-cov
 ddt==1.3.1                # via -c requirements/constraints.txt, -r requirements/testing.txt
-django==2.2.14            # via -r requirements/testing.txt, event-tracking
+django==2.2.15            # via -r requirements/testing.txt, event-tracking
 edx-lint==1.5.0           # via -r requirements/quality.in
-elasticsearch==1.9.0      # via -r requirements/testing.txt
+elasticsearch==7.8.1      # via -r requirements/testing.txt
 event-tracking==0.3.3     # via -r requirements/testing.txt
 importlib-metadata==1.7.0  # via -r requirements/testing.txt, pluggy, pytest
+iniconfig==1.0.1          # via -r requirements/testing.txt, pytest
 isort==4.3.21             # via pylint
 lazy-object-proxy==1.4.3  # via astroid
 mccabe==0.6.1             # via pylint
@@ -29,15 +31,15 @@ pylint-celery==0.3        # via edx-lint
 pylint-django==2.0.11     # via edx-lint
 pylint-plugin-utils==0.6  # via pylint-celery, pylint-django
 pylint==2.4.4             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
-pymongo==3.10.1           # via -r requirements/testing.txt, event-tracking
+pymongo==3.11.0           # via -r requirements/testing.txt, event-tracking
 pyparsing==2.4.7          # via -r requirements/testing.txt, packaging
 pytest-cov==2.10.0        # via -r requirements/testing.txt
-pytest==5.4.3             # via -r requirements/testing.txt, pytest-cov
+pytest==6.0.1             # via -r requirements/testing.txt, pytest-cov
 pytz==2020.1              # via -r requirements/testing.txt, django, event-tracking
 six==1.15.0               # via -r requirements/testing.txt, astroid, edx-lint, event-tracking, mock, packaging, pathlib2
 sqlparse==0.3.1           # via -r requirements/testing.txt, django
+toml==0.10.1              # via -r requirements/testing.txt, pytest
 typed-ast==1.4.1          # via astroid
-urllib3==1.25.9           # via -r requirements/testing.txt, elasticsearch
-wcwidth==0.2.5            # via -r requirements/testing.txt, pytest
+urllib3==1.25.10          # via -r requirements/testing.txt, elasticsearch
 wrapt==1.11.2             # via astroid
 zipp==1.2.0               # via -r requirements/testing.txt, importlib-metadata

requirements/testing.txt

@@ -5,24 +5,26 @@
 #    make upgrade
 #
 attrs==19.3.0             # via pytest
+certifi==2020.6.20        # via -r requirements/base.txt, elasticsearch
 coverage==5.0.4           # via -c requirements/constraints.txt, -r requirements/testing.in, pytest-cov
 ddt==1.3.1                # via -c requirements/constraints.txt, -r requirements/testing.in
-elasticsearch==1.9.0      # via -r requirements/base.txt
+elasticsearch==7.8.1      # via -r requirements/base.txt
 event-tracking==0.3.3     # via -r requirements/base.txt
 importlib-metadata==1.7.0  # via pluggy, pytest
+iniconfig==1.0.1          # via pytest
 mock==3.0.5               # via -r requirements/testing.in
 more-itertools==8.4.0     # via pytest
 packaging==20.4           # via pytest
 pathlib2==2.3.5           # via pytest
 pluggy==0.13.1            # via pytest
 py==1.9.0                 # via pytest
-pymongo==3.10.1           # via -r requirements/base.txt, event-tracking
+pymongo==3.11.0           # via -r requirements/base.txt, event-tracking
 pyparsing==2.4.7          # via packaging
 pytest-cov==2.10.0        # via -r requirements/testing.in
-pytest==5.4.3             # via pytest-cov
+pytest==6.0.1             # via pytest-cov
 pytz==2020.1              # via -r requirements/base.txt, django, event-tracking
 six==1.15.0               # via -r requirements/base.txt, event-tracking, mock, packaging, pathlib2
 sqlparse==0.3.1           # via -r requirements/base.txt, django
-urllib3==1.25.9           # via -r requirements/base.txt, elasticsearch
-wcwidth==0.2.5            # via pytest
+toml==0.10.1              # via pytest
+urllib3==1.25.10          # via -r requirements/base.txt, elasticsearch
 zipp==1.2.0               # via importlib-metadata

requirements/travis.txt

@@ -21,8 +21,8 @@ pyparsing==2.4.7          # via packaging
 requests==2.24.0          # via codecov
 six==1.15.0               # via packaging, tox, virtualenv
 toml==0.10.1              # via tox
-tox-battery==0.5.2        # via -c requirements/constraints.txt, -r requirements/travis.in
-tox==3.17.1               # via -r requirements/travis.in, tox-battery
-urllib3==1.25.9           # via requests
-virtualenv==20.0.27       # via tox
+tox-battery==0.6.1        # via -c requirements/constraints.txt, -r requirements/travis.in
+tox==3.18.1               # via -r requirements/travis.in, tox-battery
+urllib3==1.25.10          # via requests
+virtualenv==20.0.29       # via tox
 zipp==1.2.0               # via importlib-metadata, importlib-resources