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

[Merged by Bors] - Revert "Add cart's fork of ecs_bench_suite (#4225)" #4252

Closed
wants to merge 1 commit into from

Conversation

DJMcNab
Copy link
Member

@DJMcNab DJMcNab commented Mar 19, 2022

This reverts commit 08ef2f0.

Objective

Solution

  • Revert it

@github-actions github-actions bot added the S-Needs-Triage This issue needs to be labelled label Mar 19, 2022
@DJMcNab DJMcNab added P-High This is particularly urgent, and deserves immediate attention A-ECS Entities, components, systems, and events A-Meta About the project itself and removed S-Needs-Triage This issue needs to be labelled labels Mar 19, 2022
@mockersf
Copy link
Member

bors r+

bors bot pushed a commit that referenced this pull request Mar 19, 2022
This reverts commit 08ef2f0.

# Objective

- #4225 was merged without considering the licensing considerations.
- It merges in code taken from https://github.com/cart/ecs_bench_suite/tree/bevy-benches/src/bevy.
- We can safely assume that we do have a license to cart's contributions. However, these build upon cart/ecs_bench_suite@377e96e, for which we have no license. 
- This has been verified by looking in the Cargo.toml, the root folder and the readme, none of which mention a license. Additionally, the string "license" [doesn't appear](https://github.com/rust-gamedev/ecs_bench_suite/search?q=license) in the repository.
- This means the code is all rights reserved.
- (The author of these commits also hasn't commented in #2373, though even if they had, it would be legally *dubious* to rely on that to license any code they ever wrote)
- (Note that the latest commit on the head at https://github.com/rust-gamedev/ecs_bench_suite hasn't had a license added either.)
- We are currently incorrectly claiming to be able to give an MIT/Apache 2.0 license to this code.

## Solution

- Revert it
@mockersf
Copy link
Member

@cart merging this now to respect the license

@bors bors bot changed the title Revert "Add cart's fork of ecs_bench_suite (#4225)" [Merged by Bors] - Revert "Add cart's fork of ecs_bench_suite (#4225)" Mar 19, 2022
@bors bors bot closed this Mar 19, 2022
alice-i-cecile pushed a commit to alice-i-cecile/bevy that referenced this pull request Mar 25, 2022
bors bot pushed a commit that referenced this pull request Mar 29, 2022
# Objective

- Benchmarks are good.
- Licensing situation appears to be [cleared up](#4225 (comment)).

## Solution

- Add the benchmark suite back in
- Suggested PR title: "Revert "Revert "Add cart's fork of ecs_bench_suite (#4225)" (#4252)"


Co-authored-by: Daniel McNab <36049421+DJMcNab@users.noreply.github.com>
@DJMcNab DJMcNab deleted the license-bench branch May 10, 2022 16:17
aevyrie pushed a commit to aevyrie/bevy that referenced this pull request Jun 7, 2022
…gine#4252)

This reverts commit 08ef2f0.

# Objective

- bevyengine#4225 was merged without considering the licensing considerations.
- It merges in code taken from https://github.com/cart/ecs_bench_suite/tree/bevy-benches/src/bevy.
- We can safely assume that we do have a license to cart's contributions. However, these build upon cart/ecs_bench_suite@377e96e, for which we have no license. 
- This has been verified by looking in the Cargo.toml, the root folder and the readme, none of which mention a license. Additionally, the string "license" [doesn't appear](https://github.com/rust-gamedev/ecs_bench_suite/search?q=license) in the repository.
- This means the code is all rights reserved.
- (The author of these commits also hasn't commented in bevyengine#2373, though even if they had, it would be legally *dubious* to rely on that to license any code they ever wrote)
- (Note that the latest commit on the head at https://github.com/rust-gamedev/ecs_bench_suite hasn't had a license added either.)
- We are currently incorrectly claiming to be able to give an MIT/Apache 2.0 license to this code.

## Solution

- Revert it
aevyrie pushed a commit to aevyrie/bevy that referenced this pull request Jun 7, 2022
# Objective

- Benchmarks are good.
- Licensing situation appears to be [cleared up](bevyengine#4225 (comment)).

## Solution

- Add the benchmark suite back in
- Suggested PR title: "Revert "Revert "Add cart's fork of ecs_bench_suite (bevyengine#4225)" (bevyengine#4252)"


Co-authored-by: Daniel McNab <36049421+DJMcNab@users.noreply.github.com>
ItsDoot pushed a commit to ItsDoot/bevy that referenced this pull request Feb 1, 2023
…gine#4252)

This reverts commit 08ef2f0.

# Objective

- bevyengine#4225 was merged without considering the licensing considerations.
- It merges in code taken from https://github.com/cart/ecs_bench_suite/tree/bevy-benches/src/bevy.
- We can safely assume that we do have a license to cart's contributions. However, these build upon cart/ecs_bench_suite@377e96e, for which we have no license. 
- This has been verified by looking in the Cargo.toml, the root folder and the readme, none of which mention a license. Additionally, the string "license" [doesn't appear](https://github.com/rust-gamedev/ecs_bench_suite/search?q=license) in the repository.
- This means the code is all rights reserved.
- (The author of these commits also hasn't commented in bevyengine#2373, though even if they had, it would be legally *dubious* to rely on that to license any code they ever wrote)
- (Note that the latest commit on the head at https://github.com/rust-gamedev/ecs_bench_suite hasn't had a license added either.)
- We are currently incorrectly claiming to be able to give an MIT/Apache 2.0 license to this code.

## Solution

- Revert it
ItsDoot pushed a commit to ItsDoot/bevy that referenced this pull request Feb 1, 2023
# Objective

- Benchmarks are good.
- Licensing situation appears to be [cleared up](bevyengine#4225 (comment)).

## Solution

- Add the benchmark suite back in
- Suggested PR title: "Revert "Revert "Add cart's fork of ecs_bench_suite (bevyengine#4225)" (bevyengine#4252)"


Co-authored-by: Daniel McNab <36049421+DJMcNab@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-ECS Entities, components, systems, and events A-Meta About the project itself P-High This is particularly urgent, and deserves immediate attention
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants