Clean up previous python version hacks

Author: lahirumaramba

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: [3.6, 3.7, 3.9, pypy3]
+        python: [3.6, 3.7, 3.8, 3.9, pypy3]
 
     steps:
     - uses: actions/checkout@v1

CONTRIBUTING.md

@@ -85,7 +85,7 @@ information on using pull requests.
 
 ### Initial Setup
 
-You need Python 3.4+ to build and test the code in this repo.
+You need Python 3.6+ to build and test the code in this repo.
 
 We recommend using [pip](https://pypi.python.org/pypi/pip) for installing the necessary tools and
 project dependencies. Most recent versions of Python ship with pip. If your development environment

integration/test_project_management.py

@@ -189,12 +189,8 @@ def test_list_ios_apps(ios_app):
 def test_get_ios_app_config(ios_app, project_id):
     config = ios_app.get_config()
 
-    # In Python 2.7, the plistlib module works with strings, while in Python 3, it is significantly
-    # redesigned and works with bytes objects instead.
-    try:
-        plist = plistlib.loads(config.encode('utf-8'))
-    except AttributeError:  # Python 2.7 plistlib does not have the loads attribute.
-        plist = plistlib.readPlistFromString(config)  # pylint: disable=no-member
+    plist = plistlib.loads(config.encode('utf-8'))
+
     assert plist['BUNDLE_ID'] == TEST_APP_BUNDLE_ID
     assert plist['PROJECT_ID'] == project_id
     assert plist['GOOGLE_APP_ID'] == ios_app.app_id

setup.py

@@ -63,6 +63,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'License :: OSI Approved :: Apache Software License',
     ],

tests/testutils.py

@@ -16,7 +16,7 @@
 import io
 import os
 
-import pytest
+from _pytest.monkeypatch import MonkeyPatch
 
 from google.auth import credentials
 from google.auth import transport
@@ -61,12 +61,7 @@ def run_without_project_id(func):
 
 
 def new_monkeypatch():
-    try:
-        return pytest.MonkeyPatch()
-    except AttributeError:
-        # Fallback for Python 3.5
-        from _pytest.monkeypatch import MonkeyPatch
-        return MonkeyPatch()
+    return MonkeyPatch()
 
 
 class MockResponse(transport.Response):