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

feat: remove "scripts." in snakefile #926

Merged
merged 3 commits into from
Nov 29, 2023
Merged

Conversation

doneachh
Copy link
Contributor

@doneachh doneachh commented Nov 28, 2023

Closes # (if applicable).

Changes proposed in this Pull Request

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.

@doneachh
Copy link
Contributor Author

Hi @davide-f ,
I adjusted the snakefile in pypsa-earth as you told me in the PR of pypsa-earth sec:
pypsa-meets-earth/pypsa-earth-sec#237
As we do not work with paths in the get_commit function of pypsa-earth, i didn't adjust that here or do you think it's necessary? :)

PS: Do you know, why the pipeline doesnt work? Is it still because of the zenodo issue or is it because of my adjustments?

@davide-f
Copy link
Member

Hi @davide-f , I adjusted the snakefile in pypsa-earth as you told me in the PR of pypsa-earth sec: pypsa-meets-earth/pypsa-earth-sec#237 As we do not work with paths in the get_commit function of pypsa-earth, i didn't adjust that here or do you think it's necessary? :)

PS: Do you know, why the pipeline doesnt work? Is it still because of the zenodo issue or is it because of my adjustments?

Great @doneachh :D
So, I'd parse here the changes on the function you implemented in the -sec version.
In the future, we may use just this function also in the -sec version.

Could you parse the changes here?

I'd like a CI to work to merge this PR, we can launch a CI early tomorrow, or if you commit early tomorrow, that should do the trick in the meantime...

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.

On top of the above, please, there is a missing "scripts." in:

from scripts.build_test_configs import create_test_config

@doneachh
Copy link
Contributor Author

Hi @davide-f :D
I adjusted the code as described :)

@davide-f
Copy link
Member

CI passing, merging :)
@doneachh, after merging in the -sec version, please update the git submodule using git submodule update --remote --merge

you may investigate if we can use the get_commit function from the pypsa-earth submodule instead of copying it into the -sec version, but that's not necessary

Great :D

@davide-f davide-f merged commit 35ada5e into pypsa-meets-earth:main Nov 29, 2023
4 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.

2 participants