Skip to content

Commit

Permalink
Merge pull request #58 from miki725/tox
Browse files Browse the repository at this point in the history
Tox
  • Loading branch information
miki725 authored Feb 27, 2018
2 parents 43a9efe + c78f2bd commit a22e341
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 29 deletions.
23 changes: 4 additions & 19 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,14 @@ python:
- "3.6"
- "2.7"
- "pypy"

env:
- deps='django<1.9 djangorestframework<3.7'
- deps='django<2'

matrix:
include:
- python: "3.6"
env: deps='django<2.1'
- "pypy3"

sudo: false

before_install:
- pip install -U pytest

# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
install:
- pip install $deps
- pip install -r requirements-dev.txt
- pip install coveralls==1.1 # travis pypy not compatible with later versions
- pip freeze
- pip install tox-travis
- pip install coveralls==1.1

# command to run tests, e.g. python setup.py test
script: make check
script: tox

after_success: coveralls
3 changes: 3 additions & 0 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@ Contributors
* João Neto - https://github.com/netjinho
* Jorik Kraaikamp - https://github.com/JostCrow
* Håken Lid - https://github.com/haakenlid
* Ryan O’Hara - https://github.com/ryan-copperleaf
* webrunners - https://github.com/webrunners

10 changes: 10 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@
History
-------

0.3.5 (2018-02-27)
~~~~~~~~~~~~~~~~~~

* Django 2 support.
* Using `tox-travis <https://github.com/tox-dev/tox-travis>`_ for travis builds.
* Fixed negated queries in Django backend.
Previously negation did ``NOT (condition1 and condition2)`` vs expected
``NOT condition1 and NOT condition2``.
See `#53 <https://github.com/miki725/django-url-filter/issues/53>`_.

0.3.4 (2017-08-17)
~~~~~~~~~~~~~~~~~~

Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ help:
@echo "dist - package"

install:
pip install -U -r requirements-dev.txt
pip install -r requirements-dev.txt

install-quite:
pip install -r requirements-dev.txt > /dev/null
Expand All @@ -30,9 +30,9 @@ clean-build:
@rm -rf *.egg-info

clean-pyc:
-@find . -name '*.pyc' -follow -print0 | xargs -0 rm -f
-@find . -name '*.pyo' -follow -print0 | xargs -0 rm -f
-@find . -name '__pycache__' -type d -follow -print0 | xargs -0 rm -rf
-@find . -name '*.pyc' -not -path "./.tox/*" -follow -print0 | xargs -0 rm -f
-@find . -name '*.pyo' -not -path "./.tox/*" -follow -print0 | xargs -0 rm -f
-@find . -name '__pycache__' -type d -not -path "./.tox/*" -follow -print0 | xargs -0 rm -rf

clean-test:
rm -rf .coverage coverage*
Expand Down
7 changes: 2 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
[tox]
envlist =
{py27,py36,pypy}-django{18,11}
py36-django20
# 1.9 breaks pypy3 hence only testing with 18
# scandir fails to install in pypy3 so skippint for now
# {pypy3}-django{18}
{py27,py36,pypy,pypy3}-django{18,11}
{py36,pypy3}-django20

[testenv]
basepython =
Expand Down
2 changes: 1 addition & 1 deletion url_filter/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

__author__ = 'Miroslav Shubernetskiy'
__email__ = '[email protected]'
__version__ = '0.3.4'
__version__ = '0.3.5'

0 comments on commit a22e341

Please sign in to comment.