Skip to content

Commit

Permalink
flakey!
Browse files Browse the repository at this point in the history
  • Loading branch information
vanatteveldt committed Nov 16, 2023
1 parent 96e0034 commit 5117253
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 6 deletions.
2 changes: 1 addition & 1 deletion amcat4/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from pydantic.fields import FieldInfo

from amcat4 import index
from amcat4.config import get_settings, AuthOptions, Settings, validate_settings
from amcat4.config import get_settings, AuthOptions, validate_settings
from amcat4.elastic import connect_elastic, get_system_version, ping, upload_documents
from amcat4.index import (
GLOBAL_ROLES,
Expand Down
15 changes: 12 additions & 3 deletions amcat4/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,26 @@ class Settings(BaseSettings):

elastic_password: Optional[str] = Field(
None,
description="Elasticsearch password. This the password for the 'elastic' user when Elastic xpack security is enabled",
description=(
"Elasticsearch password. "
"This the password for the 'elastic' user when Elastic xpack security is enabled"
),
)

elastic_host: Optional[str] = Field(
None,
description="Elasticsearch host. Default: https://localhost:9200 if elastic_password is set, http://localhost:9200 otherwise",
description=(
"Elasticsearch host. "
"Default: https://localhost:9200 if elastic_password is set, http://localhost:9200 otherwise"
),
)

elastic_verify_ssl: Optional[bool] = Field(
None,
description="Elasticsearch verify SSL (only used if elastic_password is set). Default: True unless host is localhost)",
description=(
"Elasticsearch verify SSL (only used if elastic_password is set). "
"Default: True unless host is localhost)"
),
)

system_index: str = Field(
Expand Down
3 changes: 1 addition & 2 deletions tests/test_api_documents.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from turtle import pos
from amcat4.index import set_role, Role
from tests.conftest import index_docs, populate_index
from tests.conftest import populate_index
from tests.tools import post_json, build_headers, get_json, check


Expand Down

0 comments on commit 5117253

Please sign in to comment.