Skip to content

Commit 7ac5a8b

Browse files
authored
Merge branch 'main' into bump-meilisearch-v1.6.0
2 parents 23fc46a + dc342ca commit 7ac5a8b

File tree

10 files changed

+304
-300
lines changed

10 files changed

+304
-300
lines changed

.github/workflows/documentation.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ jobs:
3131
fetch-depth: 0
3232
lfs: true
3333
- name: Setup Github Pages
34-
uses: actions/configure-pages@v3
34+
uses: actions/configure-pages@v4
3535
- name: Install Python
36-
uses: actions/setup-python@v4
36+
uses: actions/setup-python@v5
3737
with:
3838
python-version: "3.10"
3939
- name: Install pipenv
@@ -55,7 +55,7 @@ jobs:
5555
echo "$CUSTOM_DOMAIN" > ./docs/_build/html/CNAME
5656
echo "Created CNAME in ./docs/_build/html/: $CUSTOM_DOMAIN"
5757
- name: Upload artifacts
58-
uses: actions/upload-pages-artifact@v2
58+
uses: actions/upload-pages-artifact@v3
5959
with:
6060
path: "./docs/_build/html"
6161
deploy:
@@ -67,4 +67,4 @@ jobs:
6767
steps:
6868
- name: Deploy to GitHub Pages
6969
id: deployment
70-
uses: actions/deploy-pages@v2
70+
uses: actions/deploy-pages@v4

.github/workflows/pre-release-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v4
2121
- name: Set up Python ${{ matrix.python-version }}
22-
uses: actions/setup-python@v4
22+
uses: actions/setup-python@v5
2323
with:
2424
python-version: ${{ matrix.python-version }}
2525
cache: "pipenv"

.github/workflows/pypi-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@v4
1313
- name: Set up Python
14-
uses: actions/setup-python@v4
14+
uses: actions/setup-python@v5
1515
with:
1616
python-version: '3.8'
1717
cache: "pipenv"

.github/workflows/tests.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
steps:
2424
- uses: actions/checkout@v4
2525
- name: Set up Python ${{ matrix.python-version }}
26-
uses: actions/setup-python@v4
26+
uses: actions/setup-python@v5
2727
with:
2828
python-version: ${{ matrix.python-version }}
2929
cache: "pipenv"
@@ -48,7 +48,7 @@ jobs:
4848
steps:
4949
- uses: actions/checkout@v4
5050
- name: Set up Python 3.8
51-
uses: actions/setup-python@v4
51+
uses: actions/setup-python@v5
5252
with:
5353
python-version: "3.8"
5454
cache: "pipenv"
@@ -65,7 +65,7 @@ jobs:
6565
steps:
6666
- uses: actions/checkout@v4
6767
- name: Set up Python 3.9
68-
uses: actions/setup-python@v4
68+
uses: actions/setup-python@v5
6969
with:
7070
python-version: 3.9
7171
cache: "pipenv"
@@ -82,7 +82,7 @@ jobs:
8282
steps:
8383
- uses: actions/checkout@v4
8484
- name: Set up Python 3.9
85-
uses: actions/setup-python@v4
85+
uses: actions/setup-python@v5
8686
with:
8787
python-version: 3.9
8888
cache: "pipenv"
@@ -99,7 +99,7 @@ jobs:
9999
steps:
100100
- uses: actions/checkout@v4
101101
- name: Set up Python 3.9
102-
uses: actions/setup-python@v4
102+
uses: actions/setup-python@v5
103103
with:
104104
python-version: 3.9
105105
cache: "pipenv"

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2019-2022 Meili SAS
3+
Copyright (c) 2019-2024 Meili SAS
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

Pipfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,10 @@ tox-pipenv = "*"
1414
types-requests = "*"
1515
black = "*"
1616
isort = "*"
17-
importlib_metadata = {version = "*", markers="python_version < '3.8'"}
18-
zipp = {version = "==3.17.0", markers="python_version < '3.8'"}
1917
exceptiongroup = {version = "*", markers="python_version < '3.11'"}
2018
tomli = {version = "*", markers="python_version < '3.11'"}
2119
wrapt = {version = "*", markers="python_version < '3.11'"}
22-
dill = {version = "*", markers="python_version < '3.11'"}
20+
dill = {version = "*"}
2321
pytest-cov = "*"
2422

2523
[packages]

Pipfile.lock

Lines changed: 288 additions & 282 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

meilisearch/_httprequests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def __validate(request: requests.Response) -> Any:
119119

120120

121121
@lru_cache(maxsize=1)
122-
def _build_user_agent(client_agents: Optional[Tuple[str]] = None) -> str:
122+
def _build_user_agent(client_agents: Optional[Tuple[str, ...]] = None) -> str:
123123
user_agent = qualified_version()
124124
if not client_agents:
125125
return user_agent

meilisearch/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def __init__(
3333
url: str,
3434
api_key: Optional[str] = None,
3535
timeout: Optional[int] = None,
36-
client_agents: Optional[Tuple[str]] = None,
36+
client_agents: Optional[Tuple[str, ...]] = None,
3737
) -> None:
3838
"""
3939
Parameters

meilisearch/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def __init__(
4444
url: str,
4545
api_key: Optional[str] = None,
4646
timeout: Optional[int] = None,
47-
client_agents: Optional[Tuple[str]] = None,
47+
client_agents: Optional[Tuple[str, ...]] = None,
4848
) -> None:
4949
"""
5050
Parameters

0 commit comments

Comments
 (0)