Drop support for EOL Python 3.4 and 3.5

.github/workflows/lint.yml

@@ -0,0 +1,39 @@
+name: Lint
+
+on: [push, pull_request]
+
+env:
+  FORCE_COLOR: 1
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cache/pip
+            ~/.cache/pre-commit
+          key:
+            lint-v1-${{ hashFiles('**/setup.py') }}-${{ hashFiles('**/.pre-commit-config.yaml') }}
+          restore-keys: |
+            lint-v1-
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+
+      - name: Install dependencies
+        run: |
+          python -m pip install -U pip
+          python -m pip install -U pre-commit
+
+      - name: Lint
+        run: pre-commit run --all-files
+        env:
+          PRE_COMMIT_COLOR: always

.pre-commit-config.yaml

@@ -1,11 +1,11 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v1.4.0
+  rev: v3.2.0
   hooks:
   - id: trailing-whitespace
-    language_version: python3.6
-- repo: https://github.com/ambv/black
-  rev: 18.6b4
+    language_version: python3
+- repo: https://github.com/psf/black
+  rev: 20.8b1
   hooks:
   - id: black
-    language_version: python3.6
+    language_version: python3

.travis.yml

@@ -1,16 +1,9 @@
 language: python
 
 python:
-  - "3.4"
-  - "3.5"
   - "3.6"
   - "3.7"
-# Enable 3.8  without globally enabling sudo and dist: xenial for other build jobs
-matrix:
-  include:
-    - python: 3.8
-      dist: xenial
-      sudo: true
+  - "3.8"
 
 install:
   - make install

CONTRIBUTING.md

@@ -1,15 +1,15 @@
 # Getting Involved
- 
+
 Thanks for your interest in the project, we'd love to have you involved! Check out the sections below to find out more about what to do next...
- 
+
 ## Opening an Issue
- 
+
 We always welcome issues, if you've seen something that isn't quite right or you have a suggestion for a new feature, please go ahead and open an issue in this project. Include as much information as you have, it really helps.
- 
+
 ## Making a Code Change
- 
+
 We're always open to pull requests, but these should be small and clearly described so that we can understand what you're trying to do. Feel free to open an issue first and get some discussion going.
- 
+
 When you're ready to start coding, fork this repository to your own GitHub account and make your changes in a new branch. Once you're happy, open a pull request and explain what the change is and why you think we should include it in our project.
- 
+
 

README.md

@@ -288,7 +288,7 @@ from nexmo import Verify
 from nexmo.verify import Verify
 
 #Third valid way
-import nexmo #then use nexmo.Verify() to create an instance 
+import nexmo #then use nexmo.Verify() to create an instance
 ```
 
 - **Create the instance**

docs/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Nexmo documentation build configuration file, created by
 # sphinx-quickstart on Sun Sep 18 14:36:55 2016.
@@ -57,18 +56,18 @@
 master_doc = "index"
 
 # General information about the project.
-project = u"Nexmo"
-copyright = u"{0}, Tim Craft".format(datetime.datetime.now().year)
-author = u"Tim Craft"
+project = "Nexmo"
+copyright = f"{datetime.datetime.now().year}, Tim Craft"
+author = "Tim Craft"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = u"2.3.0"
+version = "2.3.0"
 # The full version, including alpha/beta/rc tags.
-release = u"2.3.0"
+release = "2.3.0"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -266,7 +265,7 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, "Nexmo.tex", u"Nexmo Documentation", u"Tim Craft", "manual")
+    (master_doc, "Nexmo.tex", "Nexmo Documentation", "Tim Craft", "manual")
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -306,7 +305,7 @@
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [(master_doc, "nexmo", u"Nexmo Documentation", [author], 1)]
+man_pages = [(master_doc, "nexmo", "Nexmo Documentation", [author], 1)]
 
 # If true, show URL addresses after external links.
 #
@@ -322,7 +321,7 @@
     (
         master_doc,
         "Nexmo",
-        u"Nexmo Documentation",
+        "Nexmo Documentation",
         author,
         "Nexmo",
         "One line description of project.",

setup.py

@@ -1,12 +1,9 @@
-import io
 import os
 
 from setuptools import setup, find_packages
 
 
-with io.open(
-    os.path.join(os.path.dirname(__file__), "README.md"), encoding="utf-8"
-) as f:
+with open(os.path.join(os.path.dirname(__file__), "README.md"), encoding="utf-8") as f:
     long_description = f.read()
 
 setup(
@@ -23,15 +20,14 @@
     package_dir={"": "src"},
     platforms=["any"],
     install_requires=["requests>=2.4.2", "PyJWT[crypto]>=1.6.4", "pytz>=2018.5"],
-    python_requires=">=3, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
+    python_requires=">=3.6",
     tests_require=["cryptography>=2.3.1"],
     classifiers=[
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.4",
-        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3 :: Only",
     ],
 )