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

Remove references to Disney. #72

Merged
merged 3 commits into from
Nov 7, 2024
Merged

Conversation

zainab-ali
Copy link
Contributor

This PR renames references from com.disneystreaming to org.typelevel.

In addition:

  • The CLA assistant link and reference has been removed.
  • Gitter has been replaced with a link to weaver-dev on Discord. We'd want to link to a weaver channel once created.

The codebase still references issues and discussions on the disneystreaming/weaver-test repo. These are the only references to disney that remain.

@@ -9,7 +9,7 @@ to resurrect support for the effect types they use in repository they control.

You can read about the rationale for decision [here](https://github.com/disneystreaming/weaver-test/discussions/570). Feel free to ping us via a github discussion, if you seek to resurrect support for a given effect-type.

If you are looking for documentation of the maintenance branch of weaver that did support other effect types, you can find it [over there](https://disneystreaming.github.io/weaver-test/docs/0.6.15/installation).
If you are looking for documentation of the maintenance branch of weaver that did support other effect types, you can find it [over there](https://github.com/disneystreaming/weaver-test/blob/v0.6.15/docs/installation.md).
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Assuming the repo is archived and not deleted, we can still reference this.

That said, I wonder if this portion of the docs could be removed entirely

limitations under the License.

--------------------------------------------------------------------------
Copyright 2020-2024 Disney Streaming Services
Copy link
Collaborator

Choose a reason for hiding this comment

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

👍

limitations under the License.

--------------------------------------------------------------------------
Copyright 2020-2024 Disney Streaming Services
Copy link
Member

Choose a reason for hiding this comment

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

I'd move this up to top of the file or otherwise I feel it'll never be updated. Maybe this:

Copyright 2024 Typelevel and respective contributors
Copyright 2020-2024 Disney Streaming Services

Then when we update to 2025, both get updated.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Why should both get updated, if the fork happens in 2024 and the Disney one never gets any contributions ever again ?

Copy link
Member

@djspiewak djspiewak Oct 17, 2024

Choose a reason for hiding this comment

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

I agree with moving the copyright up to the top so they're in pairs. This also avoids having to repeat the license fragment. Additionally, I would leave the DSS copyright backdated, for exactly the reasons @Baccata stated. Given that it's a fork, Disney has no claim on contributions made beyond that date.

Regarding the Typelevel wording, I still have concerns about the "and respective contributors" bit (and all variants thereof). That's not the only reason the heading is problematic though, so these are all shades of legal gray. I understand "Typelevel" (without qualification) to refer to the broad collective of individuals who have touched the specific file, since Typelevel is no longer a legally incorporated entity nor has it established a work-for-hire arrangement with any of the constituent contributors. All of which is to say that the copyright is actually held by 1) Disney (for anything pre-fork either performed by Disney employees or covered under CLA), and 2) the individual personages who wrote the code, which makes the whole header kind of wrong unless we interpret "Typelevel" to be a way of referring to the amorphous collective loosely identified by git blame rather than a singular indemnifying entity. Which is to say that the "and respective contributors" bit is redundant and must be redundant for the header to have any meaning at all.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the feedback. I've moved the copyright up to the top, replaced Typelevel with just respective contributors, and deleted the additional Apache License block.

Note that by deleting the additional License block, we're keeping to Disney Streaming's trademark edits of Section 6. Is that really something we want? I separated the two initially (and moved Disney streaming down the page) so that we could have the standard license.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yeah once again, this is something that we could use @djspiewak's opinion on.

Daniel, the license of disneystreaming/weaver is essentially a copy of Apache 2, with an additional amendment giving some strict wording with regards to branding. This amended Apache 2 was more recently named TOST ( https://disneystreaming.github.io/TOST-1.0.txt).

I think generally speaking, you cannot distribute software under a less strict license than the one it was originally distributed under. That being said, the paragraph feels way overzealous.

LICENSE Outdated
limitations under the License.

--------------------------------------------------------------------------
Copyright 2024 respective contributors
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think Daniel meant, "keep Copyright 2024 Typelevel and drop the respective contributors part", but I don't think his firmware allows him to formulate that in a way that's not confusing to the rest of us, and my interpretation of his output stream may be wrong.

So I'm referring myself to the source headers of other typelevel projects

@Baccata Baccata merged commit 5b9e5a2 into typelevel:main Nov 7, 2024
13 checks passed
@zainab-ali zainab-ali deleted the remove-disney branch November 7, 2024 09:55
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.

4 participants