diff options
author | Martin Czygan <martin.czygan@gmail.com> | 2021-04-15 15:57:24 +0200 |
---|---|---|
committer | Martin Czygan <martin.czygan@gmail.com> | 2021-04-15 15:57:24 +0200 |
commit | 1edd47ee8f43e8a8b84f0ce9ea2c92d998ae3efb (patch) | |
tree | ff6233a95a0e7c9f2d810e4735132eafb726f0fe /tests | |
parent | cd5aff2602b944c95d2ed76f9f916ef0427d0013 (diff) | |
parent | 79b6476827f80ed86019804b7293ff1a8fd4af9a (diff) | |
download | fuzzycat-1edd47ee8f43e8a8b84f0ce9ea2c92d998ae3efb.tar.gz fuzzycat-1edd47ee8f43e8a8b84f0ce9ea2c92d998ae3efb.zip |
Merge branch 'bnewbold-dev-setup'
* bnewbold-dev-setup:
dynaconf: switch to fuzzycat.config import across project
upgrade to python3.8
gitlab CI: try 'make deps' and 'make test'
makefile: run common commands inside pipenv
makefile: change 'deps' to be simple --dev --deploy
make fmt
Diffstat (limited to 'tests')
-rw-r--r-- | tests/test_matching.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/test_matching.py b/tests/test_matching.py index 1702792..997a9e6 100644 --- a/tests/test_matching.py +++ b/tests/test_matching.py @@ -1,3 +1,4 @@ +<<<<<<< HEAD import logging import warnings @@ -12,10 +13,16 @@ from fuzzycat.matching import anything_to_entity, match_release_fuzzy warnings.filterwarnings("ignore") # InsecureRequestWarning: Unverified HTTPS request is being made to host ... +from fuzzycat.matching import anything_to_entity, match_release_fuzzy +from fuzzycat.config import settings +from fatcat_openapi_client import ReleaseEntity +import pytest +import elasticsearch +import logging + logger = logging.getLogger('test_matching') logger.setLevel(logging.DEBUG) -settings = Dynaconf(envvar_prefix="FUZZYCAT") # ad-hoc override search server with: FUZZYCAT_FATCAT_SEARCH_URL=localhost:9200 pytest ... FATCAT_SEARCH_URL = settings.get("FATCAT_SEARCH_URL", "https://search.fatcat.wiki:443") |