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

Features/network 0.5 #836

Merged
merged 119 commits into from
Jan 10, 2023
Merged

Features/network 0.5 #836

merged 119 commits into from
Jan 10, 2023

Conversation

p-snft
Copy link
Member

@p-snft p-snft commented Apr 5, 2022

Follows changes between oemof.network v0.4 and v0.5:

The second point has been implemented in #867. I merged this branch here to be able to test the combination of solph v0.5 and network v0.5.

PS: This PR is against feature/restructure_flow, as I included all changes from that branch (cf. #867). It would be cleaner to merge #856 first and merge this into dev afterwards.

@p-snft p-snft changed the base branch from dev to v0.5 April 5, 2022 20:05
@p-snft p-snft added this to the v0.5.0 milestone Apr 5, 2022
Base automatically changed from v0.5 to dev June 24, 2022 10:01
@p-snft p-snft changed the base branch from dev to feature/restucture_flow September 27, 2022 14:54
@p-snft p-snft marked this pull request as ready for review September 27, 2022 14:56
@p-snft p-snft requested review from uvchik and a team September 27, 2022 15:07
@p-snft p-snft changed the base branch from feature/restucture_flow to dev October 18, 2022 09:10
@p-snft p-snft mentioned this pull request Dec 16, 2022
@p-snft
Copy link
Member Author

p-snft commented Dec 22, 2022

I decided to already merge the changes from #877 to be able to solve merge conflicts.

Numpy 1.24 does not allow creating an ndarray from ragged
nested sequences (which is a list-or-tuple of lists-or-tuples-or
ndarrays with different lengths or shapes) anymore.
Is this should not be fixed in a feature-branch, I am limiting the
numpy version to lower ones.
@p-snft p-snft mentioned this pull request Dec 26, 2022
4 tasks
Copy link
Member

@jokochems jokochems left a comment

Choose a reason for hiding this comment

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

If I see it correctly, the main change this brings along is that it removes oemof.network.network.Node.registry, thus requires you to explicitly call energysystem.add(component) for all your components which I find a good thing as it is sort of a control routine for yourself. I did not do a very thorough review of the remainder since most of it is contained in my review on #877. Thank you for this feature.

@@ -78,12 +78,12 @@ def read(*names, **kwargs):
install_requires=[
"blinker",
"dill",
"numpy",
"numpy < 1.24",
Copy link
Member

Choose a reason for hiding this comment

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

You are working on making it support never numpy versions, right?

Copy link
Member Author

Choose a reason for hiding this comment

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

In my opinion, this should be done before the release of v0.5. However, as the problem was just discovered here, it should be fixed in another PR.

@p-snft p-snft merged commit df9a6df into dev Jan 10, 2023
@p-snft p-snft deleted the features/network-0-5 branch January 10, 2023 20:23
@p-snft p-snft mentioned this pull request Jan 10, 2023
10 tasks
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.

8 participants