From c245f32ce2b2f5ea4d57fea132ad7d88c3644e57 Mon Sep 17 00:00:00 2001 From: Myer Nore Date: Sat, 10 Nov 2018 16:44:50 -0500 Subject: [PATCH 1/5] #45 remove support for python 2 --- django_elastic_migrations/__init__.py | 2 -- django_elastic_migrations/apps.py | 1 - django_elastic_migrations/exceptions.py | 1 - django_elastic_migrations/indexes.py | 1 - .../management/commands/es.py | 5 +---- .../management/commands/es_activate.py | 1 - .../management/commands/es_clear.py | 2 -- .../management/commands/es_create.py | 3 --- .../management/commands/es_dangerous_reset.py | 2 -- .../management/commands/es_deactivate.py | 2 -- .../management/commands/es_drop.py | 2 -- .../management/commands/es_list.py | 1 - .../management/commands/es_update.py | 3 --- .../migrations/0001_initial.py | 14 +++++++------ .../migrations/0002_indexaction_argv.py | 3 --- .../0003_indexaction_docs_affected.py | 3 --- .../migrations/0004_auto_20180703_1232.py | 5 ++--- .../migrations/0005_auto_20180703_1340.py | 5 ++--- .../migrations/0006_auto_20180709_2101.py | 8 +++---- django_elastic_migrations/models.py | 6 +----- django_elastic_migrations/urls.py | 1 - django_elastic_migrations/utils/__init__.py | 1 - .../utils/django_elastic_migrations_log.py | 3 --- django_elastic_migrations/utils/es_utils.py | 1 - django_elastic_migrations/utils/loading.py | 1 - .../utils/multiprocessing_utils.py | 21 +++++-------------- django_elastic_migrations/utils/test_utils.py | 1 - tox.ini | 9 ++++---- 28 files changed, 28 insertions(+), 80 deletions(-) diff --git a/django_elastic_migrations/__init__.py b/django_elastic_migrations/__init__.py index 72bb132..8415bb8 100644 --- a/django_elastic_migrations/__init__.py +++ b/django_elastic_migrations/__init__.py @@ -2,8 +2,6 @@ Migrate Elasticsearch-DSL Schemas in Django. """ -from __future__ import print_function -from __future__ import absolute_import, unicode_literals import sys diff --git a/django_elastic_migrations/apps.py b/django_elastic_migrations/apps.py index 7255a6c..31c36d7 100644 --- a/django_elastic_migrations/apps.py +++ b/django_elastic_migrations/apps.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import (absolute_import, division, print_function, unicode_literals) """ django_elastic_migrations Django application initialization. diff --git a/django_elastic_migrations/exceptions.py b/django_elastic_migrations/exceptions.py index b5c953d..7073312 100644 --- a/django_elastic_migrations/exceptions.py +++ b/django_elastic_migrations/exceptions.py @@ -1,4 +1,3 @@ -from __future__ import (absolute_import, division, print_function, unicode_literals) from django.core.management import CommandError diff --git a/django_elastic_migrations/indexes.py b/django_elastic_migrations/indexes.py index d6b204d..5232a1a 100644 --- a/django_elastic_migrations/indexes.py +++ b/django_elastic_migrations/indexes.py @@ -1,5 +1,4 @@ # coding=utf-8 -from __future__ import (absolute_import, division, print_function, unicode_literals) import sys diff --git a/django_elastic_migrations/management/commands/es.py b/django_elastic_migrations/management/commands/es.py index b72761e..e9bec6d 100644 --- a/django_elastic_migrations/management/commands/es.py +++ b/django_elastic_migrations/management/commands/es.py @@ -1,12 +1,9 @@ -from __future__ import (absolute_import, division, print_function, unicode_literals) from django.core.management import BaseCommand, call_command, CommandError from django_elastic_migrations.utils.django_elastic_migrations_log import get_logger - logger = get_logger() - commands = { 'list': 'List indexes; calls es_list', 'create': 'Create indexes; calls es_create', @@ -77,7 +74,7 @@ def get_index_specifying_argument_flag(cls, parser, flag, default=False): @classmethod def get_index_specifying_arguments( - cls, parser, include_exact=True, default_all=False, include_older=False, include_newer=False): + cls, parser, include_exact=True, default_all=False, include_older=False, include_newer=False): messages = cls.get_index_specifying_help_messages() parser.add_argument( 'index', nargs='*', diff --git a/django_elastic_migrations/management/commands/es_activate.py b/django_elastic_migrations/management/commands/es_activate.py index cb33db9..ae32d2e 100644 --- a/django_elastic_migrations/management/commands/es_activate.py +++ b/django_elastic_migrations/management/commands/es_activate.py @@ -1,4 +1,3 @@ -from __future__ import (absolute_import, division, print_function, unicode_literals) from django_elastic_migrations import DEMIndexManager from django_elastic_migrations.management.commands.es import ESCommand diff --git a/django_elastic_migrations/management/commands/es_clear.py b/django_elastic_migrations/management/commands/es_clear.py index 6ea29f8..6d3a534 100644 --- a/django_elastic_migrations/management/commands/es_clear.py +++ b/django_elastic_migrations/management/commands/es_clear.py @@ -1,9 +1,7 @@ -from __future__ import (absolute_import, division, print_function, unicode_literals) from django_elastic_migrations import DEMIndexManager from django_elastic_migrations.management.commands.es import ESCommand from django_elastic_migrations.utils.django_elastic_migrations_log import get_logger - logger = get_logger() diff --git a/django_elastic_migrations/management/commands/es_create.py b/django_elastic_migrations/management/commands/es_create.py index 2eff8d6..e046897 100644 --- a/django_elastic_migrations/management/commands/es_create.py +++ b/django_elastic_migrations/management/commands/es_create.py @@ -1,5 +1,3 @@ -from __future__ import (absolute_import, division, print_function, unicode_literals) - from django_elastic_migrations import DEMIndexManager from django_elastic_migrations.management.commands.es import ESCommand @@ -36,4 +34,3 @@ def handle(self, *args, **options): force=force, es_only=es_only ) - diff --git a/django_elastic_migrations/management/commands/es_dangerous_reset.py b/django_elastic_migrations/management/commands/es_dangerous_reset.py index f2fa0d4..954361a 100644 --- a/django_elastic_migrations/management/commands/es_dangerous_reset.py +++ b/django_elastic_migrations/management/commands/es_dangerous_reset.py @@ -1,4 +1,3 @@ -from __future__ import (absolute_import, division, print_function, unicode_literals) from django.core.management import call_command from django_elastic_migrations import DEMIndexManager @@ -6,7 +5,6 @@ from django_elastic_migrations.models import Index from django_elastic_migrations.utils.django_elastic_migrations_log import get_logger - logger = get_logger() diff --git a/django_elastic_migrations/management/commands/es_deactivate.py b/django_elastic_migrations/management/commands/es_deactivate.py index 274af88..698ead9 100644 --- a/django_elastic_migrations/management/commands/es_deactivate.py +++ b/django_elastic_migrations/management/commands/es_deactivate.py @@ -1,5 +1,3 @@ -from __future__ import (absolute_import, division, print_function, unicode_literals) - from django_elastic_migrations import DEMIndexManager from django_elastic_migrations.management.commands.es import ESCommand diff --git a/django_elastic_migrations/management/commands/es_drop.py b/django_elastic_migrations/management/commands/es_drop.py index 9bf31e2..3e6aa7f 100644 --- a/django_elastic_migrations/management/commands/es_drop.py +++ b/django_elastic_migrations/management/commands/es_drop.py @@ -1,5 +1,3 @@ -from __future__ import (absolute_import, division, print_function, unicode_literals) - from django_elastic_migrations import DEMIndexManager from django_elastic_migrations.exceptions import CannotDropAllIndexesWithoutForceArg from django_elastic_migrations.management.commands.es import ESCommand diff --git a/django_elastic_migrations/management/commands/es_list.py b/django_elastic_migrations/management/commands/es_list.py index 073a866..2661154 100644 --- a/django_elastic_migrations/management/commands/es_list.py +++ b/django_elastic_migrations/management/commands/es_list.py @@ -1,4 +1,3 @@ -from __future__ import (absolute_import, division, print_function, unicode_literals) from texttable import Texttable from django_elastic_migrations import DEMIndexManager diff --git a/django_elastic_migrations/management/commands/es_update.py b/django_elastic_migrations/management/commands/es_update.py index 56d7ffa..8482846 100644 --- a/django_elastic_migrations/management/commands/es_update.py +++ b/django_elastic_migrations/management/commands/es_update.py @@ -1,12 +1,9 @@ -from __future__ import (absolute_import, division, print_function, unicode_literals) - from dateutil.parser import parse as dateutil_parse from django_elastic_migrations import DEMIndexManager, get_logger from django_elastic_migrations.management.commands.es import ESCommand from django_elastic_migrations.utils.multiprocessing_utils import USE_ALL_WORKERS - log = get_logger() diff --git a/django_elastic_migrations/migrations/0001_initial.py b/django_elastic_migrations/migrations/0001_initial.py index d1bb29d..e0be755 100644 --- a/django_elastic_migrations/migrations/0001_initial.py +++ b/django_elastic_migrations/migrations/0001_initial.py @@ -1,15 +1,13 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.8 on 2018-05-23 16:44 -from __future__ import print_function -from __future__ import unicode_literals -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models + import django_elastic_migrations.models class Migration(migrations.Migration): - initial = True dependencies = [ @@ -27,11 +25,15 @@ class Migration(migrations.Migration): name='IndexAction', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('action', models.CharField(choices=[('create_index', 'create_index'), ('activate_index', 'activate_index'), ('clear_index', 'clear_index'), ('update_index', 'update_index'), ('drop_index', 'drop_index'), ('deactivate_index', 'deactivate_index')], max_length=64)), + ('action', models.CharField(choices=[('create_index', 'create_index'), ('activate_index', 'activate_index'), ('clear_index', 'clear_index'), + ('update_index', 'update_index'), ('drop_index', 'drop_index'), ('deactivate_index', 'deactivate_index')], + max_length=64)), ('start', models.DateTimeField(auto_now_add=True)), ('end', models.DateTimeField(blank=True, null=True)), ('last_modified', models.DateTimeField(auto_now=True)), - ('status', models.CharField(choices=[('in_progress', 'in_progress'), ('complete', 'complete'), ('aborted', 'aborted'), ('queued', 'queued')], default='queued', max_length=32)), + ('status', + models.CharField(choices=[('in_progress', 'in_progress'), ('complete', 'complete'), ('aborted', 'aborted'), ('queued', 'queued')], default='queued', + max_length=32)), ('log', models.TextField(blank=True)), ('index', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='django_elastic_migrations.Index')), ], diff --git a/django_elastic_migrations/migrations/0002_indexaction_argv.py b/django_elastic_migrations/migrations/0002_indexaction_argv.py index 1e7b033..6a820a8 100644 --- a/django_elastic_migrations/migrations/0002_indexaction_argv.py +++ b/django_elastic_migrations/migrations/0002_indexaction_argv.py @@ -1,13 +1,10 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.8 on 2018-05-31 10:09 -from __future__ import print_function -from __future__ import unicode_literals from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('django_elastic_migrations', '0001_initial'), ] diff --git a/django_elastic_migrations/migrations/0003_indexaction_docs_affected.py b/django_elastic_migrations/migrations/0003_indexaction_docs_affected.py index a4a4ecb..fe5fc10 100644 --- a/django_elastic_migrations/migrations/0003_indexaction_docs_affected.py +++ b/django_elastic_migrations/migrations/0003_indexaction_docs_affected.py @@ -1,13 +1,10 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.8 on 2018-05-31 20:18 -from __future__ import print_function -from __future__ import unicode_literals from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('django_elastic_migrations', '0002_indexaction_argv'), ] diff --git a/django_elastic_migrations/migrations/0004_auto_20180703_1232.py b/django_elastic_migrations/migrations/0004_auto_20180703_1232.py index cc0d807..6d1ccce 100644 --- a/django_elastic_migrations/migrations/0004_auto_20180703_1232.py +++ b/django_elastic_migrations/migrations/0004_auto_20180703_1232.py @@ -1,12 +1,10 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.8 on 2018-07-03 12:32 -from __future__ import unicode_literals from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('django_elastic_migrations', '0003_indexaction_docs_affected'), ] @@ -15,6 +13,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='indexaction', name='action', - field=models.CharField(choices=[('create_index', 'create_index'), ('update_index', 'update_index'), ('activate_index', 'activate_index'), ('deactivate_index', 'deactivate_index'), ('clear_index', 'clear_index'), ('drop_index', 'drop_index')], max_length=64), + field=models.CharField(choices=[('create_index', 'create_index'), ('update_index', 'update_index'), ('activate_index', 'activate_index'), + ('deactivate_index', 'deactivate_index'), ('clear_index', 'clear_index'), ('drop_index', 'drop_index')], max_length=64), ), ] diff --git a/django_elastic_migrations/migrations/0005_auto_20180703_1340.py b/django_elastic_migrations/migrations/0005_auto_20180703_1340.py index 8a91568..1a555ac 100644 --- a/django_elastic_migrations/migrations/0005_auto_20180703_1340.py +++ b/django_elastic_migrations/migrations/0005_auto_20180703_1340.py @@ -1,12 +1,10 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.8 on 2018-07-03 13:40 -from __future__ import unicode_literals from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('django_elastic_migrations', '0004_auto_20180703_1232'), ] @@ -15,6 +13,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='indexaction', name='status', - field=models.CharField(choices=[('queued', 'queued'), ('in_progress', 'in_progress'), ('complete', 'complete'), ('aborted', 'aborted')], default='queued', max_length=32), + field=models.CharField(choices=[('queued', 'queued'), ('in_progress', 'in_progress'), ('complete', 'complete'), ('aborted', 'aborted')], + default='queued', max_length=32), ), ] diff --git a/django_elastic_migrations/migrations/0006_auto_20180709_2101.py b/django_elastic_migrations/migrations/0006_auto_20180709_2101.py index 60733b0..b806726 100644 --- a/django_elastic_migrations/migrations/0006_auto_20180709_2101.py +++ b/django_elastic_migrations/migrations/0006_auto_20180709_2101.py @@ -1,13 +1,11 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.8 on 2018-07-09 21:01 -from __future__ import unicode_literals -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('django_elastic_migrations', '0005_auto_20180703_1340'), ] @@ -35,6 +33,8 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='indexaction', name='action', - field=models.CharField(choices=[('create_index', 'create_index'), ('update_index', 'update_index'), ('activate_index', 'activate_index'), ('deactivate_index', 'deactivate_index'), ('clear_index', 'clear_index'), ('drop_index', 'drop_index'), ('partial_update_index', 'partial_update_index')], max_length=64), + field=models.CharField(choices=[('create_index', 'create_index'), ('update_index', 'update_index'), ('activate_index', 'activate_index'), + ('deactivate_index', 'deactivate_index'), ('clear_index', 'clear_index'), ('drop_index', 'drop_index'), + ('partial_update_index', 'partial_update_index')], max_length=64), ), ] diff --git a/django_elastic_migrations/models.py b/django_elastic_migrations/models.py index 6cda607..8a744b7 100644 --- a/django_elastic_migrations/models.py +++ b/django_elastic_migrations/models.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import (absolute_import, division, print_function, unicode_literals) import datetime import json @@ -13,7 +12,6 @@ from django.db import models, transaction, OperationalError from django.utils import timezone -from django.utils.encoding import python_2_unicode_compatible from elasticsearch import TransportError from django_elastic_migrations import codebase_id, environment_prefix, DEMIndexManager, es_client @@ -25,7 +23,6 @@ logger = get_logger() -@python_2_unicode_compatible class Index(models.Model): """ Model that retains information about all Elasticsearch indexes @@ -114,7 +111,6 @@ def get_newer_versions(self, given_version=None, prefix=environment_prefix): return self._get_other_versions(given_version, prefix, older=False) -@python_2_unicode_compatible class IndexVersion(models.Model): """ Each IndexVersion corresponds with an Elasticsearch index @@ -200,7 +196,6 @@ def exists_in_es(self): return es_client.indices.exists(index=self.name) -@python_2_unicode_compatible class IndexAction(models.Model): """ Each Action is a record of a bulk change to a particular @@ -412,6 +407,7 @@ def get_task_kwargs(self): return json.loads(self.task_kwargs) return {} + """ ↓ Action Mixins Below ↓ diff --git a/django_elastic_migrations/urls.py b/django_elastic_migrations/urls.py index 20a6893..73c3474 100644 --- a/django_elastic_migrations/urls.py +++ b/django_elastic_migrations/urls.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import (absolute_import, division, print_function, unicode_literals) """ URLs for django_elastic_migrations. """ diff --git a/django_elastic_migrations/utils/__init__.py b/django_elastic_migrations/utils/__init__.py index 77b4367..cb8bac7 100644 --- a/django_elastic_migrations/utils/__init__.py +++ b/django_elastic_migrations/utils/__init__.py @@ -1,2 +1 @@ -from __future__ import (absolute_import, division, print_function, unicode_literals) import importlib diff --git a/django_elastic_migrations/utils/django_elastic_migrations_log.py b/django_elastic_migrations/utils/django_elastic_migrations_log.py index 7f038bc..4a36f75 100644 --- a/django_elastic_migrations/utils/django_elastic_migrations_log.py +++ b/django_elastic_migrations/utils/django_elastic_migrations_log.py @@ -1,10 +1,7 @@ -from __future__ import (absolute_import, division, print_function, unicode_literals) - import logging from multiprocessing_logging import install_mp_handler - mp_logging_enabled = False diff --git a/django_elastic_migrations/utils/es_utils.py b/django_elastic_migrations/utils/es_utils.py index 269557d..055136a 100644 --- a/django_elastic_migrations/utils/es_utils.py +++ b/django_elastic_migrations/utils/es_utils.py @@ -1,4 +1,3 @@ -from __future__ import print_function import hashlib import json diff --git a/django_elastic_migrations/utils/loading.py b/django_elastic_migrations/utils/loading.py index b1b92d8..4036613 100644 --- a/django_elastic_migrations/utils/loading.py +++ b/django_elastic_migrations/utils/loading.py @@ -1,5 +1,4 @@ # encoding: utf-8 -from __future__ import (absolute_import, division, print_function, unicode_literals) from django_elastic_migrations.utils import importlib diff --git a/django_elastic_migrations/utils/multiprocessing_utils.py b/django_elastic_migrations/utils/multiprocessing_utils.py index 3fa228f..ae4c47e 100644 --- a/django_elastic_migrations/utils/multiprocessing_utils.py +++ b/django_elastic_migrations/utils/multiprocessing_utils.py @@ -1,30 +1,19 @@ # coding=utf-8 -from __future__ import (absolute_import, division, print_function, unicode_literals) import time - -from django.db import reset_queries - -from django_elastic_migrations.utils.django_elastic_migrations_log import start_multiprocessing_logging - -try: - # python 2 - # noinspection PyCompatibility - from Queue import Empty -except ImportError: - # python 3 - # noinspection PyUnresolvedReferences,PyCompatibility - from queue import Empty - -from multiprocessing import Process, cpu_count, Manager import traceback +from multiprocessing import Process, cpu_count, Manager +# noinspection PyCompatibility +from queue import Empty from django import db from django.conf import settings from django.core.cache import caches +from django.db import reset_queries from elasticsearch_dsl import connections from django_elastic_migrations import get_logger as get_dem_logger +from django_elastic_migrations.utils.django_elastic_migrations_log import start_multiprocessing_logging logger = get_dem_logger() diff --git a/django_elastic_migrations/utils/test_utils.py b/django_elastic_migrations/utils/test_utils.py index 3e0bdbb..18b4f36 100644 --- a/django_elastic_migrations/utils/test_utils.py +++ b/django_elastic_migrations/utils/test_utils.py @@ -1,4 +1,3 @@ -from __future__ import (absolute_import, division, print_function, unicode_literals) from django.test import TestCase from django_elastic_migrations import DEMIndexManager diff --git a/tox.ini b/tox.ini index 417e808..50c85f2 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,8 @@ [tox] envlist = - {py27,py36}-django19-{es61} + {py35,py36}-{django110,django111}-{es61} ; not implemented yet - DocType Changes in es62 pending - see github issue #3 Support elasticsearch-dsl 6.2 - ; {py27}-django19-{es62} + ; {py35}-django19-{es62} [doc8] max-line-length = 120 @@ -20,9 +20,9 @@ ignore = D101,D200,D203,D212 match-dir = (?!migrations) basepython = - py27: python2.7 py35: python3.5 py36: python3.6 + py37: python3.7 [testenv] setenv = @@ -34,7 +34,8 @@ deps = django19: Django>=1.9,<1.10 django110: Django>=1.10,<1.11 django111: Django>=1.11,<2.0 - django2: Django>=2.0,<2.1 + django20: Django>=2.0,<2.1 + django21: Django>=2.1,<2.2 ; https://pypi.org/project/elasticsearch-dsl/#history es60: elasticsearch-dsl>=6.0.0,<6.1.0 es61: elasticsearch-dsl>=6.1.0,<6.2.0 From fd56b826d5ed6323ff2fccfe9bd27bad86834069 Mon Sep 17 00:00:00 2001 From: Myer Nore Date: Sun, 11 Nov 2018 12:38:01 -0500 Subject: [PATCH 2/5] add python 3.5 & django 110, 111 to .travis.yml #45 remove support for python 2 --- .travis.yml | 10 ++++------ tox.ini | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index cb4bd9a..6fc7230 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,12 +11,10 @@ branches: matrix: include: - - env: TOX_ENV=py27-django19-es60 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt - python: 2.7 - - env: TOX_ENV=py27-django19-es61 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt - python: 2.7 - - env: TOX_ENV=py36-django19-es61 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt - python: 3.6 + - env: TOX_ENV=py35-django110-es60 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt + python: 3.5 + - env: TOX_ENV=py35-django111-es60 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt + python: 3.5 # TBD support - will be implemented in #5 # allow_failures: # - env: TOX_ENV=py27-django19-es62 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt diff --git a/tox.ini b/tox.ini index 50c85f2..1b973a4 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - {py35,py36}-{django110,django111}-{es61} + {py35}-{django110,django111}-{es61} ; not implemented yet - DocType Changes in es62 pending - see github issue #3 Support elasticsearch-dsl 6.2 ; {py35}-django19-{es62} From fad8b4e59ecc1cebeca4665f04ca3de9552dfa06 Mon Sep 17 00:00:00 2001 From: "P. Myer Nore" Date: Tue, 13 Nov 2018 09:53:27 -0500 Subject: [PATCH 3/5] add reference to PyPI package in README * https://pypi.org/project/django-elastic-migrations/ #52 bump 0.7.7 to 0.7.8 and release on PyPI --- README.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 4c5dfb4..1eaf601 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ Django Elastic Migrations ========================= -Django Elastic Migrations is a Django app for creating, indexing and changing schemas of Elasticsearch indexes. +`django-elastic-migrations`_ is a Django app for creating, indexing and changing schemas of Elasticsearch indexes. .. image:: https://travis-ci.com/HBS-HBX/django-elastic-migrations.svg?branch=master @@ -14,6 +14,7 @@ Django Elastic Migrations is a Django app for creating, indexing and changing sc :target: https://codecov.io/gh/HBS-HBX/django-elastic-migrations :alt: codecov +.. _django-elastic-migrations: https://pypi.org/project/django-elastic-migrations/ Overview -------- @@ -100,7 +101,7 @@ Usage Installation ~~~~~~~~~~~~ -#. ``pip install django-elastic-migrations`` +#. ``pip install django-elastic-migrations``; see `django-elastic-migrations`_ on PyPI #. Put a reference to this package in your ``requirements.txt`` #. Ensure that a valid ``elasticsearch-dsl-py`` version is accessible, and configure the path to your configured Elasticsearch singleton client in your django settings: From 92ae3ee9d16d3720350fc64d36a15d1b39c9c938 Mon Sep 17 00:00:00 2001 From: "P. Myer Nore" Date: Tue, 13 Nov 2018 09:59:34 -0500 Subject: [PATCH 4/5] update development status #52 bump 0.7.7 to 0.7.8 and release on PyPI --- setup.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/setup.py b/setup.py index d14d434..2db478d 100755 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ def get_version(*file_paths): zip_safe=False, keywords='Django Elasticsearch', classifiers=[ - 'Development Status :: 3 - Alpha', + 'Development Status :: 4 - Beta', 'Framework :: Django', 'Framework :: Django :: 1.9', 'Framework :: Django :: 1.10', @@ -65,8 +65,6 @@ def get_version(*file_paths): 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', ], From 48f67bf766b79d3c679086d92f0c341556fa2624 Mon Sep 17 00:00:00 2001 From: "P. Myer Nore" Date: Tue, 13 Nov 2018 10:31:44 -0500 Subject: [PATCH 5/5] bump 0.7.8 --> 0.8.0 #52 bump 0.7.7 to 0.7.8 and release on PyPI --- CHANGELOG.rst | 8 ++++++++ django_elastic_migrations/__init__.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 46ac81e..47cd819 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,14 @@ Changelog --------- +0.8.0 (2018-11-13) +^^^^^^^^^^^^^^^^^^^^^^ +* fix `#6 support Django 2 `_ +* fix `#43 remove es_deactivate `_ +* fix `#44 add django 1.10 and 1.11 to test matrix `_ +* fix `#45 remove support for python 2 `_ +* In practice, Python 2 may work, but it is removed from the test matrix and won't be updated + 0.7.8 (2018-11-13) ^^^^^^^^^^^^^^^^^^^^^^ * fix `#7 Convert Readme to rst for pypi `_ diff --git a/django_elastic_migrations/__init__.py b/django_elastic_migrations/__init__.py index 5dd5963..602cf5c 100644 --- a/django_elastic_migrations/__init__.py +++ b/django_elastic_migrations/__init__.py @@ -8,7 +8,7 @@ from django_elastic_migrations.utils import loading from django_elastic_migrations.utils.django_elastic_migrations_log import get_logger -__version__ = '0.7.8' +__version__ = '0.8.0' default_app_config = 'django_elastic_migrations.apps.DjangoElasticMigrationsConfig' # pylint: disable=invalid-name