Skip to content

Commit 69217dc

Browse files
rafaelcassaurafaelcassau
authored
Merge pull request #3 from loadsmart/fix-breaking-changes-on-elasticclient-v8
[NX-4097] - Add compatibity to import `AggsProxy` from elasticsearch v8
2 parents daa351a + 72f08aa commit 69217dc

File tree

3 files changed

+219
-242
lines changed

3 files changed

+219
-242
lines changed

‎setup.py‎

Lines changed: 127 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -2,182 +2,182 @@
22

33
from setuptools import find_packages, setup
44

5-
version = '0.22.5'
5+
version = "1.0"
66

77
DOCS_TRANSFORMATIONS = (
88
(
9-
':doc:`Dynamic serializer for Documents <basic_usage_examples>`',
10-
'`Dynamic serializer for Documents <'
11-
'http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/'
12-
'basic_usage_examples.html#sample-serializer'
13-
'>`_'.format(version)
9+
":doc:`Dynamic serializer for Documents <basic_usage_examples>`",
10+
"`Dynamic serializer for Documents <"
11+
"http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/"
12+
"basic_usage_examples.html#sample-serializer"
13+
">`_".format(version),
1414
),
1515
(
16-
':doc:`Search filter backend <advanced_usage_examples>`',
17-
'`Search filter backend <'
18-
'http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/'
19-
'advanced_usage_examples.html#search'
20-
'>`_'.format(version)
16+
":doc:`Search filter backend <advanced_usage_examples>`",
17+
"`Search filter backend <"
18+
"http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/"
19+
"advanced_usage_examples.html#search"
20+
">`_".format(version),
2121
),
2222
(
23-
':doc:`Ordering filter backend <advanced_usage_examples>`',
24-
'`Ordering filter backend <'
25-
'http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/'
26-
'advanced_usage_examples.html#ordering'
27-
'>`_'.format(version)
23+
":doc:`Ordering filter backend <advanced_usage_examples>`",
24+
"`Ordering filter backend <"
25+
"http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/"
26+
"advanced_usage_examples.html#ordering"
27+
">`_".format(version),
2828
),
2929
(
30-
':doc:`Filtering filter backend <advanced_usage_examples>`',
31-
'`Filtering filter backend <'
32-
'http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/'
33-
'advanced_usage_examples.html#filtering'
34-
'>`_'.format(version)
30+
":doc:`Filtering filter backend <advanced_usage_examples>`",
31+
"`Filtering filter backend <"
32+
"http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/"
33+
"advanced_usage_examples.html#filtering"
34+
">`_".format(version),
3535
),
3636
(
37-
':doc:`Geo-spatial filtering filter backend <advanced_usage_examples>`',
38-
'`Geo-spatial filtering filter backend <'
39-
'http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/'
40-
'advanced_usage_examples.html#geo-spatial-features'
41-
'>`_'.format(version)
37+
":doc:`Geo-spatial filtering filter backend <advanced_usage_examples>`",
38+
"`Geo-spatial filtering filter backend <"
39+
"http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/"
40+
"advanced_usage_examples.html#geo-spatial-features"
41+
">`_".format(version),
4242
),
4343
(
44-
':doc:`Geo-spatial ordering filter backend <advanced_usage_examples>`',
45-
'`Geo-spatial ordering filter backend <'
46-
'http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/'
47-
'advanced_usage_examples.html#geo-spatial-features'
48-
'>`_'.format(version)
44+
":doc:`Geo-spatial ordering filter backend <advanced_usage_examples>`",
45+
"`Geo-spatial ordering filter backend <"
46+
"http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/"
47+
"advanced_usage_examples.html#geo-spatial-features"
48+
">`_".format(version),
4949
),
5050
(
51-
':doc:`Faceted search filter backend <advanced_usage_examples>`',
52-
'`Faceted search filter backend <'
53-
'http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/'
54-
'advanced_usage_examples.html#faceted-search'
55-
'>`_'.format(version)
51+
":doc:`Faceted search filter backend <advanced_usage_examples>`",
52+
"`Faceted search filter backend <"
53+
"http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/"
54+
"advanced_usage_examples.html#faceted-search"
55+
">`_".format(version),
5656
),
5757
(
58-
':doc:`Post-filter filter backend <advanced_usage_examples>`',
59-
'`Post-filter filter backend <'
60-
'http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/'
61-
'advanced_usage_examples.html#post-filter'
62-
'>`_'.format(version)
58+
":doc:`Post-filter filter backend <advanced_usage_examples>`",
59+
"`Post-filter filter backend <"
60+
"http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/"
61+
"advanced_usage_examples.html#post-filter"
62+
">`_".format(version),
6363
),
6464
(
65-
':doc:`Nested filtering filter backend <nested_fields_usage_examples>`',
66-
'`Nested filtering filter backend <'
67-
'http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/'
68-
'nested_fields_usage_examples.html#nested-filtering'
69-
'>`_'.format(version)
65+
":doc:`Nested filtering filter backend <nested_fields_usage_examples>`",
66+
"`Nested filtering filter backend <"
67+
"http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/"
68+
"nested_fields_usage_examples.html#nested-filtering"
69+
">`_".format(version),
7070
),
7171
(
72-
':doc:`Highlight backend <advanced_usage_examples>`',
73-
'`Highlight backend <'
74-
'http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/'
75-
'advanced_usage_examples.html#highlighting'
76-
'>`_'.format(version)
72+
":doc:`Highlight backend <advanced_usage_examples>`",
73+
"`Highlight backend <"
74+
"http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/"
75+
"advanced_usage_examples.html#highlighting"
76+
">`_".format(version),
7777
),
7878
(
79-
':doc:`Pagination (Page number and limit/offset pagination) '
80-
'<advanced_usage_examples>`',
81-
'`Pagination (Page number and limit/offset pagination) <'
82-
'http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/'
83-
'advanced_usage_examples.html#pagination'
84-
'>`_'.format(version)
79+
":doc:`Pagination (Page number and limit/offset pagination) "
80+
"<advanced_usage_examples>`",
81+
"`Pagination (Page number and limit/offset pagination) <"
82+
"http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/"
83+
"advanced_usage_examples.html#pagination"
84+
">`_".format(version),
8585
),
8686
(
87-
':doc:`quick start tutorial <quick_start>`',
88-
'`quick start tutorial <'
89-
'http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/'
90-
'quick_start.html'
91-
'>`_'.format(version)
87+
":doc:`quick start tutorial <quick_start>`",
88+
"`quick start tutorial <"
89+
"http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/"
90+
"quick_start.html"
91+
">`_".format(version),
9292
),
9393
(
94-
':doc:`Suggester filter backend <advanced_usage_examples>`',
95-
'`Suggester filter backend <'
96-
'http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/'
97-
'advanced_usage_examples.html#suggestions'
98-
'>`_'.format(version)
94+
":doc:`Suggester filter backend <advanced_usage_examples>`",
95+
"`Suggester filter backend <"
96+
"http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/"
97+
"advanced_usage_examples.html#suggestions"
98+
">`_".format(version),
9999
),
100100
(
101-
':doc:`Functional suggester filter backend <advanced_usage_examples>`',
102-
'`Functional suggester filter backend <'
103-
'http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/'
104-
'advanced_usage_examples.html#functional-suggestions'
105-
'>`_'.format(version)
101+
":doc:`Functional suggester filter backend <advanced_usage_examples>`",
102+
"`Functional suggester filter backend <"
103+
"http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/"
104+
"advanced_usage_examples.html#functional-suggestions"
105+
">`_".format(version),
106106
),
107107
(
108-
':doc:`Ids filter backend <advanced_usage_examples>`',
109-
'`Ids filter backend <'
110-
'http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/'
111-
'advanced_usage_examples.html#ids-filter'
112-
'>`_'.format(version)
108+
":doc:`Ids filter backend <advanced_usage_examples>`",
109+
"`Ids filter backend <"
110+
"http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/"
111+
"advanced_usage_examples.html#ids-filter"
112+
">`_".format(version),
113113
),
114114
(
115-
':doc:`Multi match search filter backend <search_backends>`',
116-
'`Multi match search filter backend <'
117-
'http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/'
118-
'search_backends.html#multi-match-search-filter-backend'
119-
'>`_'.format(version)
115+
":doc:`Multi match search filter backend <search_backends>`",
116+
"`Multi match search filter backend <"
117+
"http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/"
118+
"search_backends.html#multi-match-search-filter-backend"
119+
">`_".format(version),
120120
),
121121
(
122-
':doc:`Simple search query search filter backend <search_backends>`',
123-
'`Simple search query filter backend <'
124-
'http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/'
125-
'search_backends.html#simple-query-string-filter-backend'
126-
'>`_'.format(version)
122+
":doc:`Simple search query search filter backend <search_backends>`",
123+
"`Simple search query filter backend <"
124+
"http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/"
125+
"search_backends.html#simple-query-string-filter-backend"
126+
">`_".format(version),
127127
),
128128
(
129-
':doc:`More-like-this support (detail action) <more_like_this>`',
130-
'`More-like-this support (detail action) <'
131-
'http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/'
132-
'more_like_this.html'
133-
'>`_'.format(version)
129+
":doc:`More-like-this support (detail action) <more_like_this>`",
130+
"`More-like-this support (detail action) <"
131+
"http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/"
132+
"more_like_this.html"
133+
">`_".format(version),
134134
),
135135
(
136-
':doc:`Global aggregations support <global_aggregations>`',
137-
'`Global aggregations support <'
138-
'http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/'
139-
'global_aggregations.html'
140-
'>`_'.format(version)
136+
":doc:`Global aggregations support <global_aggregations>`",
137+
"`Global aggregations support <"
138+
"http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/"
139+
"global_aggregations.html"
140+
">`_".format(version),
141141
),
142142
(
143-
':doc:`Source filter backend <source_backend>`',
144-
'`Source filter backend <'
145-
'http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/'
146-
'source_backend.html'
147-
'>`_'.format(version)
143+
":doc:`Source filter backend <source_backend>`",
144+
"`Source filter backend <"
145+
"http://django-elasticsearch-dsl-drf.readthedocs.io/en/{}/"
146+
"source_backend.html"
147+
">`_".format(version),
148148
),
149149
)
150150

151151
try:
152-
readme = open(os.path.join(os.path.dirname(__file__), 'README.rst')).read()
152+
readme = open(os.path.join(os.path.dirname(__file__), "README.rst")).read()
153153
for __search, __replace in DOCS_TRANSFORMATIONS:
154154
readme = readme.replace(__search, __replace)
155155
except:
156-
readme = ''
156+
readme = ""
157157

158158
install_requires = [
159-
'six>=1.9',
160-
'django-nine>=0.2',
161-
'django-elasticsearch-dsl>=6.4.1',
162-
'elasticsearch-dsl',
163-
'elasticsearch',
164-
'djangorestframework',
159+
"six>=1.9",
160+
"django-nine>=0.2",
161+
"django-elasticsearch-dsl>=6.4.1",
162+
"elasticsearch-dsl",
163+
"elasticsearch",
164+
"djangorestframework",
165165
]
166166

167167
extras_require = []
168168

169169
tests_require = [
170-
'factory_boy',
171-
'Faker',
172-
'pytest',
173-
'pytest-django',
174-
'pytest-cov',
175-
'tox',
176-
'mock',
170+
"factory_boy",
171+
"Faker",
172+
"pytest",
173+
"pytest-django",
174+
"pytest-cov",
175+
"tox",
176+
"mock",
177177
]
178178

179179
setup(
180-
name='django-elasticsearch-dsl-drf',
180+
name="django-elasticsearch-dsl-drf",
181181
version=version,
182182
description="Integrate Elasticsearch DSL with Django REST framework.",
183183
long_description=readme,
@@ -197,20 +197,20 @@
197197
],
198198
project_urls={
199199
"Bug Tracker": "https://github.com/barseghyanartur/"
200-
"django-elasticsearch-dsl-drf/issues",
200+
"django-elasticsearch-dsl-drf/issues",
201201
"Documentation": "https://django-elasticsearch-dsl-drf.readthedocs.io/",
202202
"Source Code": "https://github.com/barseghyanartur/"
203-
"django-elasticsearch-dsl-drf",
203+
"django-elasticsearch-dsl-drf",
204204
"Changelog": "https://django-elasticsearch-dsl-drf.readthedocs.io/"
205-
"en/latest/changelog.html",
205+
"en/latest/changelog.html",
206206
},
207207
keywords="django, elasticsearch, elasticsearch-dsl, django rest framework",
208-
author='Artur Barseghyan',
209-
author_email='artur.barseghyan@gmail.com',
210-
url='https://github.com/barseghyanartur/django-elasticsearch-dsl-drf/',
211-
package_dir={'': 'src'},
212-
packages=find_packages(where='./src'),
213-
license='GPL-2.0-only OR LGPL-2.1-or-later',
208+
author="Artur Barseghyan",
209+
author_email="artur.barseghyan@gmail.com",
210+
url="https://github.com/barseghyanartur/django-elasticsearch-dsl-drf/",
211+
package_dir={"": "src"},
212+
packages=find_packages(where="./src"),
213+
license="GPL-2.0-only OR LGPL-2.1-or-later",
214214
python_requires=">=2.7",
215215
install_requires=(install_requires + extras_require),
216216
tests_require=tests_require,

0 commit comments

Comments
 (0)