Skip to content
This repository has been archived by the owner on Aug 21, 2024. It is now read-only.

Commit

Permalink
Updated tox and Travis test matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
UsamaSadiq committed Oct 9, 2020
1 parent b9b4eb6 commit ccc9851
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 14 deletions.
10 changes: 1 addition & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language:
- python
python:
- 3.5
- 3.8
sudo: required
services:
- docker
Expand Down Expand Up @@ -51,14 +51,6 @@ matrix:
after_success:
- docker exec insights_testing /edx/app/insights/edx_analytics_dashboard/.travis/run_coverage.sh
- codecov --disable pycov
- python: 3.8
env:
TESTNAME=a11y-python38
TARGETS="PYTHON_ENV=py38 requirements.a11y migrate requirements.js static accept a11y"
- python: 3.8
env:
TESTNAME=test-python-38
TARGETS="PYTHON_ENV=py38 requirements.js test_python"

after_failure:
# Print the list of running containers to rule out a killed container as a cause of failure
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
ROOT = $(shell echo "$$PWD")
COVERAGE_DIR = $(ROOT)/build/coverage
NODE_BIN=./node_modules/.bin
PYTHON_ENV=py35
PYTHON_ENV=py38
DJANGO_VERSION=django22

DJANGO_SETTINGS_MODULE ?= "analytics_dashboard.settings.local"
Expand All @@ -30,7 +30,7 @@ develop: requirements.js
migrate: requirements.tox
tox -e $(PYTHON_ENV)-$(DJANGO_VERSION)-migrate

clean: requirements.tox
clean: requirements.tox
find . -name '*.pyc' -delete
tox -e $(PYTHON_ENV)-$(DJANGO_VERSION)-clean

Expand Down Expand Up @@ -65,7 +65,7 @@ endif
tox -e $(PYTHON_ENV)-$(DJANGO_VERSION)-create_acceptance_test_soapbox_messages
tox -e $(PYTHON_ENV)-$(DJANGO_VERSION)-accept
tox -e $(PYTHON_ENV)-$(DJANGO_VERSION)-delete_acceptance_test_soapbox_messages


# local acceptance tests are typically run with by passing in environment variables on the commandline
# e.g. API_SERVER_URL="http://localhost:9001/api/v0" API_AUTH_TOKEN="edx" make accept_local
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
[tox]
skipsdist=True
envlist = py{35,38}-django22-{a11y,accept,check_isort,create_acceptance_test_soapbox_messages,delete_acceptance_test_soapbox_messages,detect_changed_translations,dummy_translations,extract_translations,pycodestyle,pylint,tests,validate_translations,waffle_learner_analytics,waffle_course_filters,waffle_course_passing}
envlist = py38-django{22,30,31}-{a11y,accept,check_isort,create_acceptance_test_soapbox_messages,delete_acceptance_test_soapbox_messages,detect_changed_translations,dummy_translations,extract_translations,pycodestyle,pylint,tests,validate_translations,waffle_learner_analytics,waffle_course_filters,waffle_course_passing}

[pytest]
DJANGO_SETTINGS_MODULE = analytics_dashboard.settings.test

[testenv]
envdir=
# Use the same environment for all commands running under a specific python version
py35: {toxworkdir}/py35
py38: {toxworkdir}/py38

passenv =
Expand Down Expand Up @@ -39,6 +38,7 @@ setenv =
deps =
django22: -r requirements/django.txt
django30: Django>=3.0,<3.1
django31: Django>=3.1,<3.2
-r {toxinidir}/requirements/test.txt

changedir =
Expand Down

0 comments on commit ccc9851

Please sign in to comment.