From 770833249a4cab43b8a9a61dae68a8b038a45058 Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Sep 20 2019 18:16:19 +0000
Subject: Update to 0.0.18


---

diff --git a/.gitignore b/.gitignore
index 5957067..fa0a43d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 colcon-bundle-0.0.13.tar.gz
 /colcon-bundle-0.0.15.tar.gz
+/colcon-bundle-0.0.18.tar.gz
diff --git a/python-colcon-bundle-0.0.15-only-one-mock.patch b/python-colcon-bundle-0.0.15-only-one-mock.patch
deleted file mode 100644
index 6f9c5d4..0000000
--- a/python-colcon-bundle-0.0.15-only-one-mock.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 5f55f5e03a54ce40e03004b28b96912e5b14a455 Mon Sep 17 00:00:00 2001
-From: Scott K Logan <logans@cottsay.net>
-Date: Mon, 15 Jul 2019 15:52:50 -0700
-Subject: [PATCH] Use only a single mock framework
-
----
- requirements_devel.txt               | 1 -
- setup.cfg                            | 1 -
- test/installer/test_apt_installer.py | 2 +-
- 3 files changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/requirements_devel.txt b/requirements_devel.txt
-index 0e77357..2ad734b 100644
---- a/requirements_devel.txt
-+++ b/requirements_devel.txt
-@@ -8,7 +8,6 @@ flake8-deprecated
- flake8-docstrings
- flake8-import-order
- flake8-quotes
--mock
- pep8-naming
- pyenchant
- pylint
-diff --git a/setup.cfg b/setup.cfg
-index 40de916..e9eff2d 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -44,7 +44,6 @@ tests_require =
-   flake8-docstrings
-   flake8-import-order
-   flake8-quotes
--  mock
-   pep8-naming
-   pyenchant
-   pylint
-diff --git a/test/installer/test_apt_installer.py b/test/installer/test_apt_installer.py
-index 3b5a65f..542e1a4 100644
---- a/test/installer/test_apt_installer.py
-+++ b/test/installer/test_apt_installer.py
-@@ -2,7 +2,7 @@
- from unittest import mock
- 
- import unittest
--from mock import patch
-+from unittest.mock import patch
- 
- from colcon_bundle.installer.apt import AptBundleInstallerExtension
- 
diff --git a/python-colcon-bundle.spec b/python-colcon-bundle.spec
index 4b336e8..00d8d4b 100644
--- a/python-colcon-bundle.spec
+++ b/python-colcon-bundle.spec
@@ -1,17 +1,14 @@
 %global srcname colcon-bundle
 
 Name:           python-%{srcname}
-Version:        0.0.15
-Release:        3%{?dist}
+Version:        0.0.18
+Release:        1%{?dist}
 Summary:        Plugin to bundle built software for the colcon command line tool
 
 License:        ASL 2.0
 URL:            https://colcon.readthedocs.io
 Source0:        https://github.com/colcon/%{srcname}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
-# Submitted upstream as colcon/colcon-bundle#90
-Patch0:         %{name}-0.0.15-only-one-mock.patch
-
 BuildArch:      noarch
 
 %description
@@ -70,6 +67,9 @@ installed locally.
 
 
 %changelog
+* Fri Sep 20 2019 Scott K Logan <logans@cottsay.net> - 0.0.18-1
+- Update to 0.0.18 (rhbz#1742142)
+
 * Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.0.15-3
 - Rebuilt for Python 3.8
 
diff --git a/sources b/sources
index 3c24872..f85619a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (colcon-bundle-0.0.15.tar.gz) = fa089b75ef4f071a9cc3617992676ec4060f9afa758a2a5e5794869e4c66ffc11741b19d6518a09f98e462955215c7d351a32e8485ce8deeff270fd8e9224afd
+SHA512 (colcon-bundle-0.0.18.tar.gz) = f0cb01441fb92f0b626726e734040c27869d6f9c75b9a9df0a640ef66b47205c174c96dcc97131cedaeef7ec2ab99847ebff2d5704b866830a323dc365ddf956