From 534702307f3fca052daa0905e702ff4e5143df95 Mon Sep 17 00:00:00 2001
From: Ondrej Nosek <onosek@redhat.com>
Date: Jan 18 2019 15:59:38 +0000
Subject: Sdist fix and Python 2.6 compatibility


Signed-off-by: Ondrej Nosek <onosek@redhat.com>

---

diff --git a/MANIFEST.in b/MANIFEST.in
index 895113f..8054beb 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,7 +2,7 @@ include COPYING README git-changelog CHANGELOG.rst CONTRIBUTING
 include doc/fedpkg_man_page.py
 include doc/release-guide.markdown
 include test/utils.py
-include test *.conf
+include test/*.conf
 include pip-pycurl
 recursive-include conf *
 include tox.ini
diff --git a/fedpkg/cli.py b/fedpkg/cli.py
index c517b5d..5b943ca 100644
--- a/fedpkg/cli.py
+++ b/fedpkg/cli.py
@@ -934,7 +934,7 @@ targets to build the package for a particular stream.
                 if not branch_valid:
                     raise rpkgError(
                         'Only characters, numbers, periods, dashes, '
-                        'underscores, and pluses are allowed in {} branch '
+                        'underscores, and pluses are allowed in {0} branch '
                         'names'.format('flatpak' if ns == 'flatpaks' else 'module'))
             release_branches = list(itertools.chain(
                 *list(get_release_branches(pdc_url).values())))
diff --git a/test/utils.py b/test/utils.py
index d677287..110cf61 100644
--- a/test/utils.py
+++ b/test/utils.py
@@ -250,7 +250,7 @@ class CommandTestCase(RepoCreationMixin, Assertions, Utils, unittest.TestCase):
         """
         heads = [head for head in repo.heads if head.name == branch_name]
         assert len(heads) > 0, \
-            'Repo must have a local branch named {} that ' \
+            'Repo must have a local branch named {0} that ' \
             'is for running tests. But now, it does not exist. Please check ' \
             'if the repo is correct.'.format(branch_name)
 
diff --git a/tests-requirements.txt b/tests-requirements.txt
index 81997f0..1cc4eb4 100644
--- a/tests-requirements.txt
+++ b/tests-requirements.txt
@@ -2,3 +2,4 @@ mock == 1.0.1
 nose == 1.3.7
 nose-cov
 freezegun
+PyYAML
diff --git a/tox.ini b/tox.ini
index 1014d56..18151f9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,6 +8,9 @@ deps =
     -r{toxinidir}/tests-requirements.txt
 passenv=PYTHONPATH
 commands =
+    # Pip call is workaround. Nose is not installed in virtual environment when
+    # nose is already installed in system. -I parameter is vital for install.
+    pip install -I nose==1.3.7 
     nosetests {posargs}
 setenv=
     PYCURL_SSL_LIBRARY=openssl