Skip to content

Conversation

@tomvanmele
Copy link
Member

What type of change is this?

  • Bug fix in a backwards-compatible manner.
  • New feature in a backwards-compatible manner.
  • Breaking change: bug fix or new feature that involve incompatible API changes.
  • Other (e.g. doc update, configuration, etc)

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.

  • I added a line to the CHANGELOG.md file in the Unreleased section under the most fitting heading (e.g. Added, Changed, Removed).
  • I ran all tests on my computer and it's all green (i.e. invoke test).
  • I ran lint on my computer and there are no errors (i.e. invoke lint).
  • I added new functions/classes and made them available on a second-level import, e.g. compas.datastructures.Mesh.
  • I have added tests that prove my fix is effective or that my feature works.
  • I have added necessary documentation (if appropriate)

Copy link
Member

@gonzalocasas gonzalocasas left a comment

Choose a reason for hiding this comment

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

generally lgtm, although it's a lot of code for an in-depth review, but since most of it is just moved, I think the risk is minimal

Comment on lines 5 to 8
from random import sample
from ast import literal_eval
from itertools import combinations

Copy link
Member

Choose a reason for hiding this comment

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

i think imports need to be isorted

CHANGELOG.md Outdated

### Changed

* Merged `compas.datastructures.Graph` into `compas.datastructures.Network`.
Copy link
Member

Choose a reason for hiding this comment

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

Isn't it the other way around?

Suggested change
* Merged `compas.datastructures.Graph` into `compas.datastructures.Network`.
* Merged `compas.datastructures.Network` into `compas.datastructures.Graph`.

Comment on lines 159 to 199
:meth:`from_networkx`
:meth:`from_graphx`
Copy link
Member

Choose a reason for hiding this comment

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

This is one search-n-replace too much, this is from_networkx still ;)

],
)
def test_schema_graph_valid(graph):
def test_schema_graphalid(graph):
Copy link
Member

Choose a reason for hiding this comment

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

typo?

# ==============================================================================


def test_network_to_networkx():
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
def test_network_to_networkx():
def test_graph_to_networkx():

@tomvanmele tomvanmele merged commit b1e8303 into main Jan 15, 2024
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.

3 participants