Merge branch 'main' into bump-meilisearch-v1.6.0

meilisearch · Jan 11, 2024 · 7ac5a8b · 7ac5a8b
2 parents 23fc46a + dc342ca
commit 7ac5a8b
Show file tree

Hide file tree

Showing 10 changed files with 304 additions and 300 deletions.
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -31,9 +31,9 @@ jobs:
           fetch-depth: 0
           lfs: true
       - name: Setup Github Pages
-        uses: actions/configure-pages@v3
+        uses: actions/configure-pages@v4
       - name: Install Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
       - name: Install pipenv
@@ -55,7 +55,7 @@ jobs:
           echo "$CUSTOM_DOMAIN" > ./docs/_build/html/CNAME
           echo "Created CNAME in ./docs/_build/html/: $CUSTOM_DOMAIN"
       - name: Upload artifacts
-        uses: actions/upload-pages-artifact@v2
+        uses: actions/upload-pages-artifact@v3
         with:
           path: "./docs/_build/html"
   deploy:
@@ -67,4 +67,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4
diff --git a/.github/workflows/pre-release-tests.yml b/.github/workflows/pre-release-tests.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: "pipenv"

diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.8'
           cache: "pipenv"

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: "pipenv"
@@ -48,7 +48,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python 3.8
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.8"
           cache: "pipenv"
@@ -65,7 +65,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python 3.9
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
           cache: "pipenv"
@@ -82,7 +82,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python 3.9
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
           cache: "pipenv"
@@ -99,7 +99,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python 3.9
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
           cache: "pipenv"

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019-2022 Meili SAS
+Copyright (c) 2019-2024 Meili SAS
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Pipfile b/Pipfile
@@ -14,12 +14,10 @@ tox-pipenv = "*"
 types-requests = "*"
 black = "*"
 isort = "*"
-importlib_metadata = {version = "*", markers="python_version < '3.8'"}
-zipp = {version = "==3.17.0", markers="python_version < '3.8'"}
 exceptiongroup = {version = "*", markers="python_version < '3.11'"}
 tomli = {version = "*", markers="python_version < '3.11'"}
 wrapt = {version = "*", markers="python_version < '3.11'"}
-dill = {version = "*", markers="python_version < '3.11'"}
+dill = {version = "*"}
 pytest-cov = "*"
 
 [packages]

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/meilisearch/_httprequests.py b/meilisearch/_httprequests.py
@@ -119,7 +119,7 @@ def __validate(request: requests.Response) -> Any:
 
 
 @lru_cache(maxsize=1)
-def _build_user_agent(client_agents: Optional[Tuple[str]] = None) -> str:
+def _build_user_agent(client_agents: Optional[Tuple[str, ...]] = None) -> str:
     user_agent = qualified_version()
     if not client_agents:
         return user_agent

diff --git a/meilisearch/client.py b/meilisearch/client.py
@@ -33,7 +33,7 @@ def __init__(
         url: str,
         api_key: Optional[str] = None,
         timeout: Optional[int] = None,
-        client_agents: Optional[Tuple[str]] = None,
+        client_agents: Optional[Tuple[str, ...]] = None,
     ) -> None:
         """
         Parameters

diff --git a/meilisearch/config.py b/meilisearch/config.py
@@ -44,7 +44,7 @@ def __init__(
         url: str,
         api_key: Optional[str] = None,
         timeout: Optional[int] = None,
-        client_agents: Optional[Tuple[str]] = None,
+        client_agents: Optional[Tuple[str, ...]] = None,
     ) -> None:
         """
         Parameters