From 0acba99dedb1ce02e91450712eaab4989f4f331b Mon Sep 17 00:00:00 2001
From: Mike Bonnet <mikeb@redhat.com>
Date: Fri, 17 Jan 2020 08:58:29 -0800
Subject: [PATCH] remove python2 support, since fedmsg no longer supports it as
 of Fedora 31

---
 .travis.yml                 |  3 +--
 python-fedmsg-meta-umb.spec | 31 ++++++++-----------------------
 setup.py                    |  2 +-
 tox.ini                     |  8 +-------
 4 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d5d6a9e..4bde400 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,7 @@
-dist: xenial
 language: python
 python:
- - "2.7"
  - "3.7"
+ - "3.8"
 matrix:
   include:
     - python: "3.7"
diff --git a/python-fedmsg-meta-umb.spec b/python-fedmsg-meta-umb.spec
index d9f20b5..bd056ec 100644
--- a/python-fedmsg-meta-umb.spec
+++ b/python-fedmsg-meta-umb.spec
@@ -2,8 +2,8 @@
 %global rpmname fedmsg-meta-umb
 
 Name:           python-%{rpmname}
-Version:        0.0.2
-Release:        3%{?dist}
+Version:        0.0.3
+Release:        1%{?dist}
 Summary:        fedmsg metadata provider plugins for the Unified Message Bus
 
 License:        LGPLv2+
@@ -11,9 +11,9 @@ URL:            https://github.com/release-engineering/%{srcname}
 Source0:        %{srcname}-%{version}.tar.xz
 
 BuildArch:      noarch
-BuildRequires:  python2-devel python3-devel
-BuildRequires:  python2-nose python3-nose
-BuildRequires:  python2-fedmsg python3-fedmsg
+BuildRequires:  python3-devel
+BuildRequires:  python3-nose
+BuildRequires:  python3-fedmsg
 BuildRequires:  python3-mako
 BuildRequires:  python3-cloud-sptheme
 BuildRequires:  python3-sphinx
@@ -23,16 +23,6 @@ This package contains plugins to the fedmsg metadata provider for internal
 Red Hat services attached to the Unified Message Bus.
 
 
-%package -n python2-%{rpmname}
-Summary:        %{summary}
-Requires:       python2-fedmsg
-%{?python_provide:%python_provide python2-%{rpmname}}
-
-%description -n python2-%{rpmname}
-This package contains plugins to the fedmsg metadata provider for internal
-Red Hat services attached to the Unified Message Bus.
-
-
 %package -n python3-%{rpmname}
 Summary:        %{summary}
 Requires:       python3-fedmsg
@@ -54,25 +44,17 @@ of the message topics and formats that are specific to the Unified Message Bus.
 %autosetup -n %{srcname}-%{version}
 
 %build
-%py2_build
 %py3_build
 PYTHONPATH=. sphinx-build-3 doc/ htmldocs/
 
 %install
-%py2_install
 %py3_install
 %{__mkdir_p} %{buildroot}%{_datadir}/%{name}
 %{__cp} -pr datagrepper-docs htmldocs %{buildroot}%{_datadir}/%{name}
 
 %check
-%{__python2} setup.py test
 %{__python3} setup.py test
 
-%files -n python2-%{rpmname}
-%license LICENSE
-%doc README.rst
-%{python2_sitelib}/*
-
 %files -n python3-%{rpmname}
 %license LICENSE
 %doc README.rst
@@ -82,6 +64,9 @@ PYTHONPATH=. sphinx-build-3 doc/ htmldocs/
 %{_datadir}/%{name}
 
 %changelog
+* Fri Jan 17 2020 Mike Bonnet <mikeb@redhat.com> - 0.0.3-1
+- remove python2 support, since fedmsg no longer supports it as of Fedora 31
+
 * Tue Jul  3 2018 Mike Bonnet <mikeb@redhat.com> - 0.0.2-3
 - install doesn't handle directories, use cp instead
 
diff --git a/setup.py b/setup.py
index c1e4664..d40430d 100755
--- a/setup.py
+++ b/setup.py
@@ -65,7 +65,7 @@
 
 setup(
     name='fedmsg_meta_umb',
-    version='0.0.2',
+    version='0.0.3',
     description="fedmsg metadata providers for services on Red Hat's Unified Message Bus",
     long_description=long_description,
     author='Mike Bonnet',
diff --git a/tox.ini b/tox.ini
index 98bfe3d..a3016dd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,21 +1,16 @@
 [tox]
-envlist = flake8,py{27,37},docs
+envlist = flake8,py{37,38},docs
 downloadcache = {toxworkdir}/_download/
 
 [testenv]
-basepython =
-    py27: python2.7
-    py37: python3.7
 deps =
     fedmsg
     nose
     coverage
-sitepackages = False
 commands =
     nosetests {posargs}
 
 [testenv:flake8]
-basepython = python3.7
 deps=
     flake8
 commands=
@@ -23,7 +18,6 @@ commands=
     flake8
 
 [testenv:docs]
-basepython = python3.7
 deps =
     cloud_sptheme
     nose