Skip to content

Commit 37a2f71

Browse files
authored
Merge pull request #18 from cedadev/v0.1.4
V0.1.4: Logs, poetry and python
2 parents f951f1c + 9cff5fc commit 37a2f71

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

facet_scanner/collection_handlers/utils/facet_factory.py

+7
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,13 @@
1212
import os
1313
from typing import Optional, Tuple
1414
from facet_scanner.collection_handlers.base import CollectionHandler
15+
import logging
1516

17+
from facet_scanner import logstream
18+
19+
logger = logging.getLogger(__name__)
20+
logger.addHandler(logstream)
21+
logger.propagate = False
1622

1723
class FacetFactory:
1824
"""
@@ -56,6 +62,7 @@ def get_handler(self, path: str) -> Tuple[Optional[CollectionHandler], Optional[
5662
:rtype: CollectionHandler, str
5763
"""
5864

65+
logger.debug('Locating collection details')
5966
collection_details, collection_path = self.get_collection_map(path)
6067
if collection_details is not None:
6168
return locate(collection_details['handler']), collection_path

facet_scanner/collection_handlers/utils/moles_datasets.py

+7
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@
1212
from json.decoder import JSONDecodeError
1313
from requests.exceptions import Timeout
1414
import json
15+
import logging
16+
17+
from facet_scanner import logstream
18+
19+
logger = logging.getLogger(__name__)
20+
logger.addHandler(logstream)
21+
logger.propagate = False
1522

1623
MOLES_MAPPING_FILE = os.environ.get('MOLES_MAPPING_FILE')
1724

pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "facet-scanner"
3-
version = "0.1.3"
3+
version = "0.1.4"
44
description = "Extracts facets from datasets to add to elasticsearch."
55
authors = ["Daniel Westwood <[email protected]>"]
66
license = "{file='LICENSE'}"
@@ -20,7 +20,7 @@ include = [
2020
]
2121

2222
[tool.poetry.dependencies]
23-
python = "^3.12"
23+
python = ">=3.8,<4.0"
2424
elasticsearch = "^7"
2525
requests = "^2.32.3"
2626
tqdm = "^4.66.6"

0 commit comments

Comments
 (0)