Merge pull request #85 from hlin/master

Drop python2 support

.travis.yml

@@ -5,10 +5,8 @@ services: docker
 matrix:
   include:
     # https://hub.docker.com/_/fedora/
-    - env: CONTAINER_IMAGE=fedora:29 TOXENV=py37
+    # will use centos:8 after it released
     - env: CONTAINER_IMAGE=fedora:28 TOXENV=py36
-    # https://hub.docker.com/_/centos/
-    - env: CONTAINER_IMAGE=centos:7 TOXENV=py27
 
 install:
   - ./.travis/install.sh

product-listings-manager.spec

@@ -1,9 +1,3 @@
-%if 0%{?rhel} && 0%{?rhel} <= 7
-%bcond_with python3
-%else
-%bcond_without python3
-%endif
-
 %global modname product_listings_manager
 
 Name: product-listings-manager
@@ -16,7 +10,6 @@ URL: https://github.com/release-engineering/product-listings-manager
 Source0: %{name}-%{version}.tar.gz
 BuildArch: noarch
 
-%if %{with python3}
 BuildRequires: python3-devel
 BuildRequires: python3-flask
 BuildRequires: python3-flask-sqlalchemy
@@ -25,28 +18,13 @@ BuildRequires: python3-koji
 BuildRequires: python3-psycopg2
 BuildRequires: python3-setuptools
 BuildRequires: python3-sqlalchemy
+Requires: koji
 Requires: python3-flask
 Requires: python3-flask-sqlalchemy
 Requires: python3-flask-restful
 Requires: python3-koji
 Requires: python3-psycopg2
 Requires: python3-sqlalchemy
-%else
-BuildRequires: python2-devel
-BuildRequires: python-flask
-BuildRequires: python-flask-sqlalchemy
-BuildRequires: python-psycopg2
-BuildRequires: python-sqlalchemy
-BuildRequires: python2-flask-restful
-BuildRequires: python2-koji
-BuildRequires: python2-setuptools
-Requires: python-flask
-Requires: python-flask-sqlalchemy
-Requires: python-sqlalchemy
-Requires: python2-flask-restful
-Requires: python2-koji
-Requires: python-psycopg2
-%endif
 
 %description
 HTTP interface for finding product listings and interacting with data in
@@ -55,21 +33,11 @@ composedb.
 %prep
 %autosetup
 
-
 %build
-%if %{with python3}
 %py3_build
-%else
-%py2_build
-%endif
-
 
 %install
-%if %{with python3}
 %py3_install
-%else
-%py2_install
-%endif
 mkdir -p %{buildroot}%{_sysconfdir}/%{name}
 cp -p %{modname}/config.py %{buildroot}%{_sysconfdir}/%{name}
 
@@ -79,13 +47,8 @@ cp -p %{modname}/config.py %{buildroot}%{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/config.py
 %exclude %{_sysconfdir}/%{name}/config.pyc
 %exclude %{_sysconfdir}/%{name}/config.pyo
-%if %{with python3}
 %{python3_sitelib}/%{modname}/
 %{python3_sitelib}/%{modname}-*.egg-info/
-%else
-%{python2_sitelib}/%{modname}/
-%{python2_sitelib}/%{modname}-*.egg-info/
-%endif
 
 %changelog
 * Mon Jul 01 2019 Haibo Lin <hlin@redhat.com> 1.1.0-1

product_listings_manager/products.py

@@ -288,11 +288,11 @@ def getProductListings(productLabel, buildInfo):
                 listings.setdefault(variant, {}).setdefault(rpm['nvr'], {}).setdefault(rpm['arch'], []).append(dest_arch)
 
         for variant in listings.keys():
-            nvrs = listings[variant].keys()
+            nvrs = list(listings[variant].keys())
             # BREW-260: Read allow_src_only flag for the product/version
             allow_src_only = Products.get_srconly_flag(productLabel, version)
             if len(nvrs) == 1:
-                maps = listings[variant][nvrs[0]].keys()
+                maps = list(listings[variant][nvrs[0]].keys())
                 # BREW-260: check for allow_src_only flag added
                 if len(maps) == 1 and maps[0] == 'src' and not allow_src_only:
                     del listings[variant]

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py36,py37
+envlist = py36
 
 [testenv]
 setenv =