encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-02 19:40:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/encode/django-rest-framework

Browse Source
This commit is contained in:
Chris 2018-05-03 14:46:24 -04:00
commit 4516848863
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements/requirements-optionals.txt
View File

@ -1,6 +1,6 @@
# Optional packages which may be used with REST framework. # Optional packages which may be used with REST framework.
pytz==2017.2 pytz==2017.2
psycopg2==2.7.3 psycopg2==2.7.4
markdown==2.6.4 markdown==2.6.4
django-guardian==1.4.9 django-guardian==1.4.9
django-filter==1.1.0 django-filter==1.1.0

2
tests/test_model_serializer.py
View File

@ -402,7 +402,7 @@ class TestGenericIPAddressFieldValidation(TestCase):
'{0}'.format(s.errors)) '{0}'.format(s.errors))
@pytest.mark.skipUnless(postgres_fields, 'postgres is required') @pytest.mark.skipif('not postgres_fields')
class TestPosgresFieldsMapping(TestCase): class TestPosgresFieldsMapping(TestCase):
def test_hstore_field(self): def test_hstore_field(self):
class HStoreFieldModel(models.Model): class HStoreFieldModel(models.Model):