Skip to content

Commit

Permalink
Merge pull request #3 from edx/BOM-1576
Browse files Browse the repository at this point in the history
Updated the tox and travis configs
  • Loading branch information
mraarif authored May 4, 2020
2 parents c1cc11f + 74c283b commit 777978b
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 23 deletions.
34 changes: 16 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,24 @@ sudo: false
language: python
cache: pip
python:
- '3.5'
- 3.5
- 3.8
before_install:
- 'uname -a'
- 'python --version'
- uname -a
- python --version
install:
- 'pip install tox'
- 'virtualenv --version'
- 'easy_install --version'
- 'pip --version'
- 'tox --version'
- pip install tox
- virtualenv --version
- easy_install --version
- pip --version
- tox --version
script:
- 'tox -v'
- tox -v
branches:
only:
- 'master'
only:
- master
env:
- TOXENV=py35-django111
- TOXENV=py35-django20
- TOXENV=py35-django21
- TOXENV=py35-django22
- TOXENV=coverage
- TOXENV=pep8
- TOXENV=pylint
- TOXENV=django22
- TOXENV=coverage
- TOXENV=pep8
- TOXENV=pylint
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def run_tests(self):

setup(
name='invideoquiz-xblock',
version='0.1.7',
version='0.1.8',
description='Helper XBlock to locate CAPA problems within videos.',
license='AGPL v3',
packages=[
Expand Down
6 changes: 2 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@

[tox]
downloadcache = {toxworkdir}/_download/
envlist = {py35}-django{111,20,21,22},coverage,pep8,pylint
envlist = py35-django22,py38-django{22,30},coverage,pep8,pylint

[testenv]
deps:
django111: Django>=1.11,<2.0
django20: Django>=2.0,<2.1
django21: Django>=2.1,<2.2
django22: Django>=2.2,<2.3
django30: Django>=3.0,<3.1
-rrequirements.txt
commands =
python manage.py test
Expand Down

0 comments on commit 777978b

Please sign in to comment.