From 7bf5ea3308371befda4014ce7dc2035741ba43ed Mon Sep 17 00:00:00 2001 From: Artur Barseghyan Date: Wed, 9 Dec 2020 14:37:23 +0100 Subject: [PATCH 1/6] Backwards compatibility with Elasticsearch 6.x (#288) * ES6 compatibility * Clean up * Clean up --- .travis.yml | 64 +++++++++++++++++++++------ django_elasticsearch_dsl/documents.py | 6 ++- django_elasticsearch_dsl/versions.py | 3 ++ setup.py | 2 +- tests/__init__.py | 3 -- tests/test_documents.py | 27 ++++++++--- tests/test_fields.py | 2 +- tests/test_integration.py | 27 +++++++---- tox.ini | 4 +- 9 files changed, 102 insertions(+), 36 deletions(-) create mode 100644 django_elasticsearch_dsl/versions.py diff --git a/.travis.yml b/.travis.yml index 2f289e65..fa02e882 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,31 +7,69 @@ dist: xenial # default "precise" distro doesn't include Java 8 for Elasticsearch matrix: include: - - env: TOX_ENV=py36-django-111-es6 + - env: TOX_ENV=py36-django-111-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt python: 3.6 - - env: TOX_ENV=py37-django-111-es6 + - env: TOX_ENV=py36-django-111-es7 + python: 3.6 + + - env: TOX_ENV=py37-django-111-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt python: 3.7 - - env: TOX_ENV=py38-django-111-es6 + - env: TOX_ENV=py37-django-111-es7 + python: 3.7 + + - env: TOX_ENV=py38-django-111-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt python: 3.8 - - env: TOX_ENV=py27-django-111-es6 + - env: TOX_ENV=py38-django-111-es7 + python: 3.8 + + - env: TOX_ENV=py27-django-111-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt + python: 2.7 + - env: TOX_ENV=py27-django-111-es7 python: 2.7 - - env: TOX_ENV=py36-django-2-es6 + + - env: TOX_ENV=py36-django-2-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt + python: 3.6 + - env: TOX_ENV=py36-django-2-es7 python: 3.6 - - env: TOX_ENV=py37-django-2-es6 + + - env: TOX_ENV=py37-django-2-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt python: 3.7 - - env: TOX_ENV=py37-django-21-es6 + - env: TOX_ENV=py37-django-2-es7 python: 3.7 - - env: TOX_ENV=py37-django-22-es6 + + - env: TOX_ENV=py37-django-21-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt + python: 3.7 + - env: TOX_ENV=py37-django-21-es7 python: 3.7 - - env: TOX_ENV=py37-django-30-es6 + + - env: TOX_ENV=py37-django-22-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt python: 3.7 - - env: TOX_ENV=py38-django-2-es6 + - env: TOX_ENV=py37-django-22-es7 + python: 3.7 + + - env: TOX_ENV=py37-django-30-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt + python: 3.7 + - env: TOX_ENV=py37-django-30-es7 + python: 3.7 + + - env: TOX_ENV=py38-django-2-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt + python: 3.8 + - env: TOX_ENV=py38-django-2-es7 python: 3.8 - - env: TOX_ENV=py38-django-21-es6 + + - env: TOX_ENV=py38-django-21-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt + python: 3.8 + - env: TOX_ENV=py38-django-21-es7 + python: 3.8 + + - env: TOX_ENV=py38-django-22-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt + python: 3.8 + - env: TOX_ENV=py38-django-22-es7 python: 3.8 - - env: TOX_ENV=py38-django-22-es6 + + - env: TOX_ENV=py38-django-30-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt python: 3.8 - - env: TOX_ENV=py38-django-30-es6 + - env: TOX_ENV=py38-django-30-es7 python: 3.8 cache: pip diff --git a/django_elasticsearch_dsl/documents.py b/django_elasticsearch_dsl/documents.py index 4defa8b7..a18fc089 100644 --- a/django_elasticsearch_dsl/documents.py +++ b/django_elasticsearch_dsl/documents.py @@ -23,6 +23,7 @@ TextField, ) from .search import Search +from .versions import ES_MAJOR_VERSION model_field_class_to_field_class = { models.AutoField: IntegerField, @@ -166,7 +167,7 @@ def generate_id(cls, object_instance): return object_instance.pk def _prepare_action(self, object_instance, action): - return { + _val = { '_op_type': action, '_index': self._index._name, '_id': self.generate_id(object_instance), @@ -174,6 +175,9 @@ def _prepare_action(self, object_instance, action): self.prepare(object_instance) if action != 'delete' else None ), } + if ES_MAJOR_VERSION < 7: + _val['_type'] = self._doc_type.name + return _val def _get_actions(self, object_list, action): for object_instance in object_list: diff --git a/django_elasticsearch_dsl/versions.py b/django_elasticsearch_dsl/versions.py new file mode 100644 index 00000000..7f06df26 --- /dev/null +++ b/django_elasticsearch_dsl/versions.py @@ -0,0 +1,3 @@ +from elasticsearch_dsl import VERSION + +ES_MAJOR_VERSION = VERSION[0] diff --git a/setup.py b/setup.py index cf74203d..013dee05 100755 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ ], include_package_data=True, install_requires=[ - 'elasticsearch-dsl>=7.0.0<8.0.0', + 'elasticsearch-dsl>=6.4.0<8.0.0', 'six', ], license="Apache Software License 2.0", diff --git a/tests/__init__.py b/tests/__init__.py index 7f06df26..e69de29b 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,3 +0,0 @@ -from elasticsearch_dsl import VERSION - -ES_MAJOR_VERSION = VERSION[0] diff --git a/tests/test_documents.py b/tests/test_documents.py index 6a4f29d3..65ae8bd1 100644 --- a/tests/test_documents.py +++ b/tests/test_documents.py @@ -11,7 +11,7 @@ from django_elasticsearch_dsl.exceptions import (ModelFieldNotMappedError, RedeclaredFieldError) from django_elasticsearch_dsl.registries import registry -from tests import ES_MAJOR_VERSION +from django_elasticsearch_dsl.versions import ES_MAJOR_VERSION from .models import Article from .documents import ArticleDocument, ArticleWithSlugAsIdDocument @@ -62,6 +62,8 @@ class Index: class DocTypeTestCase(TestCase): + maxDiff = None + def test_model_class_added(self): self.assertEqual(CarDocument.django.model, Car) @@ -136,8 +138,12 @@ def test_to_field_with_unknown_field(self): def test_mapping(self): text_type = 'string' if ES_MAJOR_VERSION == 2 else 'text' - self.assertEqual( - CarDocument._doc_type.mapping.to_dict(), { + doc_type_mapping = CarDocument._doc_type.mapping.to_dict() + if ES_MAJOR_VERSION < 7: + doc_type_mapping = doc_type_mapping['car_document'] + + self.assertDictEqual( + doc_type_mapping, { 'properties': { 'name': { 'type': text_type @@ -164,7 +170,7 @@ def test_prepare(self): car = Car(name="Type 57", price=5400000.0, not_indexed="not_indexex") doc = CarDocument() prepared_data = doc.prepare(car) - self.assertEqual( + self.assertDictEqual( prepared_data, { 'color': doc.prepare_color(None), 'type': car.type(), @@ -188,7 +194,7 @@ class Index: car = Car(name="Type 57", price=5400000.0, not_indexed="not_indexex") doc = CarDocumentDSlBaseField() prepared_data = doc.prepare(car) - self.assertEqual( + self.assertDictEqual( prepared_data, { 'name': car.name, 'price': car.price @@ -212,9 +218,13 @@ def test_model_instance_update(self): }, '_index': 'car_index', }] + if ES_MAJOR_VERSION < 7: + actions[0]['_type'] = 'car_document' + self.assertEqual(1, mock.call_count) self.assertEqual( - actions, list(mock.call_args_list[0][1]['actions']) + actions, list(mock.call_args_list[0][1]['actions']), + str(list(mock.call_args_list[0][1]['actions'])) ) self.assertTrue(mock.call_args_list[0][1]['refresh']) self.assertEqual( @@ -251,8 +261,11 @@ def test_model_instance_iterable_update(self): }, '_index': 'car_index' }] + if ES_MAJOR_VERSION < 7: + actions[0]['_type'] = 'car_document' + actions[1]['_type'] = 'car_document' self.assertEqual(1, mock.call_count) - self.assertEqual( + self.assertListEqual( actions, list(mock.call_args_list[0][1]['actions']) ) self.assertTrue(mock.call_args_list[0][1]['refresh']) diff --git a/tests/test_fields.py b/tests/test_fields.py index af216ae2..98c0ee43 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -13,7 +13,7 @@ ListField, LongField, NestedField, ObjectField, ShortField, TextField ) -from tests import ES_MAJOR_VERSION +from django_elasticsearch_dsl.versions import ES_MAJOR_VERSION class DEDFieldTestCase(TestCase): diff --git a/tests/test_integration.py b/tests/test_integration.py index c95bcfb3..be44c7bc 100644 --- a/tests/test_integration.py +++ b/tests/test_integration.py @@ -10,7 +10,7 @@ from elasticsearch.exceptions import NotFoundError from elasticsearch_dsl import Index as DSLIndex from django_elasticsearch_dsl.test import ESTestCase -from tests import ES_MAJOR_VERSION +from django_elasticsearch_dsl.versions import ES_MAJOR_VERSION from .documents import ( ad_index, @@ -31,6 +31,9 @@ "--elasticsearch not set" ) class IntegrationTestCase(ESTestCase, TestCase): + + maxDiff = None + def setUp(self): super(IntegrationTestCase, self).setUp() self.manufacturer = Manufacturer( @@ -103,7 +106,7 @@ def test_get_doc_with_reverse_relationships(self): result = s.execute() self.assertEqual(len(result), 1) car1_doc = result[0] - self.assertEqual(car1_doc.ads, [ + self.assertListEqual(list(car1_doc.ads), [ { 'title': self.ad1.title, 'description': self.ad1.description, @@ -123,7 +126,7 @@ def test_get_doc_with_many_to_many_relationships(self): result = s.execute() self.assertEqual(len(result), 1) car1_doc = result[0] - self.assertEqual(car1_doc.categories, [ + self.assertListEqual(list(car1_doc.categories), [ { 'title': self.category1.title, 'slug': self.category1.slug, @@ -141,7 +144,7 @@ def test_doc_to_dict(self): result = s.execute() self.assertEqual(len(result), 1) car2_doc = result[0] - self.assertEqual(car2_doc.to_dict(), { + self.assertDictEqual(car2_doc.to_dict(), { 'type': self.car2.type, 'launched': self.car2.launched, 'name': self.car2.name, @@ -160,7 +163,7 @@ def test_doc_to_dict(self): result = s.execute() self.assertEqual(len(result), 1) car3_doc = result[0] - self.assertEqual(car3_doc.to_dict(), { + self.assertDictEqual(car3_doc.to_dict(), { 'type': self.car3.type, 'launched': self.car3.launched, 'name': self.car3.name, @@ -188,7 +191,7 @@ def test_index_to_dict(self): index_dict = test_index.to_dict() - self.assertEqual(index_dict['settings'], { + self.assertDictEqual(index_dict['settings'], { 'number_of_shards': 1, 'number_of_replicas': 0, 'analysis': { @@ -203,7 +206,14 @@ def test_index_to_dict(self): } } }) - self.assertEqual(index_dict['mappings'], { + + index_dict_mappings = index_dict['mappings'] + if ES_MAJOR_VERSION < 7: + index_dict_mappings = index_dict_mappings['doc'] + + self.assertDictEqual( + index_dict_mappings, + { 'properties': { 'ads': { 'type': 'nested', @@ -235,7 +245,8 @@ def test_index_to_dict(self): 'launched': {'type': 'date'}, 'type': {'type': text_type} } - }) + } + ) def test_related_docs_are_updated(self): # test foreignkey relation diff --git a/tox.ini b/tox.ini index 599dad26..dbb7be7a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist = - py27-django-111-es7 - {py36,py37,py38}-django-{111,2,21,22,30}-{es7} + py27-django-111-es{6,7} + {py36,py37,py38}-django-{111,2,21,22,30}-es{6,7} [testenv] setenv = From dbbbfac01e4ba85c5e991fb1c0522404f170bdc0 Mon Sep 17 00:00:00 2001 From: Safwan Rahman Date: Sat, 31 Oct 2020 14:08:56 +0600 Subject: [PATCH 2/6] remove Version check --- .travis.yml | 72 ++++++--------------------- django_elasticsearch_dsl/documents.py | 10 ++-- setup.py | 2 +- tests/test_documents.py | 14 ++---- tests/test_integration.py | 14 +++--- tox.ini | 10 ++-- 6 files changed, 35 insertions(+), 87 deletions(-) diff --git a/.travis.yml b/.travis.yml index fa02e882..8f9e68b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,81 +1,37 @@ # Config file for automatic testing at travis-ci.org language: python -python: 3.8 +python: 3.7 dist: xenial # default "precise" distro doesn't include Java 8 for Elasticsearch 5 matrix: include: - - env: TOX_ENV=py36-django-111-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt + - env: TOX_ENV=py36-django-110-es6 python: 3.6 - - env: TOX_ENV=py36-django-111-es7 - python: 3.6 - - - env: TOX_ENV=py37-django-111-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt - python: 3.7 - - env: TOX_ENV=py37-django-111-es7 + - env: TOX_ENV=py37-django-110-es6 python: 3.7 - - - env: TOX_ENV=py38-django-111-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt - python: 3.8 - - env: TOX_ENV=py38-django-111-es7 - python: 3.8 - - - env: TOX_ENV=py27-django-111-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt - python: 2.7 - - env: TOX_ENV=py27-django-111-es7 + - env: TOX_ENV=py27-django-110-es6 python: 2.7 - - - env: TOX_ENV=py36-django-2-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt - python: 3.6 - - env: TOX_ENV=py36-django-2-es7 + - env: TOX_ENV=py36-django-111-es6 python: 3.6 - - - env: TOX_ENV=py37-django-2-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt - python: 3.7 - - env: TOX_ENV=py37-django-2-es7 - python: 3.7 - - - env: TOX_ENV=py37-django-21-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt - python: 3.7 - - env: TOX_ENV=py37-django-21-es7 + - env: TOX_ENV=py37-django-111-es6 python: 3.7 - - - env: TOX_ENV=py37-django-22-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt + - env: TOX_ENV=py27-django-111-es6 + python: 2.7 + - env: TOX_ENV=py36-django-2-es6 + python: 3.6 + - env: TOX_ENV=py37-django-2-es6 python: 3.7 - - env: TOX_ENV=py37-django-22-es7 + - env: TOX_ENV=py37-django-21-es6 python: 3.7 - - - env: TOX_ENV=py37-django-30-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt + - env: TOX_ENV=py37-django-22-es6 python: 3.7 - - env: TOX_ENV=py37-django-30-es7 - python: 3.7 - - - env: TOX_ENV=py38-django-2-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt - python: 3.8 - - env: TOX_ENV=py38-django-2-es7 - python: 3.8 - - - env: TOX_ENV=py38-django-21-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt - python: 3.8 - - env: TOX_ENV=py38-django-21-es7 - python: 3.8 - - - env: TOX_ENV=py38-django-22-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt - python: 3.8 - - env: TOX_ENV=py38-django-22-es7 - python: 3.8 - - - env: TOX_ENV=py38-django-30-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt - python: 3.8 - - env: TOX_ENV=py38-django-30-es7 - python: 3.8 cache: pip env: global: - - ES_APT_URL=https://artifacts.elastic.co/packages/7.x/apt + - ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt before_install: # work around https://github.com/travis-ci/travis-ci/issues/8363 diff --git a/django_elasticsearch_dsl/documents.py b/django_elasticsearch_dsl/documents.py index a18fc089..9940f158 100644 --- a/django_elasticsearch_dsl/documents.py +++ b/django_elasticsearch_dsl/documents.py @@ -160,24 +160,22 @@ def parallel_bulk(self, actions, **kwargs): @classmethod def generate_id(cls, object_instance): """ - The default behavior is to use the Django object's pk (id) as the - elasticseach index id (_id). If needed, this method can be overloaded + The default behavior is to use the Django object's pk (id) as the + elasticseach index id (_id). If needed, this method can be overloaded to change this default behavior. """ return object_instance.pk def _prepare_action(self, object_instance, action): - _val = { + return { '_op_type': action, '_index': self._index._name, '_id': self.generate_id(object_instance), + '_type': self._doc_type.name, '_source': ( self.prepare(object_instance) if action != 'delete' else None ), } - if ES_MAJOR_VERSION < 7: - _val['_type'] = self._doc_type.name - return _val def _get_actions(self, object_list, action): for object_instance in object_list: diff --git a/setup.py b/setup.py index 013dee05..9142140d 100755 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ ], include_package_data=True, install_requires=[ - 'elasticsearch-dsl>=6.4.0<8.0.0', + 'elasticsearch-dsl>=6.4.0<7.0.0', 'six', ], license="Apache Software License 2.0", diff --git a/tests/test_documents.py b/tests/test_documents.py index 65ae8bd1..c70e1e8d 100644 --- a/tests/test_documents.py +++ b/tests/test_documents.py @@ -138,9 +138,7 @@ def test_to_field_with_unknown_field(self): def test_mapping(self): text_type = 'string' if ES_MAJOR_VERSION == 2 else 'text' - doc_type_mapping = CarDocument._doc_type.mapping.to_dict() - if ES_MAJOR_VERSION < 7: - doc_type_mapping = doc_type_mapping['car_document'] + doc_type_mapping = CarDocument._doc_type.mapping.to_dict()['car_document'] self.assertDictEqual( doc_type_mapping, { @@ -217,9 +215,8 @@ def test_model_instance_update(self): 'color': doc.prepare_color(None), }, '_index': 'car_index', + '_type': 'car_document' }] - if ES_MAJOR_VERSION < 7: - actions[0]['_type'] = 'car_document' self.assertEqual(1, mock.call_count) self.assertEqual( @@ -249,6 +246,7 @@ def test_model_instance_iterable_update(self): 'color': doc.prepare_color(None), }, '_index': 'car_index', + '_type': 'car_document' }, { '_id': car2.pk, @@ -259,11 +257,9 @@ def test_model_instance_iterable_update(self): 'type': car2.type(), 'color': doc.prepare_color(None), }, - '_index': 'car_index' + '_index': 'car_index', + '_type': 'car_document' }] - if ES_MAJOR_VERSION < 7: - actions[0]['_type'] = 'car_document' - actions[1]['_type'] = 'car_document' self.assertEqual(1, mock.call_count) self.assertListEqual( actions, list(mock.call_args_list[0][1]['actions']) diff --git a/tests/test_integration.py b/tests/test_integration.py index be44c7bc..9b873350 100644 --- a/tests/test_integration.py +++ b/tests/test_integration.py @@ -207,12 +207,10 @@ def test_index_to_dict(self): } }) - index_dict_mappings = index_dict['mappings'] - if ES_MAJOR_VERSION < 7: - index_dict_mappings = index_dict_mappings['doc'] + index_dict_mappings = index_dict['doc'] self.assertDictEqual( - index_dict_mappings, + index_dict_mappings, { 'properties': { 'ads': { @@ -374,8 +372,8 @@ def test_default_document_id(self): slug=article_slug, ) - # saving should create two documents (in the two indices): one with the - # Django object's id as the ES doc _id, and the other with the slug + # saving should create two documents (in the two indices): one with the + # Django object's id as the ES doc _id, and the other with the slug # as the ES _id article.save() @@ -392,8 +390,8 @@ def test_custom_document_id(self): slug=article_slug, ) - # saving should create two documents (in the two indices): one with the - # Django object's id as the ES doc _id, and the other with the slug + # saving should create two documents (in the two indices): one with the + # Django object's id as the ES doc _id, and the other with the slug # as the ES _id article.save() diff --git a/tox.ini b/tox.ini index dbb7be7a..6512a6f0 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,10 @@ [tox] envlist = - py27-django-111-es{6,7} - {py36,py37,py38}-django-{111,2,21,22,30}-es{6,7} + {py27,py36,py37}-django-110-{es6} + {py27,py36,py37}-django-111-{es6} + {py36,py37}-django-2-{es6} + {py36,py37}-django-21-{es6} + {py36,py37}-django-22-{es6} [testenv] setenv = @@ -14,13 +17,10 @@ deps = django-2: Django>=2.0,<2.1 django-21: Django>=2.1,<2.2 django-22: Django>=2.2,<2.3 - django-30: Django>=3.0,<3.1 es6: elasticsearch-dsl>=6.4.0,<7.0.0 - es7: elasticsearch-dsl>=7,<8 -r{toxinidir}/requirements_test.txt basepython = py27: python2.7 py36: python3.6 py37: python3.7 - py38: python3.8 From 5f388a699155bb9a7dd1bc3fe7a040915926a808 Mon Sep 17 00:00:00 2001 From: Safwan Rahman Date: Wed, 9 Dec 2020 19:42:11 +0600 Subject: [PATCH 3/6] version bump --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9142140d..31141971 100755 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ except ImportError: from distutils.core import setup -version = '7.1.4' +version = '6.5.0' if sys.argv[-1] == 'publish': try: From 11e45ba4e55815540d6932ba6bff190c7759dcfe Mon Sep 17 00:00:00 2001 From: Safwan Rahman Date: Wed, 9 Dec 2020 20:16:44 +0600 Subject: [PATCH 4/6] fixing tests --- tests/test_integration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_integration.py b/tests/test_integration.py index 9b873350..f8c99f98 100644 --- a/tests/test_integration.py +++ b/tests/test_integration.py @@ -207,7 +207,7 @@ def test_index_to_dict(self): } }) - index_dict_mappings = index_dict['doc'] + index_dict_mappings = index_dict['mappings']["doc"] self.assertDictEqual( index_dict_mappings, From 5ead897aa985f9cca709ce99544aecff5be78ef8 Mon Sep 17 00:00:00 2001 From: Safwan Rahman Date: Wed, 9 Dec 2020 20:22:20 +0600 Subject: [PATCH 5/6] fixing tests --- tox.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/tox.ini b/tox.ini index 6512a6f0..d9840442 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,5 @@ [tox] envlist = - {py27,py36,py37}-django-110-{es6} {py27,py36,py37}-django-111-{es6} {py36,py37}-django-2-{es6} {py36,py37}-django-21-{es6} From a55f65f71b3237e3d99aaaef8a907ec64337c7fe Mon Sep 17 00:00:00 2001 From: Safwan Rahman Date: Wed, 9 Dec 2020 20:26:09 +0600 Subject: [PATCH 6/6] fixing tests --- .travis.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8f9e68b2..a8bfc7a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,12 +7,6 @@ dist: xenial # default "precise" distro doesn't include Java 8 for Elasticsearch matrix: include: - - env: TOX_ENV=py36-django-110-es6 - python: 3.6 - - env: TOX_ENV=py37-django-110-es6 - python: 3.7 - - env: TOX_ENV=py27-django-110-es6 - python: 2.7 - env: TOX_ENV=py36-django-111-es6 python: 3.6 - env: TOX_ENV=py37-django-111-es6 pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy