From 7b1ab1e9b7c8371c36b8476e23a64e59a846d97a Mon Sep 17 00:00:00 2001
From: Rich Mattes <richmattes@gmail.com>
Date: May 27 2018 16:38:43 +0000
Subject: Update to release 0.1.4 (rhbz#1459873)

Remove upstream flake8 compatibility patch (rhbz#1377139)

---

diff --git a/.gitignore b/.gitignore
index c823e73..f6c52f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /osrf_pycommon-0.1.2.tar.gz
+/osrf_pycommon-0.1.4.tar.gz
diff --git a/python-osrf-pycommon-0.1.2-flake8.patch b/python-osrf-pycommon-0.1.2-flake8.patch
deleted file mode 100644
index 4ed7deb..0000000
--- a/python-osrf-pycommon-0.1.2-flake8.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From a317efbb9e28f72881b81a9bf782be30f2cc7fbb Mon Sep 17 00:00:00 2001
-From: William Woodall <william@osrfoundation.org>
-Date: Thu, 28 Jul 2016 15:17:00 -0700
-Subject: [PATCH] call flake8's command line for more portability between
- flake8 versions (#26)
-
----
- tests/test_code_format.py | 25 ++++++++++++-------------
- 1 file changed, 12 insertions(+), 13 deletions(-)
-
-diff --git a/tests/test_code_format.py b/tests/test_code_format.py
-index 06d7c82..31b0a89 100644
---- a/tests/test_code_format.py
-+++ b/tests/test_code_format.py
-@@ -1,19 +1,21 @@
--import flake8.engine
- import os
-+import sys
-+import subprocess
- 
- 
- def test_flake8():
-     """Test source code for pyFlakes and PEP8 conformance"""
--    flake8style = flake8.engine.StyleGuide()
--    report = flake8style.options.report
--    report.start()
-     this_dir = os.path.dirname(os.path.abspath(__file__))
--    try:
--        input_dir = flake8style.input_dir
--    except AttributeError:
--        input_dir = flake8style._styleguide.input_dir
--    input_dir(os.path.join(this_dir, '..', 'osrf_pycommon'))
--    report.stop()
--    assert report.total_errors == 0, \
--        ("Found '{0}' code style errors (and warnings)."
--         .format(report.total_errors))
-+    source_dir = os.path.join(this_dir, '..', 'osrf_pycommon')
-+    if sys.version_info >= (3,0):
-+        cmd = ['python3-flake8', source_dir, '--count']
-+    else:
-+        cmd = ['flake8', source_dir, '--count']
-+    if sys.version_info < (3,4):
-+        # Unless Python3, skip files with new syntax, like `yield from`
-+        cmd.append('--exclude=../*async_execute_process_asyncio/impl.py')
-+    p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-+    stdout, stderr = p.communicate()
-+    print(stdout)
-+    assert p.returncode == 0, \
-+        "Command '{0}' returned non-zero exit code '{1}'".format(' '.join(cmd), p.returncode)
diff --git a/python-osrf-pycommon.spec b/python-osrf-pycommon.spec
index 6ad8115..66d213f 100644
--- a/python-osrf-pycommon.spec
+++ b/python-osrf-pycommon.spec
@@ -3,8 +3,8 @@
 %global sum Commonly needed Python modules used by software developed at OSRF
 
 Name:           python-%{pkgname}
-Version:        0.1.2
-Release:        7%{?dist}
+Version:        0.1.4
+Release:        1%{?dist}
 Summary:        %{sum}
 
 Group:          Development/Libraries
@@ -15,10 +15,6 @@ Source0:        https://github.com/osrf/%{srcname}/archive/%{version}.tar.gz#/%{
 
 BuildArch:      noarch
 
-# https://github.com/osrf/osrf_pycommon/commit/a317efbb9e28f72881b81a9bf782be30f2cc7fbb
-# Modified to fix the exclude path, and run python3-flake8 if python 3 is being used
-Patch0:         %{name}-0.1.2-flake8.patch
-
 %description
 osrf_pycommon is a python package which contains commonly used Python
 boilerplate code and patterns. Things like ANSI terminal coloring, capturing
@@ -122,6 +118,10 @@ PYTHONASYNCIODEBUG=1 nosetests-%{python3_version} -w tests
 %{python3_sitelib}/%{srcname}-%{version}-py?.?.egg-info/
 
 %changelog
+* Sun May 27 2018 Rich Mates <richmattes@gmail.com> - 0.1.4-1
+- Update to release 0.1.4 (rhbz#1459873)
+- Remove upstream flake8 compatibility patch (rhbz#1377139)
+
 * Mon Mar 26 2018 Iryna Shcherbina <ishcherb@redhat.com> - 0.1.2-7
 - Update Python 2 dependency declarations to new packaging standards
   (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
diff --git a/sources b/sources
index 16bb47f..683853d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-562020a22797338d834a549c4c291ece  osrf_pycommon-0.1.2.tar.gz
+SHA512 (osrf_pycommon-0.1.4.tar.gz) = 9093466f72fc6c35b4fde826beede74cc539f1b899055cef61123937f85f463c7e1597bafccf11094c14394fe8c520b71026ede5463ae6520075f2679dda231d