Merge pull request #21 from lrossi-dev/drop-p2

Drop Python2 support

Author: rohanpm

.github/workflows/tox-test.yml

@@ -3,20 +3,6 @@ name: Tox tests
 on: [push, pull_request]
 
 jobs:
-  py27:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install RPM
-        run: sudo apt-get install -y rpm libkrb5-dev
-      - name: Setup Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 2.7
-      - name: Install Tox
-        run: pip install tox
-      - name: Run Tox
-        run: tox -e py27
   static:
     runs-on: ubuntu-latest
     steps:

constraints-legacy.txt

@@ -132,8 +132,6 @@
 autodoc_inherit_docstrings = False
 intersphinx_mapping = {
     "python": ("https://docs.python.org/3", None),
-    # "requests": ("https://2.python-requests.org/en/master/", None),
     "more-executors": ("https://rohanpm.github.io/more-executors/", None),
-    # "attrs": ("https://www.attrs.org/en/stable/", None),
     "pushsource": ("https://release-engineering.github.io/pushsource/", None),
 }

docs/conf.py

@@ -34,14 +34,11 @@ def get_requirements():
         "Development Status :: 4 - Beta",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.6",
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ],
     install_requires=get_requirements(),
-    python_requires=">=2.6",
+    python_requires=">=3.6",
     project_urls={
         "Documentation": "https://release-engineering.github.io/pushcollector/",
         "Changelog": "https://github.com/release-engineering/pushcollector/blob/master/CHANGELOG.md",

setup.py

@@ -1,6 +1,5 @@
 import os
 
-import six
 from more_executors.futures import f_return, f_map
 import yaml
 import jsonschema
@@ -16,7 +15,7 @@ def empty_future(value):
 
 
 def maybe_encode(value):
-    if isinstance(value, six.text_type):
+    if isinstance(value, str):
         # It's a string => make it bytes
         return value.encode("utf-8")
     # It's not a string => hopefully it's already bytes

src/pushcollector/_impl/proxy.py

@@ -1,25 +1,18 @@
 [tox]
-envlist = py27,py36,static,pidiff,docs,bandit
+envlist = py36,py38,static,pidiff,docs,bandit
 
 [testenv]
 deps=-rtest-requirements.txt
 commands=pytest -v {posargs}
 whitelist_externals=sh
 
-[testenv:py27]
-deps=
-	# Note: we need to explicitly list requirements.txt here
-	# so it's processed at the same time as the constraints file
-	-rrequirements.txt
-	-cconstraints-legacy.txt
-	-rtest-requirements.txt
-
 [testenv:static]
 deps=
 	-rtest-requirements.txt
 	black
 	pylint==2.5.3
 	astroid==2.4.2
+allowlist_externals=sh
 commands=
 	black --check .
 	sh -c 'pylint pushcollector; test $(( $? & (1|2|4|32) )) = 0'
@@ -51,4 +44,4 @@ testpaths = tests
 
 [testenv:bandit]
 deps = bandit
-commands = bandit -r . -ll --exclude './.tox,./misc/ci'
+commands = bandit -r . -ll --exclude './.tox,./misc/ci'