Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates to SD.net RIM instances hosted by KDVZ Frechen #10

Closed
wants to merge 2 commits into from

Conversation

stv0g
Copy link
Contributor

@stv0g stv0g commented Feb 8, 2022

Closes #9

@konstin
Copy link
Member

konstin commented Feb 9, 2022

Thank you!

I wonder though wh the new file is shorter than the old version; Were there some broken endpoints you removed?

@stv0g
Copy link
Contributor Author

stv0g commented Feb 14, 2022

Hi @konstin,

Were there some broken endpoints you removed?

No, instead I removed a few duplicated endpoints. The RIS hosted by KDVZ are usually available via two domains.
This led to some duplication.

@konstin
Copy link
Member

konstin commented Feb 15, 2022

Not sure how that happened, but there seem to be merge conflicts now

@stv0g
Copy link
Contributor Author

stv0g commented Feb 15, 2022

I will give this another try and rebase it on master

Copy link
Member

@eFrane eFrane left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot!

@eFrane
Copy link
Member

eFrane commented Oct 2, 2022

As much as this change is wonderful, I just spent about half an hour failing at merging it. :(

I guess, what we should do is apply the changes one by one onto a new branch from master. Or abandon this endpoints.yml approach. This was, after all, always just the first quick solution to keeping track of implementors.

@konstin
Copy link
Member

konstin commented Oct 2, 2022

i created a merge by first sorting and then manually stepping through the diff: https://gist.github.com/konstin/8f1abb88e3975075dfd224b1c3df716d . No idea though how to ever integrate this into the git history again 😅

If we use this merge i'd add the following as sort_endpoints.py (https://github.com/OParl/resources/compare/manual_merge?expand=1)

from pathlib import Path
from typing import Any, Dict

from ruamel.yaml import YAML


def sorter(x: Dict[str, Any]):
    if wd := x.get("wd"):
        wd = int(wd[1:])
    else:
        wd = 10**10  # high
    return wd, x["title"]


yaml = YAML()
data = yaml.load(Path("endpoints.yml").read_text())
data.sort(key=sorter)
with Path("endpoints.yml").open("w") as fp:
    yaml.dump(data, fp)

@konstin konstin mentioned this pull request Oct 11, 2022
@konstin konstin closed this in 2f643fb Nov 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

New endpoints for SD.NET RIM hosted by KDVZ Frechen
3 participants