From f13351387c65fe3adf1254ab08d187f500b72571 Mon Sep 17 00:00:00 2001
From: Michal Cyprian <mcyprian@redhat.com>
Date: Aug 10 2016 12:24:18 +0000
Subject: Update to 3.1.3


---

diff --git a/.gitignore b/.gitignore
index fb1b545..479004f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /pyp2rpm-3.1.1.tar.gz
 /pyp2rpm-3.1.1-tests.tgz
 /pyp2rpm-3.1.2.tar.gz
+/pyp2rpm-3.1.3.tar.gz
diff --git a/no-venv-testfix.patch b/no-venv-testfix.patch
new file mode 100644
index 0000000..247a20d
--- /dev/null
+++ b/no-venv-testfix.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/test_metadata_extractors.py b/tests/test_metadata_extractors.py
+index 34c5226..8fc75f4 100644
+--- a/tests/test_metadata_extractors.py
++++ b/tests/test_metadata_extractors.py
+@@ -338,7 +338,7 @@ class TestDistMetadataExtractor(object):
+         (2, 'py_modules', ['pytest']),
+         (2, 'packages', set(['_pytest'])),
+         (3, 'py_modules', ['simpleeval']),
+-        (3, 'packages', set())
++        (3, 'packages', 'TODO:')
+     ])
+     def test_extract(self, i, what, expected):
+         data = self.e[i].extract_data()
diff --git a/pyp2rpm.spec b/pyp2rpm.spec
index 1734940..b6e3a74 100644
--- a/pyp2rpm.spec
+++ b/pyp2rpm.spec
@@ -2,8 +2,8 @@
 %global pypi_name pyp2rpm
 
 Name:           %{pypi_name}
-Version:        3.1.2
-Release:        2%{?dist}
+Version:        3.1.3
+Release:        1%{?dist}
 Summary:        Convert Python packages to RPM SPECFILES
 
 License:        MIT
@@ -14,8 +14,8 @@ Source0:        http://files.pythonhosted.org/packages/source/p/%{pypi_name}/%{p
 Patch0: remove_pytest-runner.patch
 # Fixes encoding in koji builds
 Patch1: archive_encoding.patch
-# Removes tests requiring internet connection
-Patch2: rm_url_test.patch
+# Fixes metadata extraction tests when virtualenv is disabled
+Patch2: no-venv-testfix.patch
 
 BuildArch:      noarch
  
@@ -54,7 +54,7 @@ rm -rf %{pypi_name}.egg-info
 %py3_install
 
 %check
-PYTHONPATH="." py.test-3
+PYTHONPATH="." py.test-3 -m "not webtest"
 
 %files
 %license LICENSE
@@ -65,6 +65,9 @@ PYTHONPATH="." py.test-3
 
 
 %changelog
+* Wed Aug 10 2016 Michal Cyprian <mcyprian@redhat.com> - 3.1.3-1
+- Update to 3.1.3
+
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.2-2
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
 
diff --git a/rm_url_test.patch b/rm_url_test.patch
deleted file mode 100644
index e883668..0000000
--- a/rm_url_test.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/tests/test_package_getters.py b/tests/test_package_getters.py
-index 0ef5a87..e92f166 100644
---- a/tests/test_package_getters.py
-+++ b/tests/test_package_getters.py
-@@ -18,29 +18,6 @@ from pyp2rpm import settings
- tests_dir = os.path.split(os.path.abspath(__file__))[0]
- 
- 
--class TestPackageGetters(object):
--    client = xmlrpclib.ServerProxy(settings.PYPI_URL)
--
--    @pytest.mark.parametrize(('name', 'version', 'wheel', 'hf', 'expected_url', 'expected_md5'), [
--        ('setuptools', '18.3.1', False, False,
--         'https://files.pythonhosted.org/packages/source/s/setuptools/setuptools-18.3.1.tar.gz',
--         '748187b93152fa60287dfb896837fd7c'),
--        ('setuptools', '18.3.1', True, False,
--         'https://files.pythonhosted.org/packages/source/s/setuptools/setuptools-18.3.1-py2.py3-none-any.whl',
--         'a21a4d02d0bab2eac499cca72faeb076'),
--        ('setuptools', '18.3.1', False, True,
--         'https://pypi.python.org/packages/86/8a/c4666b05c74e840eb9b09d28f4e7ae76fc9075e8c653d0eb4d265a5b49d9/setuptools-18.3.1.tar.gz',
--         '748187b93152fa60287dfb896837fd7c'),
--        ('pypandoc', '1.1.3', False, False,
--         'https://files.pythonhosted.org/packages/source/p/pypandoc/pypandoc-1.1.3.zip',
--         '771f376bf9c936a90159cd94235998c2'),
--        ('nonexistent_pkg', '0.0.0', False, False, 'FAILED TO EXTRACT FROM PYPI',
--         'FAILED TO EXTRACT FROM PYPI'),
--    ])
--    def test_get_url(self, name, version, wheel, hf, expected_url, expected_md5):
--        assert (expected_url, expected_md5) == get_url(self.client, name, version, wheel, hf)
--
--
- class TestPypiFileGetter(object):
-     client = flexmock(
-         package_releases=lambda n: n == 'spam' and ['2', '1'] or [],
diff --git a/sources b/sources
index 1ea29d1..66c8fbc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-23047cd4bba501a2e63731e5cac69199  pyp2rpm-3.1.2.tar.gz
+dfe92228578b699dbad4868fe12e49ae  pyp2rpm-3.1.3.tar.gz