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

Remove JSON configuration files (zones, exchanges, co2 params) #4655

Merged
merged 27 commits into from
Oct 18, 2022

Conversation

pierresegonne
Copy link
Member

@pierresegonne pierresegonne commented Oct 10, 2022

Issue

Follow up on #4435. This removes definitely the now deprecated global .json config.

Description

  • Fix references
  • Remove contrib files
  • Update scripts that used directly the config

Preview

@pierresegonne pierresegonne changed the title Remove simple references to zones.json Remove JSON configuration files (zones, exchanges, co2 params) Oct 10, 2022
@github-actions github-actions bot added the dependencies Pull requests that update a dependency file label Oct 10, 2022
@pierresegonne pierresegonne marked this pull request as ready for review October 11, 2022 09:58
Copy link
Member

@VIKTORVAV99 VIKTORVAV99 left a comment

Choose a reason for hiding this comment

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

Did a simple code review and left a few suggestions comments.

Hopefully I'll have some time to test it as well the next few days.

.github/labeler.yml Show resolved Hide resolved
DATA_SOURCES.md Outdated Show resolved Hide resolved
DATA_SOURCES.md Outdated Show resolved Hide resolved
scripts/ENTSOE_capacity_update.py Outdated Show resolved Hide resolved
scripts/ENTSOE_capacity_update.py Outdated Show resolved Hide resolved
scripts/ENTSOE_capacity_update.py Outdated Show resolved Hide resolved
web/generate-zones-config.js Show resolved Hide resolved
web/src/excluded-aggregated-exchanges.json Outdated Show resolved Hide resolved
@VIKTORVAV99
Copy link
Member

Oh and before I forget myself, we probably need to update the wiki in a few places once this is merged.

pierresegonne and others added 4 commits October 13, 2022 10:00
@pierresegonne
Copy link
Member Author

Oh and before I forget myself, we probably need to update the wiki in a few places once this is merged.

Yes that's on our radar :)

@github-actions github-actions bot added the zone config Pull request or issue for zone configurations label Oct 14, 2022
@pierresegonne pierresegonne requested a review from tonypls October 18, 2022 13:03
Copy link
Collaborator

@tonypls tonypls left a comment

Choose a reason for hiding this comment

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

Looks good from a front end perspective, I've tested the config generation and a manual test of the app.

Not sure if you'd want to do it as part of this PR but we could move all the generated config files to the new config directory. Move world-aggregated.json and excluded-aggregated-exchanges.json (world.json can be deleted too) so we have all config files in one directory.

@@ -1,5 +1,7 @@
# Note: web/src/helpers.js contains some of the same information.

EXCHANGE_FILENAME_ZONE_SEPARATOR = "→"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Maybe this could just be "-" style dash, exchanges can go both ways so a directional arrow doesn't really fit. Also having a character that doesn't exist on a keyboard is a bit annoying.

Copy link
Member Author

Choose a reason for hiding this comment

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

It can't be a dash as zone keys already have dashes in them. We could do underscore though and it was discussed before.
The change is minimal so I can include it. I agree about the change.

Aren't the config pieces you're mentioning only used in web?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Up to you on the separator.

Yes they are only used in web, I suggest to follow the same pattern as the now generated exchanges.json and zones.json that live in web/src/config (but are .gitignored). I'd be happy to do this myself in a new PR after this is merged.

Copy link
Member Author

Choose a reason for hiding this comment

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

I'll let you update the web config pieces you were mentioning in a subsequent PR :)

Copy link
Collaborator

Choose a reason for hiding this comment

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

The underscore works well 👍

@github-actions github-actions bot added the exchange config Pull request or issue for exchange configurations label Oct 18, 2022
@pierresegonne pierresegonne enabled auto-merge (squash) October 18, 2022 16:13
@pierresegonne pierresegonne merged commit 51a393a into master Oct 18, 2022
@pierresegonne pierresegonne deleted the ps/remove_references_to_json_config branch October 18, 2022 16:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file exchange config Pull request or issue for exchange configurations frontend 🎨 infrastructure parser tests zone config Pull request or issue for zone configurations
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants