Merge pull request #3683 from caramelomartins/master

[#3402] CITATION
pytest-dev · Jul 15, 2018 · a1c3df1 · a1c3df1
2 parents a821af6 + 6a4fa4f
commit a1c3df1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/CITATION b/CITATION
@@ -0,0 +1,16 @@
+NOTE: Change "x.y" by the version you use. If you are unsure about which version
+you are using run: `pip show pytest`.
+
+Text:
+
+[pytest] pytest x.y, 2004
+Krekel et al., https://github.com/pytest-dev/pytest
+
+BibTeX:
+
+@misc{pytestx.y,
+  title =        {pytest x.y},
+  author = {Krekel, Holger and Oliveira, Bruno and Pfannschmidt, Ronny and Bruynooghe, Floris and Laugher, Brianna and Bruhin, Florian},
+  year =         {2004},
+  url = {https://github.com/pytest-dev/pytest},
+}
diff --git a/changelog/3402.trivial.rst b/changelog/3402.trivial.rst
@@ -0,0 +1 @@
+Add CITATION to provide information on how to formally cite pytest.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Add CITATION to provide information on how to formally cite pytest.