Merge pull request #83 from mikemanger/update-tests

Fix tox and add GH workflow

Author: russella-acm

.github/dependabot.yml

@@ -0,0 +1,14 @@
+# Configure Dependabot scanning.
+version: 2
+
+updates:
+***REMOVED***# Check for updates to GitHub Actions.
+***REMOVED***- package-ecosystem: "github-actions"
+***REMOVED******REMOVED***directory: "/"
+***REMOVED******REMOVED***schedule:
+***REMOVED******REMOVED******REMOVED***interval: "weekly"
+***REMOVED******REMOVED***open-pull-requests-limit: 10
+***REMOVED******REMOVED***groups:
+***REMOVED******REMOVED******REMOVED***github-actions:
+***REMOVED******REMOVED******REMOVED******REMOVED***patterns:
+***REMOVED******REMOVED******REMOVED******REMOVED******REMOVED***- "*"

.github/workflows/tests.yml

@@ -0,0 +1,25 @@
+name: Python package
+
+on:
+***REMOVED***- push
+***REMOVED***- pull_request
+
+jobs:
+***REMOVED***test:
+***REMOVED******REMOVED***runs-on: ubuntu-latest
+***REMOVED******REMOVED***strategy:
+***REMOVED******REMOVED******REMOVED***matrix:
+***REMOVED******REMOVED******REMOVED******REMOVED***python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
+
+***REMOVED******REMOVED***steps:
+***REMOVED******REMOVED***- uses: actions/checkout@v4
+***REMOVED******REMOVED***- name: Set up Python ${{ matrix.python-version }}
+***REMOVED******REMOVED******REMOVED***uses: actions/setup-python@v5
+***REMOVED******REMOVED******REMOVED***with:
+***REMOVED******REMOVED******REMOVED******REMOVED***python-version: ${{ matrix.python-version }}
+***REMOVED******REMOVED***- name: Install dependencies
+***REMOVED******REMOVED******REMOVED***run: |
+***REMOVED******REMOVED******REMOVED******REMOVED***python -m pip install --upgrade pip
+***REMOVED******REMOVED******REMOVED******REMOVED***pip install tox tox-gh
+***REMOVED******REMOVED***- name: Test with tox
+***REMOVED******REMOVED******REMOVED***run: tox -e ${{ matrix.python-version }}

HISTORY.md

@@ -47,7 +47,7 @@
 
 ## v5.0.0 - 10 Apr, 2018
 
-* Drop offical support for Python 2.6
+* Drop official support for Python 2.6
 * Add a client-side timeout setting to `CreateSend`
 * No breaking changes for Python2.7 or Python3.x
 

README.md

@@ -206,7 +206,7 @@ def test_add_with_custom_fields(self):
 ***REMOVED***self.subscriber.stub_request("subscribers/%s.json" % self.list_id, "add_subscriber.json")
 ***REMOVED***custom_fields = [ { "Key": 'website', "Value": 'http://example.com/' } ]
 ***REMOVED***email_address = self.subscriber.add(self.list_id, "[email protected]", "Subscriber", custom_fields, True)
-***REMOVED***self.assertEquals(email_address, "[email protected]")
+***REMOVED***self.assertEqual(email_address, "[email protected]")
 ```
 
 ## Contributing

nosetests.py

@@ -34,8 +34,6 @@
 ***REMOVED******REMOVED******REMOVED******REMOVED***"Programming Language :: Python :: 3",
 
 ***REMOVED******REMOVED******REMOVED******REMOVED***# Specifically, we support the following releases.
-***REMOVED******REMOVED******REMOVED******REMOVED***"Programming Language :: Python :: 3.6",
-***REMOVED******REMOVED******REMOVED******REMOVED***"Programming Language :: Python :: 3.7",
 ***REMOVED******REMOVED******REMOVED******REMOVED***"Programming Language :: Python :: 3.8",
 ***REMOVED******REMOVED******REMOVED******REMOVED***"Programming Language :: Python :: 3.9",
 ***REMOVED******REMOVED******REMOVED******REMOVED***"Programming Language :: Python :: 3.10",

setup.py

@@ -42,15 +42,15 @@ class AdministratorTestCase:
 ***REMOVED******REMOVED******REMOVED******REMOVED***email_address = self.administrator.delete()
 
 
-class OAuthAdministatorTestCase(unittest.TestCase, AdministratorTestCase):
+class OAuthAdministratorTestCase(unittest.TestCase, AdministratorTestCase):
 ***REMOVED******REMOVED***"""Test when using OAuth to authenticate"""
 
 ***REMOVED******REMOVED***def setUp(self):
 ***REMOVED******REMOVED******REMOVED******REMOVED***self.administrator = Administrator(
 ***REMOVED******REMOVED******REMOVED******REMOVED******REMOVED******REMOVED***{"access_token": "ASP95S4aR+9KsgfHB0dapTYxNA==", "refresh_token": "5S4aASP9R+9KsgfHB0dapTYxNA=="}, "[email protected]")
 
 
-class ApiKeyAdministatorTestCase(unittest.TestCase, AdministratorTestCase):
+class ApiKeyAdministratorTestCase(unittest.TestCase, AdministratorTestCase):
 ***REMOVED******REMOVED***"""Test when using an API key to authenticate"""
 
 ***REMOVED******REMOVED***def setUp(self):

test/test_administrator.py

@@ -1,16 +1,25 @@
-# Tox (http://tox.testrun.org/) is a tool for running tests
+# Tox (https://tox.wiki/) is a tool for running tests
 # in multiple virtualenvs. This configuration file will run the
 # test suite on all supported python versions. To use it, "pip install tox"
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py36, py37, py38, py39, py310, py311, py312, py313
+env_list = py38, py39, py310, py311, py312, py313
 
 [testenv]
-install_command=pip install {packages}
 commands =
-***REMOVED******REMOVED***coverage run --source=lib setup.py test
-***REMOVED******REMOVED***coverage report
+***REMOVED******REMOVED***pytest --cov=lib
 deps =
-***REMOVED******REMOVED***coverage
-***REMOVED******REMOVED***-e.
+***REMOVED******REMOVED***pytest-cov
+# This needs to be set to include the test fixtures
+use_develop = true
+
+[gh]
+# Maps python versions for GitHub workflow
+python =
+***REMOVED******REMOVED***3.8: py38
+***REMOVED******REMOVED***3.9: py39
+***REMOVED******REMOVED***3.10: py310
+***REMOVED******REMOVED***3.11: py311
+***REMOVED******REMOVED***3.12: py312
+***REMOVED******REMOVED***3.13: py313