From ed838db0605ca8b1696ee195f4b1092ed9937b1d Mon Sep 17 00:00:00 2001 From: Miroslav Shubernetskiy Date: Tue, 27 Feb 2018 02:43:10 -0500 Subject: [PATCH 1/5] updating tox file --- Makefile | 8 ++++---- tox.ini | 7 ++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 31a3fc1..2496ffd 100644 --- a/Makefile +++ b/Makefile @@ -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 @@ -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* diff --git a/tox.ini b/tox.ini index edf530f..854ae19 100644 --- a/tox.ini +++ b/tox.ini @@ -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 = From 2f4b4216a15e03c83c68c4bf1efd0c322c3058fd Mon Sep 17 00:00:00 2001 From: Miroslav Shubernetskiy Date: Tue, 27 Feb 2018 07:59:19 -0500 Subject: [PATCH 2/5] using tox-travis --- .travis.yml | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index f0cb3f8..724ff27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 From 02fda6c797031a3c2852870e5ffd34683fd501cc Mon Sep 17 00:00:00 2001 From: Miroslav Shubernetskiy Date: Tue, 27 Feb 2018 08:16:41 -0500 Subject: [PATCH 3/5] added travis:env to tox file --- tox.ini | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tox.ini b/tox.ini index 854ae19..5b00bce 100644 --- a/tox.ini +++ b/tox.ini @@ -23,5 +23,11 @@ deps = whitelist_externals = make +[travis:env] +DJANGO = + 18: django18 + 11: django11 + 20: django20 + [flake8] ignore = E501 From 1b2e59478411e900ecaf47a3d2c6bbfe63edf521 Mon Sep 17 00:00:00 2001 From: Miroslav Shubernetskiy Date: Tue, 27 Feb 2018 10:34:47 -0500 Subject: [PATCH 4/5] Revert "added travis:env to tox file" This reverts commit 02fda6c797031a3c2852870e5ffd34683fd501cc. --- tox.ini | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tox.ini b/tox.ini index 5b00bce..854ae19 100644 --- a/tox.ini +++ b/tox.ini @@ -23,11 +23,5 @@ deps = whitelist_externals = make -[travis:env] -DJANGO = - 18: django18 - 11: django11 - 20: django20 - [flake8] ignore = E501 From c78f2bd155bd7171d2a73f4e5e5998a7b0748359 Mon Sep 17 00:00:00 2001 From: Miroslav Shubernetskiy Date: Tue, 27 Feb 2018 10:50:16 -0500 Subject: [PATCH 5/5] bumping version to 0.3.5 with django 2 support --- AUTHORS.rst | 3 +++ HISTORY.rst | 10 ++++++++++ url_filter/__init__.py | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/AUTHORS.rst b/AUTHORS.rst index e21bedc..34d2059 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -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 + diff --git a/HISTORY.rst b/HISTORY.rst index bd93ca1..be93592 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -3,6 +3,16 @@ History ------- +0.3.5 (2018-02-27) +~~~~~~~~~~~~~~~~~~ + +* Django 2 support. +* Using `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 `_. + 0.3.4 (2017-08-17) ~~~~~~~~~~~~~~~~~~ diff --git a/url_filter/__init__.py b/url_filter/__init__.py index 5bab113..af2cafa 100644 --- a/url_filter/__init__.py +++ b/url_filter/__init__.py @@ -4,4 +4,4 @@ __author__ = 'Miroslav Shubernetskiy' __email__ = 'miroslav@miki725.com' -__version__ = '0.3.4' +__version__ = '0.3.5'