From e79610af3a01c2f891a50a113695f36152ca4a16 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 3 May 2018 14:31:46 +0200 Subject: [PATCH 1/2] tests: fix skipping with TestPosgresFieldsMapping (#5965) `pytest.mark.skipUnless` does not exist, it was confused with `unittest.skipUnless` probably. --- tests/test_model_serializer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index d865350fb..b7d31e2bd 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -402,7 +402,7 @@ class TestGenericIPAddressFieldValidation(TestCase): '{0}'.format(s.errors)) -@pytest.mark.skipUnless(postgres_fields, 'postgres is required') +@pytest.mark.skipif('not postgres_fields') class TestPosgresFieldsMapping(TestCase): def test_hstore_field(self): class HStoreFieldModel(models.Model): From d4dc24ea3e23586a2c914546cae26dddc8363449 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 3 May 2018 14:32:39 +0200 Subject: [PATCH 2/2] requirements-optionals.txt: bump psycopg2 to 2.7.4 (#5967) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With 2.7.3 I am seeing an ImportError on Arch Linux: > ImportError: …/.venv/lib/python3.6/site-packages/psycopg2/.libs/libresolv-2-c4c53def.5.so: > symbol __res_maybe_init version GLIBC_PRIVATE not defined in file libc.so.6 with link time reference --- requirements/requirements-optionals.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements-optionals.txt b/requirements/requirements-optionals.txt index e0bd25091..f1adabecf 100644 --- a/requirements/requirements-optionals.txt +++ b/requirements/requirements-optionals.txt @@ -1,6 +1,6 @@ # Optional packages which may be used with REST framework. pytz==2017.2 -psycopg2==2.7.3 +psycopg2==2.7.4 markdown==2.6.4 django-guardian==1.4.9 django-filter==1.1.0