Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

Commit 0255f3b

Browse files
schenedxschenedx
authored
Merge pull request #474 from edx/schen/pin_es_version
[Fix] Pin the version of elasticsearch library to < 7.14.0
2 parents fca3c63 + 07d7367 commit 0255f3b

6 files changed

Lines changed: 39 additions & 28 deletions

File tree

‎requirements/base.txt‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#
77
boto==2.42.0
88
# via -r requirements/base.in
9-
boto3==1.18.18
9+
boto3==1.18.21
1010
# via -r requirements/base.in
11-
botocore==1.21.18
11+
botocore==1.21.21
1212
# via
1313
# boto3
1414
# s3transfer
@@ -100,7 +100,7 @@ edx-drf-extensions==7.0.1
100100
# -r requirements/base.in
101101
# edx-enterprise-data
102102
# edx-rbac
103-
edx-enterprise-data==2.2.19
103+
edx-enterprise-data==2.2.20
104104
# via -r requirements/base.in
105105
edx-opaque-keys==2.2.2
106106
# via
@@ -114,8 +114,10 @@ edx-rest-api-client==5.4.0
114114
# via
115115
# -r requirements/base.in
116116
# edx-enterprise-data
117-
elasticsearch==7.14.0
118-
# via elasticsearch-dsl
117+
elasticsearch==7.13.4
118+
# via
119+
# -c requirements/constraints.txt
120+
# elasticsearch-dsl
119121
elasticsearch-dsl==7.4.0
120122
# via
121123
# -c requirements/constraints.txt

‎requirements/constraints.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
# django-storages version 1.9 drops support for boto storage backend.
1818
django-storages<1.9 # BSD
1919

20+
# elasticsearch library cannot be greater than 7.14.0. 7.14.0 library is not compatible with the 7.10 server in stage and prod
21+
elasticsearch < 7.14.0
22+
2023
# elasticsearch-dsl depends on elasticsearch >=7.8.0,<8.0.0
2124
elasticsearch-dsl>=7.2.1,<8.0.0
2225

‎requirements/dev.txt‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#
77
boto==2.42.0
88
# via -r requirements/base.in
9-
boto3==1.18.18
9+
boto3==1.18.21
1010
# via -r requirements/base.in
11-
botocore==1.21.18
11+
botocore==1.21.21
1212
# via
1313
# boto3
1414
# s3transfer
@@ -100,7 +100,7 @@ edx-drf-extensions==7.0.1
100100
# -r requirements/base.in
101101
# edx-enterprise-data
102102
# edx-rbac
103-
edx-enterprise-data==2.2.19
103+
edx-enterprise-data==2.2.20
104104
# via -r requirements/base.in
105105
edx-opaque-keys==2.2.2
106106
# via
@@ -114,8 +114,10 @@ edx-rest-api-client==5.4.0
114114
# via
115115
# -r requirements/base.in
116116
# edx-enterprise-data
117-
elasticsearch==7.14.0
118-
# via elasticsearch-dsl
117+
elasticsearch==7.13.4
118+
# via
119+
# -c requirements/constraints.txt
120+
# elasticsearch-dsl
119121
elasticsearch-dsl==7.4.0
120122
# via
121123
# -c requirements/constraints.txt

‎requirements/doc.txt‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ babel==2.9.1
1010
# via sphinx
1111
boto==2.42.0
1212
# via -r requirements/base.in
13-
boto3==1.18.18
13+
boto3==1.18.21
1414
# via -r requirements/base.in
15-
botocore==1.21.18
15+
botocore==1.21.21
1616
# via
1717
# boto3
1818
# s3transfer
@@ -106,7 +106,7 @@ edx-drf-extensions==7.0.1
106106
# -r requirements/base.in
107107
# edx-enterprise-data
108108
# edx-rbac
109-
edx-enterprise-data==2.2.19
109+
edx-enterprise-data==2.2.20
110110
# via -r requirements/base.in
111111
edx-opaque-keys==2.2.2
112112
# via
@@ -122,8 +122,10 @@ edx-rest-api-client==5.4.0
122122
# edx-enterprise-data
123123
edx-sphinx-theme==3.0.0
124124
# via -r requirements/doc.in
125-
elasticsearch==7.14.0
126-
# via elasticsearch-dsl
125+
elasticsearch==7.13.4
126+
# via
127+
# -c requirements/constraints.txt
128+
# elasticsearch-dsl
127129
elasticsearch-dsl==7.4.0
128130
# via
129131
# -c requirements/constraints.txt

‎requirements/production.txt‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#
77
boto==2.42.0
88
# via -r requirements/base.in
9-
boto3==1.18.18
9+
boto3==1.18.21
1010
# via -r requirements/base.in
11-
botocore==1.21.18
11+
botocore==1.21.21
1212
# via
1313
# boto3
1414
# s3transfer
@@ -100,7 +100,7 @@ edx-drf-extensions==7.0.1
100100
# -r requirements/base.in
101101
# edx-enterprise-data
102102
# edx-rbac
103-
edx-enterprise-data==2.2.19
103+
edx-enterprise-data==2.2.20
104104
# via -r requirements/base.in
105105
edx-opaque-keys==2.2.2
106106
# via
@@ -114,8 +114,10 @@ edx-rest-api-client==5.4.0
114114
# via
115115
# -r requirements/base.in
116116
# edx-enterprise-data
117-
elasticsearch==7.14.0
118-
# via elasticsearch-dsl
117+
elasticsearch==7.13.4
118+
# via
119+
# -c requirements/constraints.txt
120+
# elasticsearch-dsl
119121
elasticsearch-dsl==7.4.0
120122
# via
121123
# -c requirements/constraints.txt

‎requirements/test.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ attrs==21.2.0
1010
# via pytest
1111
boto==2.42.0
1212
# via -r requirements/base.in
13-
boto3==1.18.18
13+
boto3==1.18.21
1414
# via -r requirements/base.in
15-
botocore==1.21.18
15+
botocore==1.21.21
1616
# via
1717
# boto3
1818
# s3transfer
@@ -42,7 +42,7 @@ cryptography==3.4.7
4242
# pyjwt
4343
ddt==1.4.2
4444
# via -r requirements/test.in
45-
diff-cover==6.2.2
45+
diff-cover==6.3.0
4646
# via -r requirements/test.in
4747
# via
4848
# -c requirements/common_constraints.txt
@@ -115,7 +115,7 @@ edx-drf-extensions==7.0.1
115115
# -r requirements/base.in
116116
# edx-enterprise-data
117117
# edx-rbac
118-
edx-enterprise-data==2.2.19
118+
edx-enterprise-data==2.2.20
119119
# via -r requirements/base.in
120120
edx-opaque-keys==2.2.2
121121
# via
@@ -129,8 +129,10 @@ edx-rest-api-client==5.4.0
129129
# via
130130
# -r requirements/base.in
131131
# edx-enterprise-data
132-
elasticsearch==7.14.0
133-
# via elasticsearch-dsl
132+
elasticsearch==7.13.4
133+
# via
134+
# -c requirements/constraints.txt
135+
# elasticsearch-dsl
134136
elasticsearch-dsl==7.4.0
135137
# via
136138
# -c requirements/constraints.txt
@@ -281,8 +283,6 @@ toml==0.10.2
281283
# via
282284
# pytest
283285
# pytest-cov
284-
tomli==1.2.1
285-
# via diff-cover
286286
tqdm==4.62.0
287287
# via -r requirements/base.in
288288
unicodecsv==0.14.1

0 commit comments

Comments
 (0)