From 21fb97df9c89a573ff48cd44327b1c9bbbff7e3c Mon Sep 17 00:00:00 2001 From: Miroslav Shubernetskiy Date: Sun, 26 Apr 2015 17:41:18 -0400 Subject: [PATCH 1/7] switched to using py.test as test suite since django-nose does not support django1.8 --- Makefile | 18 ++++++++++-------- requirements-dev.txt | 3 ++- tests/settings.py | 5 +++-- tox.ini | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 2a5771b..7d4160c 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,7 @@ .PHONY: clean-pyc clean-build docs clean -NOSE_FLAGS=-s --verbosity=2 -COVER_CONFIG_FLAGS=--with-coverage --cover-package=rest_framework_bulk --cover-erase -COVER_REPORT_FLAGS=--cover-html --cover-html-dir=htmlcov -COVER_FLAGS=${COVER_CONFIG_FLAGS} ${COVER_REPORT_FLAGS} +TEST_FLAGS=--verbosity=2 +COVER_FLAGS=--source=rest_framework_bulk help: @echo "install - install all requirements including for testing" @@ -51,10 +49,14 @@ lint: flake8 rest_framework_bulk test: - python tests/manage.py test ${NOSE_FLAGS} - -test-coverage: - python tests/manage.py test ${NOSE_FLAGS} ${COVER_FLAGS} + python tests/manage.py test ${TEST_FLAGS} + +test-coverage: clean-test + -coverage run ${COVER_FLAGS} tests/manage.py test ${TEST_FLAGS} + @exit_code=$? + @-coverage report + @-coverage html + @exit ${exit_code} test-all: tox diff --git a/requirements-dev.txt b/requirements-dev.txt index 9060574..35c00dd 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,6 @@ -r requirements.txt coverage -django-nose +django-pytest flake8 +pytest tox diff --git a/tests/settings.py b/tests/settings.py index 48f7ae6..3c541c8 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -12,14 +12,15 @@ MIDDLEWARE_CLASSES = () INSTALLED_APPS = ( + 'django.contrib.auth', + 'django.contrib.contenttypes', 'django.contrib.staticfiles', - 'django_nose', 'rest_framework', 'rest_framework_bulk', 'rest_framework_bulk.tests.simple_app', ) -TEST_RUNNER = 'django_nose.NoseTestSuiteRunner' +TEST_RUNNER = 'django_pytest.test_runner.TestRunner' STATIC_URL = '/static/' SECRET_KEY = 'foo' diff --git a/tox.ini b/tox.ini index d088851..eb4c9a1 100644 --- a/tox.ini +++ b/tox.ini @@ -9,7 +9,7 @@ basepython = pypy: pypy pypy3: pypy3 setenv = - PYTHONPATH = {toxinidir}:{toxinidir}/multinosetests + PYTHONPATH = {toxinidir} commands = make install-quite pip freeze From 61baf9810abff889ca59c505149f05fd8b2cd865 Mon Sep 17 00:00:00 2001 From: Miroslav Shubernetskiy Date: Sun, 26 Apr 2015 17:46:21 -0400 Subject: [PATCH 2/7] added pip freeze to travis install script --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6318584..00ede8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ env: install: - pip install $DRF - pip install -r requirements-dev.txt + - pip freeze # command to run tests, e.g. python setup.py test script: make check From 8864cf21fac08fe39956f6b49c1dc2da9f6dcf66 Mon Sep 17 00:00:00 2001 From: Miroslav Shubernetskiy Date: Sun, 26 Apr 2015 17:51:57 -0400 Subject: [PATCH 3/7] removed pytest dependency since since it does not create proper test db --- requirements-dev.txt | 2 -- tests/settings.py | 2 -- 2 files changed, 4 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 35c00dd..257c17d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,6 +1,4 @@ -r requirements.txt coverage -django-pytest flake8 -pytest tox diff --git a/tests/settings.py b/tests/settings.py index 3c541c8..2fcd255 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -20,8 +20,6 @@ 'rest_framework_bulk.tests.simple_app', ) -TEST_RUNNER = 'django_pytest.test_runner.TestRunner' - STATIC_URL = '/static/' SECRET_KEY = 'foo' From fb4b375215cba481e153db13667e1f11cb45f577 Mon Sep 17 00:00:00 2001 From: Miroslav Shubernetskiy Date: Sun, 26 Apr 2015 18:15:23 -0400 Subject: [PATCH 4/7] testing in travis DRF<3 only with Django<1.8 --- .travis.yml | 6 +++--- README.rst | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 00ede8d..3e2c049 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,12 +6,12 @@ python: - "pypy" env: - - "DRF='djangorestframework<3'" - - "DRF='djangorestframework>=3'" + - "$DJANGO_DRF='django<1.8' 'djangorestframework<3'" + - "$DJANGO_DRF='djangorestframework>=3'" # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors install: - - pip install $DRF + - pip install $DJANGO_DRF - pip install -r requirements-dev.txt - pip freeze diff --git a/README.rst b/README.rst index 0c6027b..af70822 100644 --- a/README.rst +++ b/README.rst @@ -21,10 +21,11 @@ within the framework. That is the purpose of this project. Requirements ------------ -* Python 2.7+ -* Django 1.3+ -* Django REST Framework >= 2.2.5 (when bulk features were added to serializers) -* Django REST Framework >= 3.0.0 (DRF-bulk supports both DRF2 and DRF3!) +* Python>=2.7 +* Django>=1.3 +* Django REST Framework >= 3.0.0 +* REST Framework >= 2.2.5 + (**only with** Django<1.8 since DRF<3 does not support Django1.8) Installing ---------- From e87d53a3f55471e55e58bbbc1f76514047eecc43 Mon Sep 17 00:00:00 2001 From: Miroslav Shubernetskiy Date: Sun, 26 Apr 2015 18:34:56 -0400 Subject: [PATCH 5/7] changed tox config to use Django<1.8 for DRF<3 [ci skip] --- rest_framework_bulk/tests/test_generics.py | 18 ++++++++++++++++++ tox.ini | 16 ++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/rest_framework_bulk/tests/test_generics.py b/rest_framework_bulk/tests/test_generics.py index 5522948..51bdb15 100644 --- a/rest_framework_bulk/tests/test_generics.py +++ b/rest_framework_bulk/tests/test_generics.py @@ -1,5 +1,7 @@ from __future__ import unicode_literals, print_function import json +import unittest + from django.core.urlresolvers import reverse from django.test import TestCase from django.test.client import RequestFactory @@ -83,6 +85,22 @@ def test_put(self): ] ) + @unittest.skip('') + def test_put_without_update_key(self): + """ + Test that PUT request updates all submitted resources. + """ + response = self.view(self.request.put( + '', + json.dumps([ + {'contents': 'foo', 'number': 3}, + {'contents': 'bar', 'number': 4, 'id': 555}, # non-existing id + ]), + content_type='application/json', + )) + + self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) + def test_patch(self): """ Test that PATCH request partially updates all submitted resources. diff --git a/tox.ini b/tox.ini index eb4c9a1..0af40aa 100644 --- a/tox.ini +++ b/tox.ini @@ -20,5 +20,21 @@ deps = whitelist_externals = make +[testenv:py27-drf2] +deps = + django<1.8 + +[testenv:py34-drf2] +deps = + django<1.8 + +[testenv:pypy-drf2] +deps = + django<1.8 + +[testenv:pypy3-drf2] +deps = + django<1.8 + [flake8] max-line-length = 100 From 7c843f0f6e0dda4cb09e9ad9b763f3a1106608d5 Mon Sep 17 00:00:00 2001 From: Miroslav Shubernetskiy Date: Sun, 26 Apr 2015 18:44:51 -0400 Subject: [PATCH 6/7] fixes #34 --- rest_framework_bulk/drf3/serializers.py | 6 ++++++ rest_framework_bulk/tests/test_generics.py | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/rest_framework_bulk/drf3/serializers.py b/rest_framework_bulk/drf3/serializers.py index 9098829..31fff46 100644 --- a/rest_framework_bulk/drf3/serializers.py +++ b/rest_framework_bulk/drf3/serializers.py @@ -1,4 +1,6 @@ from __future__ import print_function, unicode_literals +import inspect + from rest_framework.exceptions import ValidationError from rest_framework.serializers import ListSerializer @@ -41,6 +43,10 @@ def update(self, queryset, all_validated_data): for i in all_validated_data } + if not all((bool(i) and not inspect.isclass(i) + for i in all_validated_data_by_id.keys())): + raise ValidationError('') + # since this method is given a queryset which can have many # model instances, first find all objects to update # and only then update the models diff --git a/rest_framework_bulk/tests/test_generics.py b/rest_framework_bulk/tests/test_generics.py index 51bdb15..6838bf4 100644 --- a/rest_framework_bulk/tests/test_generics.py +++ b/rest_framework_bulk/tests/test_generics.py @@ -1,6 +1,5 @@ from __future__ import unicode_literals, print_function import json -import unittest from django.core.urlresolvers import reverse from django.test import TestCase @@ -85,7 +84,6 @@ def test_put(self): ] ) - @unittest.skip('') def test_put_without_update_key(self): """ Test that PUT request updates all submitted resources. @@ -94,6 +92,7 @@ def test_put_without_update_key(self): '', json.dumps([ {'contents': 'foo', 'number': 3}, + {'contents': 'rainbows', 'number': 4}, # multiple objects without id {'contents': 'bar', 'number': 4, 'id': 555}, # non-existing id ]), content_type='application/json', From a8265b12e12665a013adb97b6225e15979faf2b2 Mon Sep 17 00:00:00 2001 From: Miroslav Shubernetskiy Date: Sun, 26 Apr 2015 18:49:15 -0400 Subject: [PATCH 7/7] bumped version and updated history [ci skip] --- HISTORY.rst | 8 ++++++++ rest_framework_bulk/__init__.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/HISTORY.rst b/HISTORY.rst index 7bf4f04..7d4f47b 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -3,6 +3,14 @@ History ------- +0.2.1 (2015-04-26) +~~~~~~~~~~~~~~~~~~ + +* Fixed a bug which allowed to submit data for update to serializer + without update field. + See `#34 `_. +* Removed support for Django1.8 with DRF2.x + 0.2 (2015-02-09) ~~~~~~~~~~~~~~~~ diff --git a/rest_framework_bulk/__init__.py b/rest_framework_bulk/__init__.py index 7dceaaf..1d7f9a3 100644 --- a/rest_framework_bulk/__init__.py +++ b/rest_framework_bulk/__init__.py @@ -1,4 +1,4 @@ -__version__ = '0.2' +__version__ = '0.2.1' __author__ = 'Miroslav Shubernetskiy' try: