Skip to content

Commit

Permalink
Bump cookiecutter template to 25c36c (#63)
Browse files Browse the repository at this point in the history
# PR Context

- prepare release 0.16.0

# Changes

- bumped cookiecutter template to
robert-koch-institut/mex-template@25c36c

---------

Co-authored-by: Nicolas Drebenstedt <[email protected]>
  • Loading branch information
RKIMetadataExchange and cutoffthetop authored May 16, 2024
1 parent 8a9c9a2 commit fef8eed
Show file tree
Hide file tree
Showing 7 changed files with 77 additions and 53 deletions.
2 changes: 1 addition & 1 deletion .cruft.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"checkout": null,
"commit": "15dd517e9d8aebb087e1f0387cf726a8164e7913",
"commit": "25c36c49159f9309b55815b6606a8dfb66228858",
"context": {
"cookiecutter": {
"project_name": "extractors",
Expand Down
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ dmypy.json

# Default exports
*.ndjson
data/
identity.csv
schema.json
work/
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ dmypy.json

# Default exports
*.ndjson
data/
identity.csv
schema.json
work/
Expand Down
18 changes: 14 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added

### Changes

### Deprecated

### Removed

### Fixed

### Security

## [0.16.0] - 2024-05-16

### Added

- add settings attributes `drop_api_key` and `drop_api_url`
- drop api connector for listing and loading files from the drop api
- add basic docker configuration with dockerfile, ignore and compose
Expand All @@ -28,8 +42,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- move quotation marks (") filtering to mex-common from requested wikidata label
- get seq-repo data via mex-drop connector (was: file)

### Deprecated

### Removed

- remove sync-persons pipeline, stopgap mx-1572
Expand All @@ -40,8 +52,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- fix some docstring indents and typings
- ifsg extractor

### Security

## [0.15.0] - 2024-02-27

### Added
Expand Down
85 changes: 49 additions & 36 deletions pdm.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 7 additions & 8 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "mex-extractors"
version = "0.15.0"
version = "0.16.0"
description = "ETL pipelines for the RKI Metadata Exchange."
authors = [{ name = "MEx Team", email = "[email protected]" }]
readme = { file = "README.md", content-type = "text/markdown" }
Expand All @@ -9,10 +9,10 @@ urls = { Repository = "https://github.com/robert-koch-institut/mex-extractors" }
requires-python = "<3.13,>=3.11"
dependencies = [
"beautifulsoup4==4.12.3",
"dagster-postgres==0.22.14",
"dagster-webserver==1.6.14",
"dagster==1.6.14",
"faker==24.4.0",
"dagster-postgres==0.23.5",
"dagster-webserver==1.7.5",
"dagster==1.7.5",
"faker==25.2.0",
"mex-common@git+https://github.com/robert-koch-institut/[email protected]",
"numpy==1.26.4",
"openpyxl==3.1.2",
Expand All @@ -29,14 +29,14 @@ optional-dependencies.dev = [
"click==8.1.7",
"ipdb==0.13.13",
"mypy==1.10.0",
"pandas-stubs==2.2.1.240316",
"pandas-stubs==2.2.2.240514",
"pytest-cov==5.0.0",
"pytest-random-order==1.1.1",
"pytest-xdist==3.6.1",
"pytest==8.2.0",
"ruff==0.4.4",
"sphinx==7.2.6",
"types-beautifulsoup4==4.12.0",
"types-beautifulsoup4==4.12.0.20240511",
"types-pytz==2024.1.0.20240417",
"types-pyyaml==6.0.12.20240311",
"types-requests==2.31.0.20240406",
Expand Down Expand Up @@ -102,7 +102,6 @@ unit = { cmd = "pdm run pytest -m 'not integration'" }
test = { cmd = "pdm run pytest --numprocesses=auto --dist=worksteal" }
all = { composite = ["install-all", "lint", "test", "doc"] }


[tool.pydantic-mypy]
warn_untyped_fields = true

Expand Down
8 changes: 4 additions & 4 deletions tests/artificial/test_provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ def test_builder_provider_inner_type_and_pattern(faker: Faker) -> None:
@pytest.mark.parametrize(
("annotation", "expected"),
[
(Link, [Link(language=None, title=None, url="http://trost.org/")]),
(Email, ["schollluise@example.com"]),
(Link, [Link(language=None, title=None, url="http://trapp.org/")]),
(Email, ["schonlandluise@example.com"]),
(Text, [Text(value="Zurück man Schuh nicht der.", language=TextLanguage.DE)]),
(TemporalEntity, [TemporalEntity("2021")]),
(APIType, [APIType["OTHER"]]),
Expand Down Expand Up @@ -153,7 +153,7 @@ def test_builder_provider_field_value_error(faker: Faker) -> None:
def test_builder_provider_extracted_data(faker: Faker) -> None:
models = faker.extracted_data(ExtractedContactPoint)
assert models[0].model_dump(exclude_defaults=True) == {
"email": ["[email protected]", "strohmax@example.com"],
"email": ["[email protected]", "stolzemax@example.com"],
"hadPrimarySource": Joker(),
"identifier": Joker(),
"identifierInPrimarySource": "ContactPoint-4181830114",
Expand Down Expand Up @@ -185,7 +185,7 @@ def test_identity_provider_reference(faker: Faker) -> None:

def test_link_provider(faker: Faker) -> None:
assert faker.link() == Link(
language="de", title="Scholl", url="https://www.briemer.com/"
language="de", title="Schonland", url="https://www.briemer.com/"
)


Expand Down

0 comments on commit fef8eed

Please sign in to comment.