Merge graphs package #100

dcharkes · 2023-05-23T08:49:39Z

Do NOT squash merge!

Reasons for merging into dart-lang/tools mono_repo:

Easier maintenance.
Automatic mirroring in https://dart.googlesource.com/tools instead of setting up a new mirror for graphs.

Steps taken:

Get git-filter-repo:
newren $ git clone git@github.com:newren/git-filter-repo.git
Add git-filter-repo to PATH.
Fresh clone of repo that needs to be merged into a mono repo:
dart-lang $ git clone git@github.com:dart-lang/graphs.git
Destructively rewrite the history of the repository to be in pkgs/package_name:
graphs $ git filter-repo --path-rename :pkgs/graphs/
Destructively prefix all the tags:
graphs $ git filter-repo --tag-rename :graphs-
Replace paths and links in files.
1. Badges: https://github.com/dart-lang/graphs/actions/workflows/ci.yml -> https://github.com/dart-lang/tools/actions/workflows/graphs.yml
2. Remaining links, manually check if this does the right thing, otherwise insert steps above this step. https://github.com/dart-lang/graphs -> https://github.com/dart-lang/tools/tree/main/pkgs/graphs
Migrate the GitHub workflow.
1. Delete dependabot.yaml which is already in the target mono_repo.
2. Rename file: pkgs/graphs/.github/workflows/ci.yml -> .github/workflows/graphs.yml
3. Add paths to the on clauses in the GitHub workflow (example).
4. Add defaults->run->working-directory to all jobs in the GitHub workflow (example).
Commit with a detailed message.
In the directory of the mono_repo, create a branch.
tools $ git checkout -b merge-graphs-package
Add a remote for the local clone of the moving package
1. tools $ git remote add graphs_package /Users/dacoharkes/src/dart-lang/graphs/
2. tools $ git fetch graphs_package
Merge
tools $ git merge --allow-unrelated-histories graphs_package/master -m "Merge package:graphs into shared tool repository"
Copy the list of renamed tags into a comment on the PR.

Current step:

Create a pull request and get it reviewed. Do not submit through the github UI, since it does not allow a fast forward merge.
1. If there are changes required, back out and start over (it's OK to force push to the PR branch)

Steps to do:

Disable squash-only in GitHub settings, and merge with a fast forward merge to the main branch, enable squash-only in GitHub settings.
Push tags to github
Follow up with a PR adding links to the top-level readme table.
Add a commit to https://github.com/dart-lang/graphs/ with it's readme pointing to this repo
Archive https://github.com/dart-lang/graphs/.

Tag names after renaming:

[new tag] graphs-v0.1.0 -> graphs-v0.1.0
[new tag] graphs-v0.1.1 -> graphs-v0.1.1
[new tag] graphs-v0.1.2 -> graphs-v0.1.2
[new tag] graphs-v0.1.2+1 -> graphs-v0.1.2+1
[new tag] graphs-v0.1.3 -> graphs-v0.1.3
[new tag] graphs-v0.1.3+1 -> graphs-v0.1.3+1
[new tag] graphs-v0.2.0 -> graphs-v0.2.0
[new tag] graphs-v1.0.0 -> graphs-v1.0.0
[new tag] graphs-v2.0.0 -> graphs-v2.0.0
[new tag] graphs-v2.1.0 -> graphs-v2.1.0
[new tag] graphs-v2.2.0 -> graphs-v2.2.0

While implementing crawlAsync I noticed some discrepancies: - Use 'directed' rather than 'ordered' graph - This is a reverse topological sort, not a topolocical sort

Implemented with no ordering guarantees since this is the simplest and likely most performance. Add an example crawing transitive imports since this matches our known use case.

Workaround for dart-lang/sdk#31884 in the dev.17.0 version of the SDK.

Also use `eagerError` and check for alrady closed streams to prune work when there are errors.

Use new analyzer APIs.

Closes #20

- `dartfmt --fix` to drop optional `new`. - Change example to use `whereType`. - Update minimum SDK to one that has Dart 2 semantics by default. - Test on stable. - Update package:test dependency.

Closes #23

Looks like ~10% improvement with dart2js and a ~8% improvement on VM Fixes dart-archive/graphs#25

Fixes dart-archive/graphs#27

Bumps [actions/checkout](https://github.com/actions/checkout) from 3.1.0 to 3.2.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@93ea575...755da8c) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [dart-lang/setup-dart](https://github.com/dart-lang/setup-dart) from 1.3 to 1.4. - [Release notes](https://github.com/dart-lang/setup-dart/releases) - [Changelog](https://github.com/dart-lang/setup-dart/blob/main/CHANGELOG.md) - [Commits](dart-lang/setup-dart@6a218f2...a57a6c0) --- updated-dependencies: - dependency-name: dart-lang/setup-dart dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [actions/checkout](https://github.com/actions/checkout) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@755da8c...ac59398) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [actions/checkout](https://github.com/actions/checkout) from 3.3.0 to 3.5.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@ac59398...8f4b7f8) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [dart-lang/setup-dart](https://github.com/dart-lang/setup-dart) from 1.4.0 to 1.5.0. - [Release notes](https://github.com/dart-lang/setup-dart/releases) - [Changelog](https://github.com/dart-lang/setup-dart/blob/main/CHANGELOG.md) - [Commits](dart-lang/setup-dart@a57a6c0...d6a63da) --- updated-dependencies: - dependency-name: dart-lang/setup-dart dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.0 to 3.5.2. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@8f4b7f8...8e5e7e5) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

This also makes topologicalSort() and stronglyConnectedComponents() iterative rather than recursive, so transitiveClosure() is able to operate on very large graphs.

Use `-` over `*` and avoid extra line breaks for consistency.

dependabot

google-cla · 2023-05-23T08:49:49Z

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

github-actions · 2023-05-23T08:50:14Z

Package publishing

Package	Version	Status	Publish tag (post-merge)
package:unified_analytics	1.1.1	ready to publish	`unified_analytics-v1.1.1`
package:cli_config	0.1.1	already published at pub.dev
package:graphs	2.3.0	already published at pub.dev

Documentation at https://github.com/dart-lang/ecosystem/wiki/Publishing-automation.

Commits have been rewritten with git-filter-repo to be inside pkgs/graphs/. Tags have been rewritten with git-filter-repo to prefix graph-. Migrated GitHub action workflow. Updated `repository` config and README to use the anticipated URL. Updated CHANGELOG to have ## headings.

devoncarew

lgtm for my part

(generally, I wonder if there's any way we can make very very sure that these package-merge PRs don't accidentally get merged in through the github UI)

devoncarew · 2023-05-23T16:12:47Z

pkgs/graphs/CONTRIBUTING.md

@@ -0,0 +1,33 @@
+Want to contribute? Great! First, read this page (including the small print at


Not necessary for this PR (can be done after its merged in), but we can delete this separate contributing file.

devoncarew · 2023-05-23T16:16:16Z

pkgs/graphs/pubspec.yaml

+name: graphs
+version: 2.3.0
+description: Graph algorithms that operate on graphs in any representation
+repository: https://github.com/dart-lang/tools/tree/main/pkgs/graphs


Anytime we make changes to the pubspec file we really should rev the version. Generally, I'd say that we should merge this in unchanged, and then plan to come along later w/ a PR to the tools/ repo that updates this to the correct value and revs the pubspec version.

No concerns however w/o merging this in as is, we should just plan to rev the pubspec after the merge).

dcharkes · 2023-05-23T17:51:23Z

generally, I wonder if there's any way we can make very very sure that these package-merge PRs don't accidentally get merged in through the github UI

I have followed @stuartmorgan's suggestion on the doc to enable merge commits in the repo settings, then merge in the GitHub UI, and then turn that setting off again in the repo setings.

The result is two merge commits, one from the git merge of the two repos, one from GitHub itself, it doesn't do fast forward:

If I would have pushed to main instead, then main would now be at 4331e28.

This seems to have no effect on git blame etc.

natebosch and others added 30 commits December 4, 2017 11:13

Package description

b83a4ca

Dart package boilerplate (#1)

4d9eaf0

Implement stronglyConnectedComponents (#2)

d911c47

Add Travis config (#3)

b9dfcba

Only test on master branch (#4)

d696165

Add test for self-cycles (#6)

f75feb6

Expand README and add example (#5)

edd9572

Allow children to return null (#8)

7ea7bc4

Use more precise language in docs for SCC (#9)

5f4c330

While implementing crawlAsync I noticed some discrepancies: - Use 'directed' rather than 'ordered' graph - This is a reverse topological sort, not a topolocical sort

Implement crawlAsync (#10)

3ba4fcc

Implemented with no ordering guarantees since this is the simplest and likely most performance. Add an example crawing transitive imports since this matches our known use case.

Add missing copyright notices, update changelog (#11)

d3b1290

Add more lints (#12)

5d98ea2

Prepare to publish 0.1.0 (#13)

b16ce0c

Add explicit type to for-in loop (#16)

5876b0b

Workaround for dart-lang/sdk#31884 in the dev.17.0 version of the SDK.

Ignore null nodes in crawlAsync (#17)

7e5a23c

Surface crawlAsync errors through the Stream (#18)

1f3e91b

Also use `eagerError` and check for alrady closed streams to prune work when there are errors.

Use new analyzer APIs.

660aba1

Fix naming nits.

6d3dac3

Try to require sdk >=2.0.0-dev.48.0 to see if this fixes Travis.

f69e424

We cannot require sdk >=2.0.0-dev.48.0, because of stable SDK branch?

4132632

Stop testing on stable, and require sdk >=2.0.0-dev.48.0

48c48cc

Merge pull request #19 from scheglov/use-new-analyzer-api

c90b09f

Use new analyzer APIs.

Allow the non-dev Dart 2 SDK (#21)

00cf4b0

Closes #20

Update for Dart 2 (#22)

fc9f636

- `dartfmt --fix` to drop optional `new`. - Change example to use `whereType`. - Update minimum SDK to one that has Dart 2 semantics by default. - Test on stable. - Update package:test dependency.

Add more lints used in package:pedantic (#24)

690e451

Closes #23

Use HashMap/HashSet for stronglyConnectedComponents (#26)

72974f2

Looks like ~10% improvement with dart2js and a ~8% improvement on VM Fixes dart-archive/graphs#25

Add shortestPath(s) functions

2498917

Fixes dart-archive/graphs#27

update dev dependencies

91e320b

enable and fix a number of lints, use pedantic lints explicitly

3eb499c

prepare for release

f2c6a24

dependabot bot and others added 9 commits January 3, 2023 11:04

Add a transitiveClosure() function (#83)

cef9625

This also makes topologicalSort() and stronglyConnectedComponents() iterative rather than recursive, so transitiveClosure() is able to operate on very large graphs.

Normalize changelog formatting (#85)

d3bea48

Use `-` over `*` and avoid extra line breaks for consistency.

blast_repo fixes (#87)

42218af

dependabot

dcharkes requested review from devoncarew and natebosch May 23, 2023 08:49

github-actions bot added the type-infra A repository infrastructure change or enhancement label May 23, 2023

dcharkes force-pushed the merge-graphs-package branch from 69a48e4 to 56853d5 Compare May 23, 2023 09:29

dcharkes added 2 commits May 23, 2023 11:38

Merge package:graphs into shared tool repository

4331e28

dcharkes force-pushed the merge-graphs-package branch from 56853d5 to 4331e28 Compare May 23, 2023 09:39

devoncarew approved these changes May 23, 2023

View reviewed changes

natebosch approved these changes May 23, 2023

View reviewed changes

dcharkes merged commit 5629236 into main May 23, 2023

dcharkes deleted the merge-graphs-package branch May 23, 2023 17:42

liamappelbe mentioned this pull request Nov 2, 2023

Merge package:ffigen into dart-lang/native dart-lang/native#185

Merged

HosseinYousefi mentioned this pull request Nov 16, 2023

Merge jnigen dart-lang/native#545

Merged

dcharkes mentioned this pull request Jan 16, 2024

Merge ffi package dart-lang/native#895

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge graphs package #100

Merge graphs package #100

Uh oh!

dcharkes commented May 23, 2023 •

edited

Loading

Uh oh!

google-cla bot commented May 23, 2023

Uh oh!

github-actions bot commented May 23, 2023 •

edited

Loading

Uh oh!

devoncarew left a comment

Uh oh!

devoncarew May 23, 2023

Uh oh!

devoncarew May 23, 2023

Uh oh!

dcharkes commented May 23, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

		@@ -0,0 +1,33 @@
		Want to contribute? Great! First, read this page (including the small print at

Merge graphs package #100

Merge graphs package #100

Uh oh!

Conversation

dcharkes commented May 23, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

google-cla bot commented May 23, 2023

Uh oh!

github-actions bot commented May 23, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Package publishing

Uh oh!

devoncarew left a comment

Choose a reason for hiding this comment

Uh oh!

devoncarew May 23, 2023

Choose a reason for hiding this comment

Uh oh!

devoncarew May 23, 2023

Choose a reason for hiding this comment

Uh oh!

dcharkes commented May 23, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

dcharkes commented May 23, 2023 •

edited

Loading

github-actions bot commented May 23, 2023 •

edited

Loading