Merge pull request #40 from mgorny/aiosmtpd-dep

Make aiosmtpd dependency optional

Author: diazona

.github/workflows/tests.yml

@@ -11,7 +11,8 @@ jobs:
       matrix:
         # Not all Python versions are available for linux AND x64
         # https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json
-        python-version: [3.5, 3.6, 3.7, 3.8, 3.9, '3.10']
+        python-version: [3.5, 3.6, 3.7, 3.8, 3.9, '3.10', '3.11.0-beta - 3.11', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9']
+        extra: ['', '-smtp']
       fail-fast: false
 
     steps:
@@ -23,6 +24,6 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install tox tox-gh-actions
+        pip install tox
     - name: Test with tox
-      run: tox -vv
+      run: tox -vv -e py${{ matrix.extra }}

setup.py

@@ -27,16 +27,20 @@ def run(self):
     maintainer='David Zaslavsky',
     maintainer_email='[email protected]',
     license='MIT License',
-    description='py.test plugin to test server connections locally.',
+    description='pytest plugin to test server connections locally.',
     long_description=read('README.rst'),
     url='https://github.com/pytest-dev/pytest-localserver',
 
     packages=['pytest_localserver'],
     python_requires='>=3.5',
     install_requires=[
         'werkzeug>=0.10',
-        'aiosmtpd'
     ],
+    extras_require={
+        'smtp': [
+            'aiosmtpd',
+        ],
+    },
     cmdclass={'test': PyTest},
     tests_require=[
         'pytest>=2.0.0',
@@ -49,7 +53,7 @@ def run(self):
     zip_safe=False,
     include_package_data=True,
 
-    keywords='py.test pytest server localhost http smtp',
+    keywords='pytest server localhost http smtp',
     classifiers=[
         'Framework :: Pytest',
         'Operating System :: OS Independent',

tests/test_smtp.py

@@ -1,11 +1,15 @@
+import pytest
 import smtplib
 
 try:  # python 3
     from email.mime.text import MIMEText
 except ImportError:  # python 2?
     from email.MIMEText import MIMEText
 
-from pytest_localserver import plugin, smtp
+from pytest_localserver import plugin
+
+
+smtp = pytest.importorskip('pytest_localserver.smtp')
 
 
 def send_plain_email(to, from_, subject, txt, server=('localhost', 25)):

tox.ini

@@ -1,20 +1,11 @@
 [tox]
-envlist = py35,py36,py37,py38,py39,py310
+envlist = py{35,36,37,38,39,310,311,py3}{,-smtp}
 recreate = True
 isolated_build = True
 
 [tox:hudson]
 downloadcache = {toxworkdir}/_download
 
-[gh-actions]
-python =
-    3.5: py35
-    3.6: py36
-    3.7: py37
-    3.8: py38
-    3.9: py39
-    3.10: py310
-
 [testenv]
 description = run test suite under {basepython}
 deps =
@@ -24,7 +15,9 @@ deps =
     pytest-cov
     six
     requests
+extras =
+    smtp: smtp
 commands =
-  py.test -v \
+  pytest -v \
     --junitxml=junit-{envname}.xml \
     {posargs}