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

Harmonise wildcards #1223

Merged
merged 10 commits into from
Dec 20, 2024
Merged

Conversation

ekatef
Copy link
Member

@ekatef ekatef commented Dec 4, 2024

Closes #1197

Changes proposed in this Pull Request

Arguments of mock_snakemake have been updated using parameters of the sector-coupled test config (config.test1.yaml renamed into config.sector.yaml)

Checklist

  • I consent to the release of this PR's code under the AGPLv3 license and non-code contributions under CC0-1.0 and CC-BY-4.0.
  • I tested my contribution locally and it seems to work fine.
  • Code and workflow changes are sufficiently documented.
  • Newly introduced dependencies are added to envs/environment.yaml and doc/requirements.txt.
  • Changes in configuration options are added in all of config.default.yaml and config.tutorial.yaml.
  • Add a test config or line additions to test/ (note tests are changing the config.tutorial.yaml)
  • Changes in configuration options are also documented in doc/configtables/*.csv and line references are adjusted in doc/configuration.rst and doc/tutorial.rst.
  • A note for the release notes doc/release_notes.rst is amended in the format of previous release notes, including reference to the requested PR.

@ekatef ekatef marked this pull request as ready for review December 4, 2024 19:13
Copy link
Member

@davide-f davide-f left a comment

Choose a reason for hiding this comment

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

Thanks for the PR, this looks nice for me; few minor comments.

@@ -3,7 +3,7 @@
# SPDX-License-Identifier: CC0-1.0

### CHANGES TO CONFIG.TUTORIAL.YAML ###
version: 0.4.1
version: 0.4.2
Copy link
Member

Choose a reason for hiding this comment

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

These changes are probably a refuse? It applies also to the following yaml files

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 thought about fixing a typo: the current version of the config is 0.4.2, and it should be probably the same across the scripts?

Copy link
Member

Choose a reason for hiding this comment

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

That is probably a refuse maybe; hadn't the number to match the version of the repo?

Copy link
Member Author

Choose a reason for hiding this comment

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

That is probably a refuse maybe; hadn't the number to match the version of the repo?

Agree that it would be best when there is a match between the configuration and the release versions. But what is we introduce changes into the config when the repo version remains the same? We have discussed the idea to use sub-versions of the config to track (e.g. 0.4.1.1) that but agreed that it's against semantic versioning. Ideally, it would be great to have a release every time when the config changes, but that is not exactly realistic as far as we don't have an automated release process

Happy to discuss at the next convenience 🙂

scripts/prepare_sector_network.py Outdated Show resolved Hide resolved
@davide-f
Copy link
Member

Also this one can be merged right? @ekatef ?

@ekatef
Copy link
Member Author

ekatef commented Dec 12, 2024

Also this one can be merged right? @ekatef ?

I think yes 🙂

@davide-f
Copy link
Member

mmm... conflicts :'( would you mind fixing them?

@ekatef
Copy link
Member Author

ekatef commented Dec 20, 2024

mmm... conflicts :'( would you mind fixing them?

Thanks a lot for the reminder 🙂 Done!

@davide-f davide-f merged commit 17c7030 into pypsa-meets-earth:main Dec 20, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Harmonize the wildcards for testing of the scripts
2 participants