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

sage.graphs: Update # needs, use block-scoped tags #36026

Merged
merged 10 commits into from
Aug 5, 2023
Merged

sage.graphs: Update # needs, use block-scoped tags #36026

merged 10 commits into from
Aug 5, 2023

Conversation

mkoeppe
Copy link
Contributor

@mkoeppe mkoeppe commented Aug 2, 2023

Cherry-picked from

📝 Checklist

  • The title is concise, informative, and self-explanatory.
  • The description explains in detail what this PR is about.
  • I have linked a relevant issue or discussion.
  • I have created tests covering the changes.
  • I have updated the documentation accordingly.

⌛ Dependencies

@mkoeppe mkoeppe requested a review from dcoudert August 2, 2023 23:22
@mkoeppe mkoeppe self-assigned this Aug 2, 2023
dcoudert
dcoudert approved these changes Aug 3, 2023
View reviewed changes
Copy link
Contributor

@dcoudert dcoudert left a comment

Choose a reason for hiding this comment

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

There are few places where block tags would certainly be nicer, but it's a matter of preferences.

Let's hope this giant PR will not cause too many conflicts with other open PR on graphs...

src/sage/graphs/connectivity.pyx
@@ -1441,13 +1441,13 @@ def vertex_connectivity(G, value_only=True, sets=False, k=None, solver=None, ver
sage: from sage.graphs.connectivity import is_strongly_connected
sage: from sage.graphs.connectivity import is_connected
sage: empty = Graph()
sage: vertex_connectivity(empty)
sage: vertex_connectivity(empty) # needs sage.numerical.mip
Copy link
Contributor

Choose a reason for hiding this comment

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

could be at block level

src/sage/graphs/generators/families.py
@@ -2680,13 +2693,14 @@ def SwitchedSquaredSkewHadamardMatrixGraph(n):

EXAMPLES::

sage: g=graphs.SwitchedSquaredSkewHadamardMatrixGraph(4)
sage: g.is_strongly_regular(parameters=True)
sage: g = graphs.SwitchedSquaredSkewHadamardMatrixGraph(4) # needs sage.modules
Copy link
Contributor

Choose a reason for hiding this comment

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

should be block level

@dcoudert dcoudert mentioned this pull request Aug 3, 2023
Merged
5 tasks
@mkoeppe
Copy link
Contributor Author

mkoeppe commented Aug 3, 2023

Thank you!

@vbraun
Copy link
Member

vbraun commented Aug 4, 2023

There is a 💩 in src/sage/graphs/generators/smallgraphs.py which is probably also why the CI fails. Can we avoid settings positive review in that case?

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Aug 5, 2023

Sorry about this.

Probably we should have a linter that checks for conflict markers.
But then someone should make running the linter part of their merging workflow too...

@github-actions
Copy link

github-actions bot commented Aug 5, 2023

Documentation preview for this PR (built with commit 4d259d4; changes) is ready! 🎉

@vbraun vbraun merged commit ffdd9f8 into sagemath:develop Aug 5, 2023
@mkoeppe mkoeppe added this to the sage-10.1 milestone Aug 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dcoudert dcoudert dcoudert approved these changes

Assignees

@mkoeppe mkoeppe

Labels
c: graph theory t: refactoring
Projects
None yet
Milestone
sage-10.1
Development

Successfully merging this pull request may close these issues.
3 participants
@mkoeppe @vbraun @dcoudert