Licensing: Facebook CLA does not apply to new contributions (ocaml-pp…

…x#2358)
janestreet · May 31, 2023 · 1449275 · 1449275
1 parent d508311
commit 1449275
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 63 deletions.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -1,5 +1,7 @@
 # Code of Conduct
 
-Facebook has adopted a Code of Conduct that we expect project participants to adhere to.
-Please read the [full text](https://code.fb.com/codeofconduct/)
-so that you can understand what actions will and will not be tolerated.
+This project has adopted the [OCaml Code of Conduct](https://github.com/ocaml/code-of-conduct/blob/main/CODE_OF_CONDUCT.md).
+
+# Enforcement
+
+This project follows the OCaml Code of Conduct [enforcement policy](https://github.com/ocaml/code-of-conduct/blob/main/CODE_OF_CONDUCT.md#enforcement).
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -22,7 +22,6 @@ We actively welcome pull requests.
 4. If you have added code that should be tested, add tests (they should be located in the `tests/passing` directory).
 '.
 5. Ensure the test suite passes (see [Running the tests](#running-the-tests)).
-6. If you haven't already, complete the Contributor License Agreement ("CLA").
 
 When acknowledged, the project maintainers will add [labels](#ocamlformat-labels) to your pull request throughout its lifespan.
 
@@ -51,20 +50,12 @@ bashcompinit
 source <path-to-ocamlformat>/tools/ocamlformat_test_branch
 ```
 
-## Contributor License Agreement ("CLA")
-
-In order to accept your pull request, we need you to submit a CLA. You only need to do this once to work on any of Facebook's open source projects. Complete your CLA here: <https://code.facebook.com/cla>. If you have any questions, please drop us a line at [email protected].
-
 ## License
 
 By contributing to OCamlFormat, you agree that your contributions will be licensed under the LICENSE file in the root directory of this source tree.
 
 ## OCamlFormat Labels
 
-### Pull Request specific
-
-- [CLA Signed](https://github.com/ocaml-ppx/ocamlformat/labels/CLA%20Signed): Added automatically as long as the user signed the Contributor License Agreement (see above)
-
 ### Issue specific
 
 - [Good-first-issue](https://github.com/ocaml-ppx/ocamlformat/labels/Good-first-issue%20%3A%2B1%3A): This issue is a good entry point in the project for new contributors

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,7 @@
 MIT License
 
-Copyright (c) 2017-present, Facebook, Inc.
+Copyright (c) 2017-2023, Facebook, Inc.
+Copyright (c) 2023-present, Tarides.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Makefile b/Makefile
@@ -40,10 +40,6 @@ coverage:
 	echo "Coverage report generated in _coverage/"
 	echo " => open _coverage/index.html"
 
-headers:
-	tools/update_headers.sh
-	dune build @fmt --auto-promote
-
 .PHONY: bench
 bench:
 	@dune build bench/test/source_bench.ml

diff --git a/tools/config.headache b/tools/config.headache
diff --git a/tools/header.txt b/tools/header.txt
diff --git a/tools/update_headers.sh b/tools/update_headers.sh