Skip to content

Commit 295c274

Browse files
authored
fix(ci): use and fix pinned requirements (#120)
* fix(ci): use and fix pinned requirements * fix: add type ignore for mypy no-untyped-call error
1 parent e049b65 commit 295c274

4 files changed

Lines changed: 41 additions & 23 deletions

File tree

.github/workflows/ci.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ jobs:
2323
- name: Install dependencies
2424
run: |
2525
pip install --upgrade pip
26-
pip install -e .
26+
pip install -r requirements.txt
2727
pip install -r requirements-dev.txt
28+
pip install -e .
2829
- name: black
2930
run: black --check setup.py es
3031
- name: flake8
@@ -51,8 +52,9 @@ jobs:
5152
- name: Install dependencies
5253
run: |
5354
pip install --upgrade pip
54-
pip install -e .
55+
pip install -r requirements.txt
5556
pip install -r requirements-dev.txt
57+
pip install -e .
5658
- name: Wait for Elasticsearch 7.x
5759
run: |
5860
for i in $(seq 1 30); do
@@ -85,8 +87,9 @@ jobs:
8587
- name: Install dependencies
8688
run: |
8789
pip install --upgrade pip
88-
pip install -e .
90+
pip install -r requirements.txt
8991
pip install -r requirements-dev.txt
92+
pip install -e .
9093
- name: Wait for Elasticsearch 8.x
9194
run: |
9295
for i in $(seq 1 30); do
@@ -122,8 +125,9 @@ jobs:
122125
- name: Install dependencies
123126
run: |
124127
pip install --upgrade pip
125-
pip install -e .
128+
pip install -r requirements.txt
126129
pip install -r requirements-dev.txt
130+
pip install -e .
127131
- name: Wait for OpenSearch 2.x
128132
run: |
129133
for i in $(seq 1 30); do

es/opendistro/sqlalchemy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class ESTypeCompiler(basesqlalchemy.BaseESTypeCompiler): # pragma: no cover
2525

2626
class ESTypeIdentifierPreparer(compiler.IdentifierPreparer):
2727
def __init__(self, *args: Any, **kwargs: Any):
28-
super().__init__(*args, **kwargs)
28+
super().__init__(*args, **kwargs) # type: ignore[no-untyped-call]
2929

3030
self.initial_quote = self.final_quote = "`"
3131

requirements.txt

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,40 @@
11
#
2-
# This file is autogenerated by pip-compile
2+
# This file is autogenerated by pip-compile with Python 3.10
33
# To update, run:
44
#
55
# pip-compile
66
#
7-
certifi==2021.10.8
8-
# via elasticsearch
9-
elasticsearch==7.13.4
7+
certifi==2024.7.4
8+
# via
9+
# elasticsearch
10+
# opensearch-py
11+
# requests
12+
charset-normalizer==3.3.2
13+
# via requests
14+
elasticsearch==7.17.13
1015
# via elasticsearch-dbapi (setup.py)
11-
greenlet==1.0.0
16+
events==0.5
17+
# via opensearch-py
18+
greenlet==3.0.3
1219
# via sqlalchemy
13-
importlib-metadata==4.0.0
14-
# via sqlalchemy
15-
packaging==21.3
20+
idna==3.7
21+
# via requests
22+
opensearch-py==2.8.0
23+
# via elasticsearch-dbapi (setup.py)
24+
packaging==24.0
1625
# via elasticsearch-dbapi (setup.py)
17-
pyparsing==2.4.7
18-
# via packaging
19-
sqlalchemy==1.4.9
26+
python-dateutil==2.9.0.post0
27+
# via opensearch-py
28+
requests==2.32.3
29+
# via opensearch-py
30+
six==1.16.0
31+
# via python-dateutil
32+
sqlalchemy==2.0.29
2033
# via elasticsearch-dbapi (setup.py)
21-
typing-extensions==3.7.4.3
22-
# via importlib-metadata
23-
urllib3==1.26.5
24-
# via elasticsearch
25-
zipp==3.4.1
26-
# via importlib-metadata
34+
typing-extensions==4.11.0
35+
# via sqlalchemy
36+
urllib3==2.2.2
37+
# via
38+
# elasticsearch
39+
# opensearch-py
40+
# requests

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
install_requires=[
3232
"elasticsearch>=7.17.13, <8",
33-
"opensearch-py>=2.4.0, <3",
33+
"opensearch-py>=2.8.0, <3",
3434
"packaging>=21.0",
3535
"sqlalchemy",
3636
],

0 commit comments

Comments
 (0)