Merge pull request #206 from maxkahan/2.x

Drop support for old Python versions, support newer versions, update dependencies, refactoring

Author: maxkahan

.bumpversion.cfg

@@ -1,9 +1,10 @@
 [bumpversion]
-current_version = 2.5.5
+current_version = 2.6.0
 commit = True
 tag = False
 
 [bumpversion:file:vonage/__init__.py]
 
 [bumpversion:file:setup.py]
 
+[bumpversion:file:docs/conf.py]

.github/workflows/build.yml

@@ -7,21 +7,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ["3.5", "3.6", "3.7", "3.8"]
-        os: ["ubuntu-latest", "macos-latest", "windows-latest"]
-        exclude:
-          - os: "windows-latest"
-            python: "3.4"
-          - os: "windows-latest"
-            python: "3.8"
-          - os: "macos-latest"
-            python: "3.4"
+        python: ["3.7", "3.8", "3.9", "3.10"]
+        os: ["ubuntu-latest", "macos-latest"]
+
     steps:
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python }}
       - name: Clone repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Install dependencies
         run: make install
       - name: Run tests

.gitignore

@@ -107,4 +107,5 @@ ENV*
 .DS_Store
 .vscode
 .idea
-.pypirc
+.pypirc
+.pytest_cache

CHANGES.md

@@ -1,3 +1,9 @@
+# 2.6.0
+
+- Dropped support for Python 3.6 and below
+- Now supporting currently supported stable versions of Python, i.e. Python 3.7-3.10
+- Internal refactoring and enhancements
+
 # 2.5.x
 
 - Support for Independent SMS, Voice and Verify APIs with tests as well as current client methods

CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at support@nexmo.com. All
+reported by contacting the project team at support@vonage.com. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

Makefile

@@ -1,4 +1,4 @@
-.PHONY: clean test dist coverage install requirements release release-test
+.PHONY: clean test dist coverage install requirements release
 
 clean:
 	rm -rf dist build

docs/conf.py

@@ -57,18 +57,18 @@
 master_doc = "index"
 
 # General information about the project.
-project = u"Vonage"
-copyright = u"{0}, Vonage".format(datetime.datetime.now().year)
-author = u"Vonage"
+project = "Vonage"
+copyright = f"{datetime.datetime.now().year}, Vonage"
+author = "Vonage"
 
 # 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.5.5"
+version = "2.6.0"
 # The full version, including alpha/beta/rc tags.
-release = u"2.5.5"
+release = "2.6.0"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -143,7 +143,7 @@
 # The name for this set of Sphinx documents.
 # "<project> v<release> documentation" by default.
 #
-# html_title = u'Vonage v2.5.5'
+# html_title = u'Vonage v2.6.0'
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #
@@ -266,7 +266,7 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, "Vonage.tex", u"Vonage Documentation", u"Tim Craft", "manual")
+    (master_doc, "Vonage.tex", "Vonage Documentation", "developer@vonage.com", "manual")
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -306,7 +306,7 @@
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [(master_doc, "vonage", u"Vonage Documentation", [author], 1)]
+man_pages = [(master_doc, "vonage", "Vonage Documentation", [author], 1)]
 
 # If true, show URL addresses after external links.
 #
@@ -322,7 +322,7 @@
     (
         master_doc,
         "Vonage",
-        u"Vonage Documentation",
+        "Vonage Documentation",
         author,
         "Vonage",
         "One line description of project.",

docs/quickstart.rst

@@ -146,7 +146,7 @@ Start a verification
     response = client.start_verification(number='441632960960', brand='MyApp')
 
     if response['status'] == '0':
-      print 'Started verification request_id={request_id}'.format(request_id=response['request_id'])
+      print f'Started verification request_id={response['request_id']}'
     else:
       print('Error:', response['error_text'])
 
@@ -164,7 +164,7 @@ Check a verification
     response = client.check_verification('00e6c3377e5348cdaf567e1417c707a5', code='1234')
 
     if response['status'] == '0':
-      print 'Verification complete, event_id={event_id}'.format(event_id=response['event_id'])
+      print 'Verification complete, event_id={response['event_id']}'
     else:
       print('Error:', response['error_text'])
 

requirements.txt

@@ -1,6 +1,6 @@
 -e .
-pytest==3.1.2
-pytest-cov==2.5.1
-responses==0.5.1
+pytest==7.1.1
+pytest-cov==3.0.0
+responses==0.20.0
 coveralls
-glom==18.3.1
+glom==22.1.0

setup.cfg

@@ -13,7 +13,6 @@ source= vonage
 
 [coverage:paths]
 source =
-    src
     .tox/*/site-packages
 
 [bdist_wheel]