Improved project structure

miguelgrinberg · Jun 7, 2021 · bf37732 · bf37732
1 parent a6c8f1d
commit bf37732
Show file tree

Hide file tree

Showing 26 changed files with 46 additions and 57 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,6 @@
+[build-system]
+requires = [
+    "setuptools>=42",
+    "wheel"
+]
+build-backend = "setuptools.build_meta"
diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,36 @@
+[metadata]
+name = python-engineio
+version = 4.2.1.dev0
+author = Miguel Grinberg
+author_email = miguel.grinberg@gmail.com
+description = Engine.IO server and client for Python
+long_description = file: README.md
+long_description_content_type = text/markdown
+url = https://github.com/miguelgrinberg/python-engineio
+project_urls =
+    Bug Tracker = https://github.com/miguelgrinberg/python-engineio/issues
+classifiers =
+    Environment :: Web Environment
+    Intended Audience :: Developers
+    Programming Language :: Python :: 3
+    License :: OSI Approved :: MIT License
+    Operating System :: OS Independent
+
+[options]
+zip_safe = False
+include_package_data = True
+package_dir =
+    = src
+packages = find:
+python_requires = >=3.6
+install_requires =
+
+[options.packages.find]
+where = src
+
+[options.extras_require]
+client =
+    requests >= 2.21.0
+    websocket-client >= 0.54.0
+asyncio_client =
+    aiohttp >= 3.4
diff --git a/setup.py b/setup.py
@@ -1,57 +1,3 @@
-"""
-python-engineio
----------------
+import setuptools
 
-Engine.IO server.
-"""
-import re
-import sys
-from setuptools import setup
-
-
-with open('engineio/__init__.py', 'r') as f:
-    version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]',
-                        f.read(), re.MULTILINE).group(1)
-
-with open('README.md', 'r') as f:
-    long_description = f.read()
-
-setup(
-    name='python-engineio',
-    version=version,
-    url='http://github.com/miguelgrinberg/python-engineio/',
-    license='MIT',
-    author='Miguel Grinberg',
-    author_email='miguelgrinberg50@gmail.com',
-    description='Engine.IO server',
-    long_description=long_description,
-    long_description_content_type='text/markdown',
-    packages=['engineio', 'engineio.async_drivers'],
-    zip_safe=False,
-    include_package_data=True,
-    platforms='any',
-    install_requires=[],
-    extras_require={
-        'client': [
-            'requests>=2.21.0',
-            'websocket-client>=0.54.0',
-        ],
-        'asyncio_client': [
-            'aiohttp>=3.4',
-        ]
-    },
-    tests_require=[
-        'eventlet',
-    ],
-    test_suite='tests',
-    classifiers=[
-        'Environment :: Web Environment',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: MIT License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 3',
-        'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
-        'Topic :: Software Development :: Libraries :: Python Modules'
-    ]
-)
+setuptools.setup()
diff --git a/engineio/__init__.py → src/engineio/__init__.py b/engineio/__init__.py → src/engineio/__init__.py
diff --git a/engineio/async_drivers/__init__.py → src/engineio/async_drivers/__init__.py b/engineio/async_drivers/__init__.py → src/engineio/async_drivers/__init__.py
diff --git a/engineio/async_drivers/aiohttp.py → src/engineio/async_drivers/aiohttp.py b/engineio/async_drivers/aiohttp.py → src/engineio/async_drivers/aiohttp.py
diff --git a/engineio/async_drivers/asgi.py → src/engineio/async_drivers/asgi.py b/engineio/async_drivers/asgi.py → src/engineio/async_drivers/asgi.py
diff --git a/engineio/async_drivers/eventlet.py → src/engineio/async_drivers/eventlet.py b/engineio/async_drivers/eventlet.py → src/engineio/async_drivers/eventlet.py
diff --git a/engineio/async_drivers/gevent.py → src/engineio/async_drivers/gevent.py b/engineio/async_drivers/gevent.py → src/engineio/async_drivers/gevent.py
diff --git a/engineio/async_drivers/gevent_uwsgi.py → src/engineio/async_drivers/gevent_uwsgi.py b/engineio/async_drivers/gevent_uwsgi.py → src/engineio/async_drivers/gevent_uwsgi.py
diff --git a/engineio/async_drivers/sanic.py → src/engineio/async_drivers/sanic.py b/engineio/async_drivers/sanic.py → src/engineio/async_drivers/sanic.py
diff --git a/engineio/async_drivers/threading.py → src/engineio/async_drivers/threading.py b/engineio/async_drivers/threading.py → src/engineio/async_drivers/threading.py
diff --git a/engineio/async_drivers/tornado.py → src/engineio/async_drivers/tornado.py b/engineio/async_drivers/tornado.py → src/engineio/async_drivers/tornado.py
diff --git a/engineio/asyncio_client.py → src/engineio/asyncio_client.py b/engineio/asyncio_client.py → src/engineio/asyncio_client.py
diff --git a/engineio/asyncio_server.py → src/engineio/asyncio_server.py b/engineio/asyncio_server.py → src/engineio/asyncio_server.py
diff --git a/engineio/asyncio_socket.py → src/engineio/asyncio_socket.py b/engineio/asyncio_socket.py → src/engineio/asyncio_socket.py
diff --git a/engineio/client.py → src/engineio/client.py b/engineio/client.py → src/engineio/client.py
diff --git a/engineio/exceptions.py → src/engineio/exceptions.py b/engineio/exceptions.py → src/engineio/exceptions.py
diff --git a/engineio/json.py → src/engineio/json.py b/engineio/json.py → src/engineio/json.py
diff --git a/engineio/middleware.py → src/engineio/middleware.py b/engineio/middleware.py → src/engineio/middleware.py
diff --git a/engineio/packet.py → src/engineio/packet.py b/engineio/packet.py → src/engineio/packet.py
diff --git a/engineio/payload.py → src/engineio/payload.py b/engineio/payload.py → src/engineio/payload.py
diff --git a/engineio/server.py → src/engineio/server.py b/engineio/server.py → src/engineio/server.py
diff --git a/engineio/socket.py → src/engineio/socket.py b/engineio/socket.py → src/engineio/socket.py
diff --git a/engineio/static_files.py → src/engineio/static_files.py b/engineio/static_files.py → src/engineio/static_files.py
diff --git a/tox.ini b/tox.ini
@@ -12,6 +12,7 @@ python =
 
 [testenv]
 commands=
+    pip install -e .
     pytest -p no:logging --cov=engineio --cov-branch --cov-report=term-missing
 deps=
     pytest
@@ -28,7 +29,7 @@ deps=
 deps=
     flake8
 commands=
-    flake8 --exclude=".*" --ignore=W503,E402,E722 engineio tests
+    flake8 --exclude=".*" --ignore=W503,E402,E722 src/engineio tests
 
 [testenv:docs]
 changedir=docs