-
Notifications
You must be signed in to change notification settings - Fork 207
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
Bypass external urls #1257
Bypass external urls #1257
Conversation
If you had time @ekatef , it would be great to review this PR and potentially merge. |
Perfect, fantastic news!! Thank you so much for tackling that. Reviewing 😄 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perfect @davide-f! That is fantastic news that you have managed to make CI work, and geoboundaries seem to be a good replacement 😄
Have added a couple of comments which mainly relate to documenting the changes. Could you please to have a look? Happy to merge afterwards.
configs/bundle_config.yaml
Outdated
- data/gadm/gadm41_NGA/gadm41_NGA.gpkg | ||
- data/gadm/gadm41_BEN/gadm41_BEN.gpkg | ||
- data/gadm/gadm36_NGA/gadm36_NGA.gpkg | ||
- data/gadm/gadm36_BEN/gadm36_BEN.gpkg |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As far as I remember, gadm41
is needed for the power-only model, while gadm36
is being used by the cross-sectoral part, right? It would be nice to have a comment on that
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure it is so relevant to add these details; we have no comments on the other pieces, but I can add the lines
configs/bundle_config.yaml
Outdated
- data/gadm/gadm41_BWA/gadm41_BWA.gpkg | ||
- data/gadm/gadm36_BWA/gadm36_BWA.gpkg |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same comment as above: it would be really great to explain a reason why we need two sources for GADM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
as above
configs/bundle_config.yaml
Outdated
|
||
# # tutorial bundle specific for Nigeria and Benin only, without gadm-like data | ||
# bundle_tutorial_NGBJ: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably, it would be handy to have a short explanation on the reason to comment-out this part with a link to #1258
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Adding :)
co2limit = float(m[0]) * snakemake.params.electricity["co2base"] | ||
co2limit = float(m[0]) * float(snakemake.params.electricity["co2base"]) | ||
logger.info("Setting CO2 limit according to wildcard value.") | ||
else: | ||
co2limit = snakemake.params.electricity["co2limit"] | ||
co2limit = float(snakemake.params.electricity["co2limit"]) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My guess is that these changes in prepare_network
have been needed to test the workflow properly. Can you please confirm that? 🙂 (apologies for an idiotic question, just double-checking that the changes are intentional and exactly as they are supposed to be)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Today there has been a temporary issue with the automatic download of emission data; because of that I disabled that and I had issues as the float(..) was needed to make it work.
It was a minor thing and decided to add it as it is minor
Closes #1256
Changes proposed in this Pull Request
Checklist
envs/environment.yaml
anddoc/requirements.txt
.config.default.yaml
andconfig.tutorial.yaml
.test/
(note tests are changing the config.tutorial.yaml)doc/configtables/*.csv
and line references are adjusted indoc/configuration.rst
anddoc/tutorial.rst
.doc/release_notes.rst
is amended in the format of previous release notes, including reference to the requested PR.