From 48843dd539520c6d437cd3e3edf2e39226dcf537 Mon Sep 17 00:00:00 2001 From: aHardReset Date: Tue, 24 Jan 2023 15:32:34 -0800 Subject: [PATCH 1/5] extending django support up to 3.x --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 137a44e..2ed433f 100755 --- a/setup.py +++ b/setup.py @@ -50,7 +50,7 @@ def get_version(*file_paths): include_package_data=True, install_requires=[ # TBD: GH issue #3 includes support for elasticsearch-dsl>=6.2.0 - "Django>=1.8,<=3.1", "elasticsearch-dsl>=6.0.0,<6.2.0", "texttable>=1.2.1", + "Django>=1.8,<4.0", "elasticsearch-dsl>=6.0.0,<6.2.0", "texttable>=1.2.1", "multiprocessing-logging>=0.2.6" ], zip_safe=False, From 50f9c3fe03219f8a4a102452a60e0a0404dc2584 Mon Sep 17 00:00:00 2001 From: Aaron Garibay Date: Fri, 9 Jun 2023 11:35:50 -0700 Subject: [PATCH 2/5] Modify package name for editable version --- django_elastic_migrations/__init__.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/django_elastic_migrations/__init__.py b/django_elastic_migrations/__init__.py index 26ccb77..804db8b 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.9.0' +__version__ = '7.0.0.alpha1' default_app_config = 'django_elastic_migrations.apps.DjangoElasticMigrationsConfig' # pylint: disable=invalid-name diff --git a/setup.py b/setup.py index 2ed433f..06ff0bb 100755 --- a/setup.py +++ b/setup.py @@ -36,7 +36,7 @@ def get_version(*file_paths): CHANGELOG = open('CHANGELOG.rst').read() setup( - name='django-elastic-migrations', + name='django-elastic-migrations-local', version=VERSION, description="""Manage Elasticsearch Indexes in Django""", long_description=README + '\n\n' + CHANGELOG, From 51ab080e48ce68bc1ebf0cb69d4f2a823877e1b9 Mon Sep 17 00:00:00 2001 From: Divya Dusi Date: Mon, 21 Jul 2025 02:40:08 -0400 Subject: [PATCH 3/5] Update Django and elasticsearch-dsl version constraints for Django 5.2.1 and Python 3.12 support --- setup.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 06ff0bb..d66b5f4 100755 --- a/setup.py +++ b/setup.py @@ -49,13 +49,13 @@ def get_version(*file_paths): license='MIT', include_package_data=True, install_requires=[ - # TBD: GH issue #3 includes support for elasticsearch-dsl>=6.2.0 - "Django>=1.8,<4.0", "elasticsearch-dsl>=6.0.0,<6.2.0", "texttable>=1.2.1", + # Updated to support Django 5.2.1 and elasticsearch-dsl 7.x + "Django>=1.8", "elasticsearch-dsl>=7.0.0,<8.0.0", "texttable>=1.2.1", "multiprocessing-logging>=0.2.6" ], zip_safe=False, keywords='Django Elasticsearch', - python_requires=">=3.6, <=4.0", + python_requires=">=3.8, <4.0", classifiers=[ 'Development Status :: 4 - Beta', 'Framework :: Django', @@ -63,10 +63,23 @@ def get_version(*file_paths): 'Framework :: Django :: 2.0', 'Framework :: Django :: 2.1', 'Framework :: Django :: 2.2', + 'Framework :: Django :: 3.0', + 'Framework :: Django :: 3.1', + 'Framework :: Django :: 3.2', + 'Framework :: Django :: 4.0', + 'Framework :: Django :: 4.1', + 'Framework :: Django :: 4.2', + 'Framework :: Django :: 5.0', + 'Framework :: Django :: 5.1', + 'Framework :: Django :: 5.2', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', ], ) From bcbc4458a9a84d422b764c9d9c867a38a11af948 Mon Sep 17 00:00:00 2001 From: Divya Dusi Date: Mon, 21 Jul 2025 10:48:43 -0400 Subject: [PATCH 4/5] Fix elasticsearch-dsl 7.x compatibility: Replace DocType with Document - DocType was removed in elasticsearch-dsl 7.x and replaced with Document - This change maintains backward compatibility while supporting the new API --- django_elastic_migrations/indexes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django_elastic_migrations/indexes.py b/django_elastic_migrations/indexes.py index 4360a14..6782e0d 100644 --- a/django_elastic_migrations/indexes.py +++ b/django_elastic_migrations/indexes.py @@ -7,7 +7,7 @@ from django.db import ProgrammingError from elasticsearch import TransportError from elasticsearch.helpers import expand_action, bulk -from elasticsearch_dsl import Index as ESIndex, DocType as ESDocType, Q as ESQ, Search +from elasticsearch_dsl import Index as ESIndex, Document as ESDocType, Q as ESQ, Search from django_elastic_migrations import es_client, environment_prefix, es_test_prefix, dem_index_paths, get_logger, codebase_id from django_elastic_migrations.exceptions import DEMIndexNotFound, DEMDocTypeRequiresGetReindexIterator, \ From c94a25769f88f400c8617e2713dc039cb83fc7c1 Mon Sep 17 00:00:00 2001 From: Divya Dusi Date: Mon, 21 Jul 2025 11:24:25 -0400 Subject: [PATCH 5/5] Fix package name to match original django-elastic-migrations --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d66b5f4..b2d9295 100755 --- a/setup.py +++ b/setup.py @@ -36,7 +36,7 @@ def get_version(*file_paths): CHANGELOG = open('CHANGELOG.rst').read() setup( - name='django-elastic-migrations-local', + name='django-elastic-migrations', version=VERSION, description="""Manage Elasticsearch Indexes in Django""", long_description=README + '\n\n' + CHANGELOG,