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.

Sign up for GitHub

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

Jump to bottom

Support for NetworkX>3.0? #147

Merged
merged 1 commit into from
Mar 4, 2024
Merged

Support for NetworkX>3.0? #147

merged 1 commit into from
Mar 4, 2024

Conversation

wlruys
Copy link
Contributor

@wlruys wlruys commented Feb 17, 2024

After updating the deprecated adjacency matrix to graph function (mentioned in #146) all tests seem to pass when using NetworkX 3.2.

Are there any other reasons for the conservative <3.0 dependency? Can this be updated?

@bonicim
Copy link
Collaborator

bonicim commented Feb 23, 2024

@wlruys Thanks for your PR. Regarding the use of an older version of networkx, we are exploring different options to manage and resolve our dependencies (e.g. poetry) and in the process plan to update both our required and optional dependencies.

@bonicim bonicim self-requested a review February 23, 2024 22:49
@bonicim
Copy link
Collaborator

bonicim commented Feb 23, 2024

@wlruys The develop branch will be updated soon; once done, I will rebase your PR and rerun the CI pipeline so that it passes.

@bonicim
Copy link
Collaborator

bonicim commented Mar 1, 2024

@wlruys The develop branch just got updated. I tested your branch to make sure that there are no merge conflicts with develop. Can you please rebase your branch to develop and do a force push? Or if you want, if you add me as a collaborator to your forked repo, I can update your PR for you.

bonicim
bonicim reviewed Mar 1, 2024
View reviewed changes
Copy link
Collaborator

@bonicim bonicim left a comment

Choose a reason for hiding this comment

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

Thanks for PR. Please rebase off of develop and we'll get this through.

@wlruys wlruys force-pushed the networkx3-support-develop branch from 5765eca to 18b04a4 Compare March 4, 2024 17:40
@wlruys
Copy link
Contributor Author

wlruys commented Mar 4, 2024

Should be gtg. Thanks! This will be much better than switching networkx versions when making figures :)

@bonicim bonicim merged commit f37c169 into pnnl:develop Mar 4, 2024
12 checks passed
bonicim pushed a commit that referenced this pull request Apr 1, 2024
@brendapraggastis @bonicim
Pull request #147: Hypergraph edit
638870a 
Merge in HYP/hypernetx from hypergraph_edit to develop

* commit '1e1dbf7cb6797255b32116fa23954dd9e7d2cca3':
  removed old hypergraph code
  removed .github from .gitignore
  updated hypergraph from incidence matrix constructor
  removing notebooks not intended for sharing
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bonicim bonicim bonicim approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@wlruys @bonicim