Skip to content

Commit

Permalink
Merge pull request #3 from edx/BOM-1575
Browse files Browse the repository at this point in the history
Updated the tox and travis configs -- BOM-1575
  • Loading branch information
mraarif authored May 4, 2020
2 parents 9c19e42 + 62f632e commit 56ad17b
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 26 deletions.
37 changes: 17 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,26 @@ addons:
language: python
sudo: false
python:
- 3.5
- 3.5
- 3.8
env:
- TOX_ENV=django111
- TOX_ENV=django20
- TOX_ENV=django21
- TOX_ENV=django22
- TOX_ENV=csslint
- TOX_ENV=eslint
- TOX_ENV=pycodestyle
- TOX_ENV=pylint
- TOX_ENV=django22
- TOX_ENV=csslint
- TOX_ENV=eslint
- TOX_ENV=pycodestyle
- TOX_ENV=pylint
before_install:
- "pip install -U pip"
- export BOTO_CONFIG=/dev/null
- export BOTO_CONFIG=/dev/null
- pip install pip==20.0.2
cache:
directories:
- $HOME/.cache/pip
directories:
- $HOME/.cache/pip
install:
- "make requirements"
- "pip install coveralls"
- make requirements
- pip install coveralls
script:
- tox -e $TOX_ENV
- tox -e $TOX_ENV
branches:
only:
- master
after_success:
coveralls
only:
- master
after_success: coveralls
6 changes: 4 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from setuptools import setup


version = '1.0.2'
version = '1.1.0'
description = __doc__.strip().split('\n')[0]
this_directory = path.abspath(path.dirname(__file__))
with open(path.join(this_directory, 'README.rst')) as file_in:
Expand Down Expand Up @@ -55,7 +55,9 @@
'License :: OSI Approved :: GNU Affero General Public License v3',
'Operating System :: OS Independent',
'Programming Language :: JavaScript',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.8',
'Topic :: Education',
'Topic :: Internet :: WWW/HTTP',
],
Expand Down
6 changes: 2 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
[tox]
envlist = csslint,eslint,{py35}-django{111,20,21,22},pycodestyle,pylint
envlist = csslint,eslint,py35-django22,py38-django{22,30},pycodestyle,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
coverage
commands =
coverage run manage.py test
Expand Down

0 comments on commit 56ad17b

Please sign in to comment.