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

Remove references to Disney. #72

Merged
merged 3 commits into from
Nov 7, 2024
Merged

Remove references to Disney. #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5b7fca
Remove references to Disney.
zainab-ali Oct 16, 2024
48f9ccf
Restructure LICENSE.
zainab-ali Oct 21, 2024
606b3ea
Amend License to include Typelevel.
zainab-ali Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Copyright 2020 Disney Streaming Services
Copyright 2024 Typelevel
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.

👍

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 •
edited
Loading

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.


Licensed under the Apache License, Version 2.0 (the "Apache License")
with the following modification; you may not use this file except in
Expand Down
19 changes: 8 additions & 11 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<img src="https://github.com/disneystreaming/weaver-test/raw/main/website/static/img/logo.png" width="200px" height="231px" align="right">

[![CI](https://github.com/disneystreaming/weaver-test/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/disneystreaming/weaver-test/actions/workflows/ci.yml)
[![Latest version](https://index.scala-lang.org/disneystreaming/weaver-test/weaver-core/latest.svg?color=orange)](https://index.scala-lang.org/disneystreaming/weaver-test/weaver-core)
[![Gitter](https://img.shields.io/gitter/room/disneystreaming/weaver-test.svg)](https://gitter.im/disneystreaming/weaver-test)
[![Scala Steward badge](https://img.shields.io/badge/Scala_Steward-helping-blue.svg?style=flat&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAQCAMAAAARSr4IAAAAVFBMVEUAAACHjojlOy5NWlrKzcYRKjGFjIbp293YycuLa3pYY2LSqql4f3pCUFTgSjNodYRmcXUsPD/NTTbjRS+2jomhgnzNc223cGvZS0HaSD0XLjbaSjElhIr+AAAAAXRSTlMAQObYZgAAAHlJREFUCNdNyosOwyAIhWHAQS1Vt7a77/3fcxxdmv0xwmckutAR1nkm4ggbyEcg/wWmlGLDAA3oL50xi6fk5ffZ3E2E3QfZDCcCN2YtbEWZt+Drc6u6rlqv7Uk0LdKqqr5rk2UCRXOk0vmQKGfc94nOJyQjouF9H/wCc9gECEYfONoAAAAASUVORK5CYII=)](https://scala-steward.org)
[![CLA assistant](https://cla-assistant.io/readme/badge/disneystreaming/weaver-test)](https://cla-assistant.io/disneystreaming/weaver-test)
<img src="https://github.com/typelevel/weaver-test/raw/main/docs/assets/logo.png" width="200px" height="231px" align="right">

[![CI](https://github.com/typelevel/weaver-test/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/typelevel/weaver-test/actions/workflows/ci.yml)
[![Latest version](https://index.scala-lang.org/typelevel/weaver-test/weaver-core/latest.svg?color=orange)](https://index.scala-lang.org/typelevel/weaver-test/weaver-core)
[![Discord](https://img.shields.io/discord/632277896739946517.svg?label=&logo=discord&logoColor=ffffff&color=404244&labelColor=6A7EC2)](https://discord.gg/xQETVDrGxy)
[![Scala Steward badge](https://img.shields.io/badge/Scala_Steward-helping-blue.svg?style=flat&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAQCAMAAAARSr4IAAAAVFBMVEUAAACHjojlOy5NWlrKzcYRKjGFjIbp293YycuLa3pYY2LSqql4f3pCUFTgSjNodYRmcXUsPD/NTTbjRS+2jomhgnzNc223cGvZS0HaSD0XLjbaSjElhIr+AAAAAXRSTlMAQObYZgAAAHlJREFUCNdNyosOwyAIhWHAQS1Vt7a77/3fcxxdmv0xwmckutAR1nkm4ggbyEcg/wWmlGLDAA3oL50xi6fk5ffZ3E2E3QfZDCcCN2YtbEWZt+Drc6u6rlqv7Uk0LdKqqr5rk2UCRXOk0vmQKGfc94nOJyQjouF9H/wCc9gECEYfONoAAAAASUVORK5CYII=)](https://github.com/scala-steward-org/scala-steward)
# Weaver-test

A test-framework built on [cats-effect](https://github.com/typelevel/cats-effect) and
Expand All @@ -17,14 +15,14 @@ Weaver-test is currently published for **Scala 2.12, 2.13, and 3.0**

### SBT

Refer yourself to the [releases](https://github.com/disneystreaming/weaver-test/releases) page to know the latest released version, and add the following (or scoped equivalent) to your `build.sbt` file.
Refer yourself to the [releases](https://github.com/typelevel/weaver-test/releases) page to know the latest released version, and add the following (or scoped equivalent) to your `build.sbt` file.

```scala
libraryDependencies += "com.disneystreaming" %% "weaver-cats" % "x.y.z" % Test
libraryDependencies += "org.typelevel" %% "weaver-cats" % "x.y.z" % Test
testFrameworks += new TestFramework("weaver.framework.CatsEffect")

// optionally (for Scalacheck usage)
libraryDependencies += "com.disneystreaming" %% "weaver-scalacheck" % "x.y.z" % Test
libraryDependencies += "org.typelevel" %% "weaver-scalacheck" % "x.y.z" % Test
```

## Motivation
Expand Down Expand Up @@ -247,7 +245,6 @@ Note that the site will look a tiny bit different because to build a versioned w

Please:

- Sign the CLA
- Write positive and negative tests
- Include documentation

Expand Down
2 changes: 1 addition & 1 deletion docs/faqs/other_effects.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


We will try to fix critical bugs on the 0.6/0.7 series, as they get found.

Expand Down
4 changes: 2 additions & 2 deletions docs/features/discipline.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ You'll need to install an additional dependency in order to use Discipline with

### SBT
```scala
libraryDependencies += "com.disneystreaming" %% "weaver-discipline" % "@VERSION@" % Test
libraryDependencies += "org.typelevel" %% "weaver-discipline" % "@VERSION@" % Test
```

### Mill
```scala
object test extends Tests {
def ivyDeps = Agg(
ivy"com.disneystreaming::weaver-discipline:@VERSION@"
ivy"org.typelevel::weaver-discipline:@VERSION@"
)
}
```
Expand Down
4 changes: 2 additions & 2 deletions docs/features/scalacheck.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ You'll need to install an additional dependency in order to use ScalaCheck with

### SBT
```scala
libraryDependencies += "com.disneystreaming" %% "weaver-scalacheck" % "@VERSION@" % Test
libraryDependencies += "org.typelevel" %% "weaver-scalacheck" % "@VERSION@" % Test
```

### Mill
```scala
object test extends Tests {
def ivyDeps = Agg(
ivy"com.disneystreaming::weaver-scalacheck:@VERSION@"
ivy"org.typelevel::weaver-scalacheck:@VERSION@"
)
}
```
Expand Down
8 changes: 4 additions & 4 deletions docs/overview/installation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,31 @@ You'll need to install the following dependencies to test your programs against
Newer versions of SBT have [`weaver` automatically integrated](https://github.com/sbt/sbt/pull/7263).

```scala
libraryDependencies += "com.disneystreaming" %% "weaver-cats" % "@VERSION@" % Test
libraryDependencies += "org.typelevel" %% "weaver-cats" % "@VERSION@" % Test
```

### SBT (older versions)

Internally, SBT has a hardcoded list of test frameworks it integrates with. `weaver` must be manually added to this list.

```scala
libraryDependencies += "com.disneystreaming" %% "weaver-cats" % "@VERSION@" % Test
libraryDependencies += "org.typelevel" %% "weaver-cats" % "@VERSION@" % Test
testFrameworks += new TestFramework("weaver.framework.CatsEffect")
```

### Mill
```scala
object test extends Tests {
def ivyDeps = Agg(
ivy"com.disneystreaming::weaver-cats:@VERSION@"
ivy"org.typelevel::weaver-cats:@VERSION@"
)
def testFramework = "weaver.framework.CatsEffect"
}
```

### scala-cli
```scala
//> using lib "com.disneystreaming::weaver-cats:@VERSION@"
//> using lib "org.typelevel::weaver-cats:@VERSION@"
//> using testFramework "weaver.framework.CatsEffect" // this may neccessary if you have other TestFramework on your dependencies
```

Expand Down