Skip to content

Commit

Permalink
Merge aba9d93 into 1f095bf
Browse files Browse the repository at this point in the history
  • Loading branch information
koenedaele committed Oct 2, 2019
2 parents 1f095bf + aba9d93 commit bed541d
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -2,9 +2,9 @@ sudo: false
language: python
python:
- 2.7
- 3.4
- 3.5
- 3.6
- 3.7
install:
- pip install -r requirements-dev.txt
- python setup.py develop
Expand Down
2 changes: 2 additions & 0 deletions HISTORY.rst
Expand Up @@ -2,6 +2,8 @@
------------------

- Add JSON-LD output to the REST service. (#63)
- Drop support for Python 3.4, add support for 3.7. This is the last version
that will support Python 2. (#66)

0.8.0 (2017-07-12)
------------------
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -31,9 +31,9 @@
'License :: OSI Approved :: MIT License',
'Programming Language :: Python',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Framework :: Pyramid',
],
author='Koen Van Daele',
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
@@ -1,5 +1,5 @@
[tox]
envlist = py27,py33,py34,py35,cover
envlist = py27,py35,py36,py37,cover

[testenv]
commands =
Expand All @@ -12,7 +12,7 @@ deps =

[testenv:cover]
basepython =
python2.7
python3.6
commands =
python setup.py develop
pip install -r requirements-dev.txt # Fix versions
Expand Down

0 comments on commit bed541d

Please sign in to comment.