Skip to content
This repository has been archived by the owner on May 27, 2019. It is now read-only.

Commit

Permalink
removed unsupported combinations from travis build
Browse files Browse the repository at this point in the history
  • Loading branch information
tleguijt committed Aug 31, 2016
1 parent bf9f088 commit de54060
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 11 deletions.
10 changes: 4 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,10 @@ matrix:
python: 3.5
- env: TOXENV=py34-dj18-wt16
python: 3.4
- env: TOXENV=py33-dj18-wt16
python: 3.3
- env: TOXENV=py27-dj18-wt16
python: 2.7
- env: TOXENV=py35-dj110-wt15
python: 3.5
- env: TOXENV=py34-dj110-wt15
python: 3.4
- env: TOXENV=py27-dj110-wt15
python: 2.7
- env: TOXENV=py35-dj19-wt15
python: 3.5
- env: TOXENV=py34-dj19-wt15
Expand All @@ -37,6 +33,8 @@ matrix:
python: 3.5
- env: TOXENV=py34-dj18-wt15
python: 3.4
- env: TOXENV=py33-dj18-wt15
python: 3.3
- env: TOXENV=py27-dj18-wt15
python: 2.7

Expand Down
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,8 @@ docs: ## generate Sphinx HTML documentation, including API docs
servedocs: docs ## compile the docs watching for changes
watchmedo shell-command -p '*.rst' -c '$(MAKE) -C docs html' -R -D .

release: clean ## package and upload a release
python setup.py sdist upload
python setup.py bdist_wheel upload
release: dist ## package and upload a release
twine upload dist/*

dist: clean ## builds source and wheel package
python setup.py sdist
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
'License :: OSI Approved :: MIT License',
'Natural Language :: English',
"Programming Language :: Python :: 2",
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3',
Expand Down
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ skipsdist = True
usedevelop = True

envlist =
py{27,34,35}-dj{18,19,110}-wt{15,16}
py{27,33,34,35}-dj{18,19,110}-wt{15,16}
flake8


Expand All @@ -14,6 +14,7 @@ commands = python runtests.py {posargs}

basepython =
py27: python2.7
py33: python3.3
py34: python3.4
py35: python3.5

Expand Down

0 comments on commit de54060

Please sign in to comment.