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

Add oem2orm to poetry #342

Merged
merged 8 commits into from
Sep 11, 2023
Merged

Add oem2orm to poetry #342

merged 8 commits into from
Sep 11, 2023

Conversation

MaGering
Copy link
Collaborator

@MaGering MaGering commented Aug 31, 2023

This rule upload_results_to_oep needs the package oem2orm. So far it has been listed in the extra requirements of poetry (cf. here).

However this info is not given anywhere in the documentation. But more severe is that the prompt poetry install -E upload_results_to_oep leads to No dependencies to install or update.. It can not be installed via the extra requirements.

That's why with this PR oem2orm is added to the main dependencies.

To be tested with:

snakemake -j1 results/2050-80-el_eff/b3_results/metadata
snakemake -j1 results/2050-80-gas_moreCH4/b3_results/metadata
snakemake -j1 results/2050-95-el_eff/b3_results/metadata
snakemake -j1 results/2050-95-gas_moreCH4/b3_results/metadata
snakemake -j1 results/2050-100-el_eff/b3_results/metadata
snakemake -j1 results/2050-100-gas_moreCH4/b3_results/metadata

@MaGering MaGering added the bug Something isn't working label Aug 31, 2023
@MaGering MaGering added this to the v0.0.3 milestone Aug 31, 2023
@MaGering
Copy link
Collaborator Author

MaGering commented Aug 31, 2023

Outdated: Again checks not working due to problem described in my comment here. Hence this PR should be merged after #336.

Checks pass as of the state of commit 911f404.

Copy link
Collaborator

@Stefanie08 Stefanie08 left a comment

Choose a reason for hiding this comment

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

Outdated: I have tested the dev branch with a new created environment. The processing of the rule upload_results_to_oep stops at the input of the OEP-username. This goes for all scenarios.

After merging the branch fix/add_oem2orm_pckg into the branch features/update_tabular, merge conflicts are raised. Mainly in the poetry.lock file and one in the pyproject.toml.
The process to achieve the same outcome as the one in the dev branch, the complete poetry.lock file from the merged branches needs to be replaced with the poetry.lock file of the branch features/update_tabular. After resolving the merge conflicts the tests can be run.
Before that I tried to manually fix the merge conflicts, executed poetry lock and poetry install to update the packages. This approach leads to an error message of the following (for windows):

TypeError: Flow._init_() got an unexpected keyword argument 'gas-heat_central-B'

Copy link
Collaborator

@Stefanie08 Stefanie08 left a comment

Choose a reason for hiding this comment

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

Changes work as expected

@MaGering MaGering merged commit aba69a1 into dev Sep 11, 2023
1 check passed
@MaGering MaGering deleted the fix/add_oem2orm_pckg branch September 11, 2023 11:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants