From b83c4add974206d78ffc1760c79c1a671e8927a9 Mon Sep 17 00:00:00 2001
From: Chenxiong Qi <cqi@redhat.com>
Date: Mar 20 2019 03:23:40 +0000
Subject: [PATCH 1/2] Add missing file CHANGELOG.rst to sdist package


Signed-off-by: Chenxiong Qi <cqi@redhat.com>

---

diff --git a/MANIFEST.in b/MANIFEST.in
index 4b76eab..77c2ce6 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,5 @@
 include LICENSE
-include README.rst
+include README.rst CHANGELOG.rst
 include requirements.txt
 include test-requirements.txt
 recursive-include conf *.conf

From 7a501862a096baa249219670b9c4ab7a2712e088 Mon Sep 17 00:00:00 2001
From: Chenxiong Qi <cqi@redhat.com>
Date: Mar 20 2019 05:28:21 +0000
Subject: [PATCH 2/2] Make setup_method/teardown_method compatible with newer version of pytest


Signed-off-by: Chenxiong Qi <cqi@redhat.com>

---

diff --git a/tests/test_add_module.py b/tests/test_add_module.py
index 6d70ee7..277c03c 100644
--- a/tests/test_add_module.py
+++ b/tests/test_add_module.py
@@ -53,7 +53,7 @@ def get_tag_side_effect(info):
 
 class TestAddModule:
 
-    def setup_method(self):
+    def setup_method(self, method):
         fd, self.tag_config_file = tempfile.mkstemp()
         os.close(fd)
 
@@ -64,7 +64,7 @@ class TestAddModule:
         self.get_patcher = patch('requests.get')
         self.mock_get = self.get_patcher.start()
 
-    def teardown_method(self):
+    def teardown_method(self, method):
         self.get_patcher.stop()
         self.ClientSession_patcher.stop()
 
diff --git a/tests/test_check_config.py b/tests/test_check_config.py
index 740a622..aa4963a 100644
--- a/tests/test_check_config.py
+++ b/tests/test_check_config.py
@@ -33,7 +33,7 @@ from ursa_major.cli import main
 
 class TestCheckConfig:
 
-    def setup_method(self):
+    def setup_method(self, method):
         fd, self.tag_config_file = tempfile.mkstemp()
         os.close(fd)
 
@@ -44,7 +44,7 @@ class TestCheckConfig:
         self.get_patcher = patch('requests.get')
         self.mock_get = self.get_patcher.start()
 
-    def teardown_method(self):
+    def teardown_method(self, method):
         self.get_patcher.stop()
         os.unlink(self.tag_config_file)
 
diff --git a/tests/test_remove_module.py b/tests/test_remove_module.py
index e7f17bd..4a252df 100644
--- a/tests/test_remove_module.py
+++ b/tests/test_remove_module.py
@@ -33,11 +33,11 @@ from tests import TEST_DATA_DIR, make_mbs_response, make_mmd
 class TestRemoveModule:
     """Test CLI command remove-module"""
 
-    def setup_method(self):
+    def setup_method(self, method):
         fd, self.tag_config_file = tempfile.mkstemp()
         os.close(fd)
 
-    def teardown_method(self):
+    def teardown_method(self, method):
         os.unlink(self.tag_config_file)
 
     def write_tag_config_file(self, content):