diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 8616494..6e37d6c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,10 @@ Changelog --------- +0.7.7 (2018-09-17) +~~~~~~~~~~~~~~~~~~ +* fix `#41 stack trace when indexing in py3 `_ + 0.7.6 (2018-09-11) ~~~~~~~~~~~~~~~~~~ * fix `#36 es_update --start flag broken `_ diff --git a/README.md b/README.md index 28acb49..c131e88 100644 --- a/README.md +++ b/README.md @@ -377,6 +377,12 @@ $ ./manage.py loaddata tests/myfixture.json Installed 101 object(s) from 1 fixture(s) ``` +There are already 100 films available using `loaddata` as follows: + +``` +$ ./manage.py loaddata tests/100films.json +``` + ### Running Tests Locally Run `make test`. To run all tests and quality checks locally, diff --git a/django_elastic_migrations/__init__.py b/django_elastic_migrations/__init__.py index f1aa71a..72bb132 100644 --- a/django_elastic_migrations/__init__.py +++ b/django_elastic_migrations/__init__.py @@ -10,7 +10,7 @@ from django_elastic_migrations.utils import loading from django_elastic_migrations.utils.django_elastic_migrations_log import get_logger -__version__ = '0.7.6' +__version__ = '0.7.7' default_app_config = 'django_elastic_migrations.apps.DjangoElasticMigrationsConfig' # pylint: disable=invalid-name diff --git a/django_elastic_migrations/indexes.py b/django_elastic_migrations/indexes.py index ecfa488..d6b204d 100644 --- a/django_elastic_migrations/indexes.py +++ b/django_elastic_migrations/indexes.py @@ -579,7 +579,7 @@ def generate_batches(cls, qs=None, batch_size=BATCH_SIZE, total_items=None, upda try: qs_ids = list(qs.values_list(cls.PK_ATTRIBUTE, flat=True)) except TypeError as e: - if "values_list() got an unexpected keyword argument 'flat'" in e: + if "values_list() got an unexpected keyword argument 'flat'" in str(e): qs_ids = [str(id) for id in list(qs.values_list(cls.PK_ATTRIBUTE))] else: raise