Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,15 @@ The defaults work for local development. Notable variables in `src/infra/.env`:
| `RESOLVER_CONFIG_PATH` | *(bundled `/app/config/resolver.yaml`)* | Path to the Splink resolver config YAML. Override to use a custom resolver config outside Docker. |
| `DUCKDB_PATH` | *(resolver default)* | Path to the DuckDB database file. Leave unset to use the path defined in `resolver.yaml`. |

> **Schema or configuration changes:** If you have modified `src/config/resolver.yaml` or
> `src/config/rdf_mapping.yaml` and the DuckDB database has already been initialised,
> remove the data volume before restarting to avoid schema mismatch errors:
> ```bash
> docker volume rm ere-local_ere-data
> # or for a full clean slate:
> make infra-down-volumes
> ```

### 3. Start the stack

```bash
Expand All @@ -108,6 +117,12 @@ Note: `make infra-up` creates a shared external network `ersys-local` used for c
To remove it manually: `docker network rm ersys-local`
```

> **Rebuilding with a clean cache:** If you have upgraded the source or made changes to the
> image and need to discard Docker layer cache, run:
> ```bash
> make infra-rebuild-clean
> ```

| Service | URL / Port |
|---------|-----------|
| Redis | `localhost:6379` |
Expand Down Expand Up @@ -355,5 +370,4 @@ Contributions are welcome. Please open an issue before submitting a pull request
- Keep commits small and well-described
- Branch naming: `feature/<ticket>/<short-description>` (e.g. `feature/ERS1-124/conflict-detection`)

For active tasks and current work, edit [WORKING.md](WORKING.md).
For development workflow and architecture guidelines, see [CLAUDE.md](.claude/CLAUDE.md).
2 changes: 1 addition & 1 deletion src/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.0
1.1.0-rc.3
1 change: 1 addition & 0 deletions src/filters/fortify-exclusion.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
excludePatterns=**/docs/**/*,**/test/**/*
1 change: 1 addition & 0 deletions src/filters/odc-exclusion.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
excludePatterns=**/docs/**/*,**/test/**/*
4 changes: 4 additions & 0 deletions src/infra/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
# When running inside the full ERSys stack, the parent project's .env covers these.

# --- Redis ---
# When running the demo from the host machine (poetry run python demo/demo.py),
# the Docker service name 'ersys-redis' is not resolvable from the host. Set
# REDIS_HOST=localhost here before running the demo. The ERE container reads this
# file at startup, so restore the original value before restarting the stack.
REDIS_HOST=ersys-redis
REDIS_PORT=6379
REDIS_DB=0
Expand Down
10 changes: 5 additions & 5 deletions src/poetry.lock

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

4 changes: 2 additions & 2 deletions src/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "ere-basic"
version = "1.1.0"
description = "A basic implementation of the Entity Resolution Engine (ERE)."
authors = [
{name = "Meaningfy",email = "hi@meaningfy.ws"}
{name = "Publications Office of the European Union"}
]
readme = "../README.md"
requires-python = ">=3.12,<3.15"
Expand Down Expand Up @@ -48,7 +48,7 @@ rdflib = "7.6.0"
pyyaml = "6.0.3"

# TODO: should we have a registry?
ers-spec = { git = "https://github.com/OP-TED/entity-resolution-spec.git", branch = "release/1.0.0", subdirectory = "src" }
ers-spec = { git = "https://github.com/OP-TED/entity-resolution-spec.git", branch = "release/1.1.0", subdirectory = "src" }


[tool.pytest.ini_options]
Expand Down
Loading