From 417f44124e34815e98aa7e736978f5763cdb19a7 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Fri, 17 May 2019 18:50:09 -0400
Subject: [PATCH 1/2] Register pytest markers

The latest version of pytest has started warning on unregistered
markers, which the test suite uses fairly extensively, causing the tests
to fail. This explicitly registers all the markers used in the test
suite.
---
 setup.cfg | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/setup.cfg b/setup.cfg
index af45978c0..94c1fc00f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -56,3 +56,18 @@ filterwarnings =
     error
     error::DeprecationWarning
     error:PendingDeprecationWarning
+markers =
+    gettz
+    import_star
+    isoparser
+    parserinfo
+    rrule
+    rruleset
+    rrulestr
+    smoke
+    tz_resolve_imaginary
+    tzfile
+    tzlocal
+    tzoffset
+    tzstr
+

From 52a48d5399b2f22a6cbec77ef65297a411dfd723 Mon Sep 17 00:00:00 2001
From: Paul Ganssle <paul@ganssle.io>
Date: Fri, 17 May 2019 18:54:08 -0400
Subject: [PATCH 2/2] Add changelog for PR #915

---
 changelog.d/915.misc.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/915.misc.rst

diff --git a/changelog.d/915.misc.rst b/changelog.d/915.misc.rst
new file mode 100644
index 000000000..0a1fa5773
--- /dev/null
+++ b/changelog.d/915.misc.rst
@@ -0,0 +1 @@
+Explicitly listed all markers used in the pytest configuration.