Merge branch 'fix-335' into 'main'

DECISIONS: Record DCO decision

Closes #335

See merge request subplot/subplot!357

3 files changed, 76 insertions, 1 deletions

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 95d7ac1..9ebaf1a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -38,7 +38,7 @@ build dependencies, you can skip running the tests yourself.
 
 **Rust version:** We aim for Subplot to be buildable on the stable
 version of Debian and the Rust version packaged therein. At this time,
-that's Rust version 1.34.
+that's Rust version 1.63.
 
 **Python version:** We require Python code to work on Python 3.7 and
 later, the version in the current stable version of Debian.
@@ -78,6 +78,16 @@ get there in the best possible way. You should tell the story of
 flying by plane to get somewhere, not how you explored the world and
 eventually invented flying machines to travel faster.
 
+**Sign off your commits:** The commits in a merge request must each
+individually carry a `Signed-off-by` footer.  This footer should
+identify the entity which has checked the commit and confirmed that
+it is acceptable for it to be contributed to the Subplot project.
+
+The Subplot project requires that each contribution to it meets
+the assertions listed in the Developer Certificate of Origin version
+1.1 (the text of which can be found in `DCO-1-1.txt` alongside this
+document).
+
 # Definition of done
 
 When a change is made to Subplot, it must meet the following minimum
diff --git a/DCO-1-1.txt b/DCO-1-1.txt
new file mode 100644
index 0000000..49b8cb0
--- /dev/null
+++ b/DCO-1-1.txt
@@ -0,0 +1,34 @@
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.
diff --git a/DECISIONS.md b/DECISIONS.md
index 4780b5e..b192fdc 100644
--- a/DECISIONS.md
+++ b/DECISIONS.md
@@ -13,6 +13,37 @@ Each decision should have its own heading. Newest decision should come
 first. Updated or overturned decisions should have their section
 updated to note their status, without moving them.
 
+## Adopting a Developer Certificate of Origin
+
+Date: 2023-10-07
+
+What: The subplot project is adopting the use of DCO.
+
+Why: To reduce the chance that, in the future when others might wish
+to contribute to Subplot, anyone might claim that we have changes
+which are not permitted, but without incurring the potential additional
+complications associated with CLAs or the like.
+
+Who: Daniel, Lars
+
+Detail: A Developer Certificate of Origin is a statement saying that
+the contributor has the right to make a contribution and to assign
+permission to the project to thence redistribute it under the project
+licence. You can read more at: <https://developercertificate.org/>
+and at <https://en.wikipedia.org/wiki/Developer_Certificate_of_Origin>
+
+This decision was taken during a Subplot project meeting and the
+current scope of the decision is to document our use of DCO 1.1 in
+the contribution guidelines, and to add to our merge request review
+process a human-driven validation of the following of the DCO.
+
+We leave open the possibility of enforcing DCO in some programmatic
+way in the future.
+
+We assert that the presence of a `Signed-off-by` footer in each git
+commit in a merge request is the mechanism by which a developer signals
+that the commit meets the assertions in the DCO 1.1.
+
 ## Breaking changes in Subplot
 
 Date: 2023-08-27