diff --git a/meilisearch/index.py b/meilisearch/index.py index d6465421..919ea656 100644 --- a/meilisearch/index.py +++ b/meilisearch/index.py @@ -1,4 +1,4 @@ -import urllib +from urllib import parse from datetime import datetime from time import sleep from typing import Any, Dict, Generator, List, Optional, Union @@ -313,7 +313,7 @@ def get_documents(self, parameters: Optional[Dict[str, Any]] = None) -> List[Dic if parameters is None: parameters = {} return self.http.get( - f'{self.config.paths.index}/{self.uid}/{self.config.paths.document}?{urllib.parse.urlencode(parameters)}' + f'{self.config.paths.index}/{self.uid}/{self.config.paths.document}?{parse.urlencode(parameters)}' ) def add_documents( @@ -1240,5 +1240,5 @@ def _build_url( ) -> str: if primary_key is None: return f'{self.config.paths.index}/{self.uid}/{self.config.paths.document}' - primary_key = urllib.parse.urlencode({'primaryKey': primary_key}) + primary_key = parse.urlencode({'primaryKey': primary_key}) return f'{self.config.paths.index}/{self.uid}/{self.config.paths.document}?{primary_key}' diff --git a/setup.py b/setup.py index aa2caa9a..0bac2db1 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ long_description=long_description, long_description_content_type="text/markdown", url="https://github.com/meilisearch/meilisearch-python", - packages=find_packages(), + packages=find_packages(exclude=("tests*",)), project_urls={"Documentation": "https://docs.meilisearch.com/",}, keywords="search python meilisearch", platform="any", @@ -25,6 +25,7 @@ "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", "License :: OSI Approved :: MIT License", "Operating System :: OS Independent", ], diff --git a/meilisearch/tests/__init__.py b/tests/__init__.py similarity index 100% rename from meilisearch/tests/__init__.py rename to tests/__init__.py diff --git a/meilisearch/tests/client/__init__.py b/tests/client/__init__.py similarity index 100% rename from meilisearch/tests/client/__init__.py rename to tests/client/__init__.py diff --git a/meilisearch/tests/client/test_client.py b/tests/client/test_client.py similarity index 93% rename from meilisearch/tests/client/test_client.py rename to tests/client/test_client.py index ac84e297..6bf7cab5 100644 --- a/meilisearch/tests/client/test_client.py +++ b/tests/client/test_client.py @@ -1,7 +1,7 @@ # pylint: disable=invalid-name import meilisearch -from meilisearch.tests import BASE_URL, MASTER_KEY +from tests import BASE_URL, MASTER_KEY def test_get_client(): diff --git a/meilisearch/tests/client/test_client_dumps.py b/tests/client/test_client_dumps.py similarity index 95% rename from meilisearch/tests/client/test_client_dumps.py rename to tests/client/test_client_dumps.py index d1c03aec..4de083f4 100644 --- a/meilisearch/tests/client/test_client_dumps.py +++ b/tests/client/test_client_dumps.py @@ -1,7 +1,7 @@ # pylint: disable=invalid-name import pytest -from meilisearch.tests import wait_for_dump_creation +from tests import wait_for_dump_creation from meilisearch.errors import MeiliSearchApiError def test_dump_creation(client, index_with_documents): diff --git a/meilisearch/tests/client/test_client_health_meilisearch.py b/tests/client/test_client_health_meilisearch.py similarity index 100% rename from meilisearch/tests/client/test_client_health_meilisearch.py rename to tests/client/test_client_health_meilisearch.py diff --git a/meilisearch/tests/client/test_client_key_meilisearch.py b/tests/client/test_client_key_meilisearch.py similarity index 100% rename from meilisearch/tests/client/test_client_key_meilisearch.py rename to tests/client/test_client_key_meilisearch.py diff --git a/meilisearch/tests/client/test_client_stats_meilisearch.py b/tests/client/test_client_stats_meilisearch.py similarity index 100% rename from meilisearch/tests/client/test_client_stats_meilisearch.py rename to tests/client/test_client_stats_meilisearch.py diff --git a/meilisearch/tests/client/test_client_version_meilisearch.py b/tests/client/test_client_version_meilisearch.py similarity index 100% rename from meilisearch/tests/client/test_client_version_meilisearch.py rename to tests/client/test_client_version_meilisearch.py diff --git a/meilisearch/tests/common.py b/tests/common.py similarity index 100% rename from meilisearch/tests/common.py rename to tests/common.py diff --git a/meilisearch/tests/conftest.py b/tests/conftest.py similarity index 98% rename from meilisearch/tests/conftest.py rename to tests/conftest.py index 5fbff4f7..963ee6a1 100644 --- a/meilisearch/tests/conftest.py +++ b/tests/conftest.py @@ -2,7 +2,7 @@ import json from pytest import fixture -from meilisearch.tests import common +from tests import common import meilisearch @fixture(scope='session') diff --git a/meilisearch/tests/errors/__init__.py b/tests/errors/__init__.py similarity index 100% rename from meilisearch/tests/errors/__init__.py rename to tests/errors/__init__.py diff --git a/meilisearch/tests/errors/test_api_error_meilisearch.py b/tests/errors/test_api_error_meilisearch.py similarity index 95% rename from meilisearch/tests/errors/test_api_error_meilisearch.py rename to tests/errors/test_api_error_meilisearch.py index da3f7947..5ceca9f1 100644 --- a/meilisearch/tests/errors/test_api_error_meilisearch.py +++ b/tests/errors/test_api_error_meilisearch.py @@ -5,7 +5,7 @@ import requests import meilisearch from meilisearch.errors import MeiliSearchApiError -from meilisearch.tests import BASE_URL, MASTER_KEY +from tests import BASE_URL, MASTER_KEY def test_meilisearch_api_error_no_master_key(): client = meilisearch.Client(BASE_URL) diff --git a/meilisearch/tests/errors/test_communication_error_meilisearch.py b/tests/errors/test_communication_error_meilisearch.py similarity index 92% rename from meilisearch/tests/errors/test_communication_error_meilisearch.py rename to tests/errors/test_communication_error_meilisearch.py index 04fa8411..13c46ea4 100644 --- a/meilisearch/tests/errors/test_communication_error_meilisearch.py +++ b/tests/errors/test_communication_error_meilisearch.py @@ -5,7 +5,7 @@ import requests import meilisearch from meilisearch.errors import MeiliSearchCommunicationError -from meilisearch.tests import MASTER_KEY +from tests import MASTER_KEY @patch("requests.post") diff --git a/meilisearch/tests/errors/test_timeout_error_meilisearch.py b/tests/errors/test_timeout_error_meilisearch.py similarity index 92% rename from meilisearch/tests/errors/test_timeout_error_meilisearch.py rename to tests/errors/test_timeout_error_meilisearch.py index d3ad6af2..a96ea375 100644 --- a/meilisearch/tests/errors/test_timeout_error_meilisearch.py +++ b/tests/errors/test_timeout_error_meilisearch.py @@ -3,7 +3,7 @@ import requests import meilisearch from meilisearch.errors import MeiliSearchTimeoutError -from meilisearch.tests import BASE_URL, MASTER_KEY +from tests import BASE_URL, MASTER_KEY @patch("requests.get") diff --git a/meilisearch/tests/helper.py b/tests/helper.py similarity index 100% rename from meilisearch/tests/helper.py rename to tests/helper.py diff --git a/meilisearch/tests/index/__init__.py b/tests/index/__init__.py similarity index 100% rename from meilisearch/tests/index/__init__.py rename to tests/index/__init__.py diff --git a/meilisearch/tests/index/test_index.py b/tests/index/test_index.py similarity index 99% rename from meilisearch/tests/index/test_index.py rename to tests/index/test_index.py index 6c0680b9..b8dddd66 100644 --- a/meilisearch/tests/index/test_index.py +++ b/tests/index/test_index.py @@ -6,7 +6,7 @@ from meilisearch.client import Client from meilisearch.errors import MeiliSearchApiError from meilisearch.index import Index -from meilisearch.tests import BASE_URL, common, MASTER_KEY +from tests import BASE_URL, common, MASTER_KEY def test_create_index(client): """Tests creating an index.""" diff --git a/meilisearch/tests/index/test_index_document_meilisearch.py b/tests/index/test_index_document_meilisearch.py similarity index 100% rename from meilisearch/tests/index/test_index_document_meilisearch.py rename to tests/index/test_index_document_meilisearch.py diff --git a/meilisearch/tests/index/test_index_search_meilisearch.py b/tests/index/test_index_search_meilisearch.py similarity index 100% rename from meilisearch/tests/index/test_index_search_meilisearch.py rename to tests/index/test_index_search_meilisearch.py diff --git a/meilisearch/tests/index/test_index_stats_meilisearch.py b/tests/index/test_index_stats_meilisearch.py similarity index 100% rename from meilisearch/tests/index/test_index_stats_meilisearch.py rename to tests/index/test_index_stats_meilisearch.py diff --git a/meilisearch/tests/index/test_index_update_meilisearch.py b/tests/index/test_index_update_meilisearch.py similarity index 100% rename from meilisearch/tests/index/test_index_update_meilisearch.py rename to tests/index/test_index_update_meilisearch.py diff --git a/meilisearch/tests/index/test_index_wait_for_pending_update.py b/tests/index/test_index_wait_for_pending_update.py similarity index 100% rename from meilisearch/tests/index/test_index_wait_for_pending_update.py rename to tests/index/test_index_wait_for_pending_update.py diff --git a/meilisearch/tests/settings/__init__.py b/tests/settings/__init__.py similarity index 100% rename from meilisearch/tests/settings/__init__.py rename to tests/settings/__init__.py diff --git a/meilisearch/tests/settings/test_settings.py b/tests/settings/test_settings.py similarity index 100% rename from meilisearch/tests/settings/test_settings.py rename to tests/settings/test_settings.py diff --git a/meilisearch/tests/settings/test_settings_displayed_attributes_meilisearch.py b/tests/settings/test_settings_displayed_attributes_meilisearch.py similarity index 100% rename from meilisearch/tests/settings/test_settings_displayed_attributes_meilisearch.py rename to tests/settings/test_settings_displayed_attributes_meilisearch.py diff --git a/meilisearch/tests/settings/test_settings_distinct_attribute_meilisearch.py b/tests/settings/test_settings_distinct_attribute_meilisearch.py similarity index 100% rename from meilisearch/tests/settings/test_settings_distinct_attribute_meilisearch.py rename to tests/settings/test_settings_distinct_attribute_meilisearch.py diff --git a/meilisearch/tests/settings/test_settings_filterable_attributes_meilisearch.py b/tests/settings/test_settings_filterable_attributes_meilisearch.py similarity index 100% rename from meilisearch/tests/settings/test_settings_filterable_attributes_meilisearch.py rename to tests/settings/test_settings_filterable_attributes_meilisearch.py diff --git a/meilisearch/tests/settings/test_settings_ranking_rules_meilisearch.py b/tests/settings/test_settings_ranking_rules_meilisearch.py similarity index 100% rename from meilisearch/tests/settings/test_settings_ranking_rules_meilisearch.py rename to tests/settings/test_settings_ranking_rules_meilisearch.py diff --git a/meilisearch/tests/settings/test_settings_searchable_attributes_meilisearch.py b/tests/settings/test_settings_searchable_attributes_meilisearch.py similarity index 100% rename from meilisearch/tests/settings/test_settings_searchable_attributes_meilisearch.py rename to tests/settings/test_settings_searchable_attributes_meilisearch.py diff --git a/meilisearch/tests/settings/test_settings_sortable_attributes_meilisearch.py b/tests/settings/test_settings_sortable_attributes_meilisearch.py similarity index 100% rename from meilisearch/tests/settings/test_settings_sortable_attributes_meilisearch.py rename to tests/settings/test_settings_sortable_attributes_meilisearch.py diff --git a/meilisearch/tests/settings/test_settings_stop_words_meilisearch.py b/tests/settings/test_settings_stop_words_meilisearch.py similarity index 100% rename from meilisearch/tests/settings/test_settings_stop_words_meilisearch.py rename to tests/settings/test_settings_stop_words_meilisearch.py diff --git a/meilisearch/tests/settings/test_settings_synonyms_meilisearch.py b/tests/settings/test_settings_synonyms_meilisearch.py similarity index 100% rename from meilisearch/tests/settings/test_settings_synonyms_meilisearch.py rename to tests/settings/test_settings_synonyms_meilisearch.py