From 1449275a42f6353ea7009b6f54a740b2ee5f4a91 Mon Sep 17 00:00:00 2001 From: Guillaume Petiot Date: Wed, 31 May 2023 11:49:59 +0100 Subject: [PATCH] Licensing: Facebook CLA does not apply to new contributions (#2358) --- CODE_OF_CONDUCT.md | 8 +++++--- CONTRIBUTING.md | 9 --------- LICENSE.md | 3 ++- Makefile | 4 ---- tools/config.headache | 25 ------------------------- tools/header.txt | 8 -------- tools/update_headers.sh | 13 ------------- 7 files changed, 7 insertions(+), 63 deletions(-) delete mode 100644 tools/config.headache delete mode 100644 tools/header.txt delete mode 100755 tools/update_headers.sh diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 0f7ad8bfc1..5a915b87c1 100644 --- 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 index 5aec70bb80..20da5f236f 100644 --- 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 /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: . If you have any questions, please drop us a line at cla@fb.com. - ## 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 index c29bfe0ab7..abdde336b6 100644 --- 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 index aa2d8112cf..9069cd94ac 100644 --- 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 deleted file mode 100644 index 2b9e849e20..0000000000 --- a/tools/config.headache +++ /dev/null @@ -1,25 +0,0 @@ -########################################################################## -# # -# OCamlFormat # -# # -# Copyright (c) Facebook, Inc. and its affiliates. # -# # -# This source code is licensed under the MIT license found in # -# the LICENSE file in the root directory of this source tree. # -# # -########################################################################## - -# OCaml source - ".*\\.ml[itl]?" -> frame open:"(*" line:"*" close:"*)" -| ".*\\.mly" -> frame open:"/*" line:"*" close:"*/" -# dune build -| "dune" -> frame open:";" line:";" close:";" -| "dune-project" -> frame open:";" line:";" close:";" -| "dune-project" -> skip match:"(lang.*" -# Misc -| ".*Makefile.*" -> frame open:"#" line:"#" close:"#" -| ".*\.opam" -> frame open:"#" line:"#" close:"#" -| ".*headache" -> frame open:"#" line:"#" close:"#" -# Script file -| ".*\\.sh" -> frame open:"#" line:"#" close:"#" -| ".*\\.sh" -> skip match:"#!.*" diff --git a/tools/header.txt b/tools/header.txt deleted file mode 100644 index e8f783b069..0000000000 --- a/tools/header.txt +++ /dev/null @@ -1,8 +0,0 @@ - - OCamlFormat - - Copyright (c) Facebook, Inc. and its affiliates. - - This source code is licensed under the MIT license found in - the LICENSE file in the root directory of this source tree. - diff --git a/tools/update_headers.sh b/tools/update_headers.sh deleted file mode 100755 index 2a54ce7f80..0000000000 --- a/tools/update_headers.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash -########################################################################## -# # -# OCamlFormat # -# # -# Copyright (c) Facebook, Inc. and its affiliates. # -# # -# This source code is licensed under the MIT license found in # -# the LICENSE file in the root directory of this source tree. # -# # -########################################################################## - -find * -type f | grep -v '\(_build\|_opam\|test\|vendor\|.merlin\|ocamlformat.el\)' | grep -v '.*\.\(org\|md\|txt\)$' | xargs headache -c tools/config.headache -h tools/header.txt