Skip to content

Commit 3f8e75b

Browse files
committed
chore: Add test for opensearch>=3
1 parent b1c23db commit 3f8e75b

File tree

3 files changed

+19
-9
lines changed

3 files changed

+19
-9
lines changed

.github/workflows/tests_and_publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ jobs:
124124
runs-on: ubuntu-latest
125125
strategy:
126126
matrix:
127-
python-version: [ 3.9, '3.10', '3.11', '3.12', '3.13']
127+
python-version: [ 3.9, '3.10', '3.11', '3.12', '3.13' ]
128128
django-version: [ 42, 50, 51, 52 ]
129-
opensearch-version: [ 10, 20 ]
129+
opensearch-version: [ 10, 20, 30 ]
130130
exclude:
131131
- python-version: 3.9
132132
django-version: 50

docker-compose.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: '3.7'
2-
31
services:
42

53
opensearch_test_10:
@@ -11,7 +9,7 @@ services:
119
environment:
1210
- plugins.security.disabled=true
1311
- discovery.type=single-node
14-
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
12+
- "ES_JAVA_OPTS=-Xms128m -Xmx128m"
1513

1614
opensearch_test_20:
1715
container_name: opensearch_test_20
@@ -22,5 +20,17 @@ services:
2220
environment:
2321
- plugins.security.disabled=true
2422
- discovery.type=single-node
25-
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
23+
- "ES_JAVA_OPTS=-Xms128m -Xmx128m"
24+
- OPENSEARCH_INITIAL_ADMIN_PASSWORD="XJ67NCmLj4yMPPz0wthVUvVGV0cQiq"
25+
26+
opensearch_test_30:
27+
container_name: opensearch_test_30
28+
image: opensearchproject/opensearch:3
29+
ports:
30+
- "9230:9200"
31+
- "9630:9600"
32+
environment:
33+
- plugins.security.disabled=true
34+
- discovery.type=single-node
35+
- "ES_JAVA_OPTS=-Xms128m -Xmx128m"
2636
- OPENSEARCH_INITIAL_ADMIN_PASSWORD="XJ67NCmLj4yMPPz0wthVUvVGV0cQiq"

setup.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
########################
44
[tox:tox]
55
distshare = {homedir}/.tox/distshare
6-
envlist = py{39,310,311,312,313}-django{42,50,51,52}-opensearch{10,20}
6+
envlist = py{39,310,311,312,313}-django{42,50,51,52}-opensearch{10,20,30}
77
skipsdist = true
88
skip_missing_interpreters = true
99
indexserver =
@@ -15,15 +15,15 @@ setenv =
1515
DJANGO_SETTINGS_MODULE = tests.project.settings
1616
opensearch10: DJANGO_OS_PORT=9210
1717
opensearch20: DJANGO_OS_PORT=9220
18+
opensearch30: DJANGO_OS_PORT=9230
1819
deps =
1920
-rrequirements.txt
2021
-rrequirements_dev.txt
22+
opensearch-py>=3.0.0
2123
django42: django>=4.2.0,<4.3.0
2224
django50: django>=5.0.0,<5.1.0
2325
django51: django>=5.1.0,<5.2.0
2426
django52: django>=5.2.0,<6.0.0
25-
opensearch10: opensearch-py>=2.2.0
26-
opensearch20: opensearch-py>=2.2.0
2727
commands =
2828
python3 manage.py migrate
2929
coverage run --source=. manage.py test

0 commit comments

Comments
 (0)