From a8464a95cef6c8648c3c05e1e18601e3348f21f5 Mon Sep 17 00:00:00 2001
From: Hugo Martins <caramelo.martins@gmail.com>
Date: Sat, 14 Jul 2018 16:32:29 +0100
Subject: [PATCH 1/4] Add CITATION

Relates to #3402
---
 CITATION | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 CITATION

diff --git a/CITATION b/CITATION
new file mode 100644
index 00000000000..e1807f5d9c0
--- /dev/null
+++ 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},
+}
\ No newline at end of file

From e9fd038aaeb4951460b94aaa96f1ece174875d66 Mon Sep 17 00:00:00 2001
From: Hugo Martins <caramelo.martins@gmail.com>
Date: Sat, 14 Jul 2018 16:35:33 +0100
Subject: [PATCH 2/4] Fix linting issues

---
 CITATION | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CITATION b/CITATION
index e1807f5d9c0..d4e9d8ec7a1 100644
--- a/CITATION
+++ b/CITATION
@@ -1,4 +1,4 @@
-NOTE: Change "x.y" by the version you use. If you are unsure about which version 
+NOTE: Change "x.y" by the version you use. If you are unsure about which version
 you are using run: `pip show pytest`.
 
 Text:
@@ -13,4 +13,4 @@ BibTeX:
   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},
-}
\ No newline at end of file
+}

From 5be03bff61f6e84929db10b76271eca1d4278018 Mon Sep 17 00:00:00 2001
From: Hugo Martins <caramelo.martins@gmail.com>
Date: Sat, 14 Jul 2018 16:37:55 +0100
Subject: [PATCH 3/4] Add changelog information

---
 changelog/3402.trivial.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog/3402.trivial.rst

diff --git a/changelog/3402.trivial.rst b/changelog/3402.trivial.rst
new file mode 100644
index 00000000000..471b98a83f3
--- /dev/null
+++ b/changelog/3402.trivial.rst
@@ -0,0 +1 @@
+Add CITATION to provide information on how to formally cite pytest.
\ No newline at end of file

From 6a4fa4f4859741550ac7469b18f490ab25e30ca3 Mon Sep 17 00:00:00 2001
From: Hugo Martins <caramelo.martins@gmail.com>
Date: Sat, 14 Jul 2018 16:44:47 +0100
Subject: [PATCH 4/4] Fix more linting issues

---
 changelog/3402.trivial.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog/3402.trivial.rst b/changelog/3402.trivial.rst
index 471b98a83f3..c5f340c852a 100644
--- a/changelog/3402.trivial.rst
+++ b/changelog/3402.trivial.rst
@@ -1 +1 @@
-Add CITATION to provide information on how to formally cite pytest.
\ No newline at end of file
+Add CITATION to provide information on how to formally cite pytest.