Skip to content

[pull] master from datacite:master#118

Merged
pull[bot] merged 1 commit intofront-matter:masterfrom
datacite:master
Apr 8, 2026
Merged

[pull] master from datacite:master#118
pull[bot] merged 1 commit intofront-matter:masterfrom
datacite:master

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented Apr 8, 2026

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

…ping (#1483)

* Initial plan

* Add affiliation-country filter with ROR mapping and Elasticsearch indexing

Co-authored-by: ashwinisukale <1137325+ashwinisukale@users.noreply.github.com>

* Refactor affiliation_countries to reduce duplication and improve tests

Co-authored-by: ashwinisukale <1137325+ashwinisukale@users.noreply.github.com>

* Fixed rubocop issues and added ror to country mapping json file

* fix: normalize ROR_TO_COUNTRIES lookup key

* Fix: we changed tests to be data-driven

- For Rorable specs: expected countries are computed from
ROR_TO_COUNTRIES[ror_url] (and then upcased/uniq), instead of hardcoding
"US".
- For the DOI affiliation_countries specs: expected countries are
computed from the mapping for the RORs used, and deduplication is tested
by asserting the result equals result.uniq (instead of counting "US").

* test got removed during conflict resolution, adding them back

* Fixed lint errors

* it was got added in conflict, it should be removed

* Migrate get_countries_from_ror to RorReferenceStore; remove static JSON file

Agent-Logs-Url: https://github.com/datacite/lupo/sessions/44b8398a-25a1-47b0-be7c-39bccda1d1b8

Co-authored-by: ashwinisukale <1137325+ashwinisukale@users.noreply.github.com>

* Guard download_from_s3 against missing ROR_ANALYSIS_S3_BUCKET env var

Agent-Logs-Url: https://github.com/datacite/lupo/sessions/d3419087-8a2f-4214-b7bb-a8499ee38bd4

Co-authored-by: ashwinisukale <1137325+ashwinisukale@users.noreply.github.com>

---------

Co-authored-by: Ashwini Sukale <ashwini.sukale@datacite.org>
Co-authored-by: ashwinisukale <1137325+ashwinisukale@users.noreply.github.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
@pull pull bot locked and limited conversation to collaborators Apr 8, 2026
@pull pull bot added the ⤵️ pull label Apr 8, 2026
@pull pull bot merged commit 7d87c39 into front-matter:master Apr 8, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant