Improved project structure

miguelgrinberg · Jun 7, 2021 · 98c7ac2 · 98c7ac2
1 parent 82cc2cb
commit 98c7ac2
Show file tree

Hide file tree

Showing 26 changed files with 50 additions and 63 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,39 @@
+[metadata]
+name = python-socketio
+version = 5.3.1.dev0
+author = Miguel Grinberg
+author_email = [email protected]
+description = Socket.IO server and client for Python
+long_description = file: README.md
+long_description_content_type = text/markdown
+url = https://github.com/miguelgrinberg/python-socketio
+project_urls =
+    Bug Tracker = https://github.com/miguelgrinberg/python-socketio/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 =
+    bidict >= 0.21.0
+    python-engineio >= 4.1.0
+
+[options.packages.find]
+where = src
+
+[options.extras_require]
+client =
+    requests >= 2.21.0
+    websocket-client >= 0.54.0
+asyncio_client =
+    aiohttp >= 3.4
+    websockets >= 7.0
diff --git a/setup.py b/setup.py
@@ -1,60 +1,3 @@
-"""
-python-socketio
----------------
+import setuptools
 
-Socket.IO server.
-"""
-import re
-import sys
-from setuptools import setup
-
-with open('socketio/__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-socketio',
-    version=version,
-    url='http://github.com/miguelgrinberg/python-socketio/',
-    license='MIT',
-    author='Miguel Grinberg',
-    author_email='[email protected]',
-    description='Socket.IO server',
-    long_description=long_description,
-    long_description_content_type='text/markdown',
-    packages=['socketio'],
-    zip_safe=False,
-    include_package_data=True,
-    platforms='any',
-    install_requires=[
-        'bidict>=0.21.0',
-        'python-engineio>=4.1.0',
-    ],
-    extras_require={
-        'client': [
-            'requests>=2.21.0',
-            'websocket-client>=0.54.0',
-        ],
-        'asyncio_client': [
-            'aiohttp>=3.4',
-            'websockets>=7.0',
-        ]
-    },
-    tests_require=[
-        'mock',
-    ],
-    test_suite='tests' if sys.version_info >= (3, 0) else 'tests.common',
-    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/socketio/__init__.py → src/socketio/__init__.py b/socketio/__init__.py → src/socketio/__init__.py
@@ -27,9 +27,7 @@
     AsyncRedisManager = None
     AsyncAioPikaManager = None
 
-__version__ = '5.3.1dev'
-
-__all__ = ['__version__', 'Client', 'Server', 'BaseManager', 'PubSubManager',
+__all__ = ['Client', 'Server', 'BaseManager', 'PubSubManager',
            'KombuManager', 'RedisManager', 'ZmqManager', 'KafkaManager',
            'Namespace', 'ClientNamespace', 'WSGIApp', 'Middleware']
 if AsyncServer is not None:  # pragma: no cover

diff --git a/socketio/asgi.py → src/socketio/asgi.py b/socketio/asgi.py → src/socketio/asgi.py
diff --git a/socketio/asyncio_aiopika_manager.py → src/socketio/asyncio_aiopika_manager.py b/socketio/asyncio_aiopika_manager.py → src/socketio/asyncio_aiopika_manager.py
diff --git a/socketio/asyncio_client.py → src/socketio/asyncio_client.py b/socketio/asyncio_client.py → src/socketio/asyncio_client.py
diff --git a/socketio/asyncio_manager.py → src/socketio/asyncio_manager.py b/socketio/asyncio_manager.py → src/socketio/asyncio_manager.py
diff --git a/socketio/asyncio_namespace.py → src/socketio/asyncio_namespace.py b/socketio/asyncio_namespace.py → src/socketio/asyncio_namespace.py
diff --git a/socketio/asyncio_pubsub_manager.py → src/socketio/asyncio_pubsub_manager.py b/socketio/asyncio_pubsub_manager.py → src/socketio/asyncio_pubsub_manager.py
diff --git a/socketio/asyncio_redis_manager.py → src/socketio/asyncio_redis_manager.py b/socketio/asyncio_redis_manager.py → src/socketio/asyncio_redis_manager.py
diff --git a/socketio/asyncio_server.py → src/socketio/asyncio_server.py b/socketio/asyncio_server.py → src/socketio/asyncio_server.py
diff --git a/socketio/base_manager.py → src/socketio/base_manager.py b/socketio/base_manager.py → src/socketio/base_manager.py
diff --git a/socketio/client.py → src/socketio/client.py b/socketio/client.py → src/socketio/client.py
diff --git a/socketio/exceptions.py → src/socketio/exceptions.py b/socketio/exceptions.py → src/socketio/exceptions.py
diff --git a/socketio/kafka_manager.py → src/socketio/kafka_manager.py b/socketio/kafka_manager.py → src/socketio/kafka_manager.py
diff --git a/socketio/kombu_manager.py → src/socketio/kombu_manager.py b/socketio/kombu_manager.py → src/socketio/kombu_manager.py
diff --git a/socketio/middleware.py → src/socketio/middleware.py b/socketio/middleware.py → src/socketio/middleware.py
diff --git a/socketio/namespace.py → src/socketio/namespace.py b/socketio/namespace.py → src/socketio/namespace.py
diff --git a/socketio/packet.py → src/socketio/packet.py b/socketio/packet.py → src/socketio/packet.py
diff --git a/socketio/pubsub_manager.py → src/socketio/pubsub_manager.py b/socketio/pubsub_manager.py → src/socketio/pubsub_manager.py
diff --git a/socketio/redis_manager.py → src/socketio/redis_manager.py b/socketio/redis_manager.py → src/socketio/redis_manager.py
diff --git a/socketio/server.py → src/socketio/server.py b/socketio/server.py → src/socketio/server.py
diff --git a/socketio/tornado.py → src/socketio/tornado.py b/socketio/tornado.py → src/socketio/tornado.py
diff --git a/socketio/zmq_manager.py → src/socketio/zmq_manager.py b/socketio/zmq_manager.py → src/socketio/zmq_manager.py
diff --git a/tox.ini b/tox.ini
@@ -12,6 +12,7 @@ python =
 
 [testenv]
 commands=
+    pip install -e .
     pytest -p no:logging --cov=socketio --cov-branch --cov-report=term-missing
 deps=
     pytest
@@ -21,7 +22,7 @@ deps=
 deps=
     flake8
 commands=
-    flake8 --exclude=".*" --ignore=W503,E402,E722 socketio tests
+    flake8 --exclude=".*" --ignore=W503,E402,E722 src/socketio tests
 
 [testenv:docs]
 changedir=docs