[package] move source code to src

XeCycle · Nov 2, 2019 · 157437f · 157437f
1 parent 9b08cc7
commit 157437f
Show file tree

Hide file tree

Showing 33 changed files with 8 additions and 7 deletions.
diff --git a/.travis/script b/.travis/script
@@ -3,10 +3,10 @@
 set -e
 
 if [ "$BUILD" = "lint" ]; then
-    flake8 aioquic examples tests
-    isort -c -df -rc aioquic examples tests
-    black --check --diff aioquic examples tests
-    mypy aioquic examples
+    flake8 examples src tests
+    isort -c -df -rc examples src tests
+    black --check --diff examples src tests
+    mypy examples src
 elif [ "$BUILD" = "sdist" ]; then
     python3 setup.py sdist
     if [ -n "$TRAVIS_TAG" ]; then

diff --git a/setup.py b/setup.py
@@ -31,12 +31,13 @@
         "Topic :: Internet :: WWW/HTTP",
     ],
     ext_modules=[
-        setuptools.Extension("aioquic._buffer", sources=["src/_buffer.c"]),
+        setuptools.Extension("aioquic._buffer", sources=["src/aioquic/_buffer.c"]),
         setuptools.Extension(
-            "aioquic._crypto", libraries=["crypto"], sources=["src/_crypto.c"]
+            "aioquic._crypto", libraries=["crypto"], sources=["src/aioquic/_crypto.c"]
         ),
     ],
-    package_data={"aioquic": ["py.typed"]},
+    package_dir={"": "src"},
+    package_data={"aioquic": ["py.typed", "_buffer.pyi", "_crypto.pyi"]},
     packages=["aioquic", "aioquic.asyncio", "aioquic.h0", "aioquic.h3", "aioquic.quic"],
     install_requires=[
         "cryptography >= 2.5",

diff --git a/aioquic/__init__.py → src/aioquic/__init__.py b/aioquic/__init__.py → src/aioquic/__init__.py
diff --git a/src/_buffer.c → src/aioquic/_buffer.c b/src/_buffer.c → src/aioquic/_buffer.c
diff --git a/aioquic/_buffer.pyi → src/aioquic/_buffer.pyi b/aioquic/_buffer.pyi → src/aioquic/_buffer.pyi
diff --git a/src/_crypto.c → src/aioquic/_crypto.c b/src/_crypto.c → src/aioquic/_crypto.c
diff --git a/aioquic/_crypto.pyi → src/aioquic/_crypto.pyi b/aioquic/_crypto.pyi → src/aioquic/_crypto.pyi
diff --git a/aioquic/asyncio/__init__.py → src/aioquic/asyncio/__init__.py b/aioquic/asyncio/__init__.py → src/aioquic/asyncio/__init__.py
diff --git a/aioquic/asyncio/client.py → src/aioquic/asyncio/client.py b/aioquic/asyncio/client.py → src/aioquic/asyncio/client.py
diff --git a/aioquic/asyncio/compat.py → src/aioquic/asyncio/compat.py b/aioquic/asyncio/compat.py → src/aioquic/asyncio/compat.py
diff --git a/aioquic/asyncio/protocol.py → src/aioquic/asyncio/protocol.py b/aioquic/asyncio/protocol.py → src/aioquic/asyncio/protocol.py
diff --git a/aioquic/asyncio/server.py → src/aioquic/asyncio/server.py b/aioquic/asyncio/server.py → src/aioquic/asyncio/server.py
diff --git a/aioquic/buffer.py → src/aioquic/buffer.py b/aioquic/buffer.py → src/aioquic/buffer.py
diff --git a/aioquic/h0/__init__.py → src/aioquic/h0/__init__.py b/aioquic/h0/__init__.py → src/aioquic/h0/__init__.py
diff --git a/aioquic/h0/connection.py → src/aioquic/h0/connection.py b/aioquic/h0/connection.py → src/aioquic/h0/connection.py
diff --git a/aioquic/h3/__init__.py → src/aioquic/h3/__init__.py b/aioquic/h3/__init__.py → src/aioquic/h3/__init__.py
diff --git a/aioquic/h3/connection.py → src/aioquic/h3/connection.py b/aioquic/h3/connection.py → src/aioquic/h3/connection.py
diff --git a/aioquic/h3/events.py → src/aioquic/h3/events.py b/aioquic/h3/events.py → src/aioquic/h3/events.py
diff --git a/aioquic/h3/exceptions.py → src/aioquic/h3/exceptions.py b/aioquic/h3/exceptions.py → src/aioquic/h3/exceptions.py
diff --git a/aioquic/py.typed → src/aioquic/py.typed b/aioquic/py.typed → src/aioquic/py.typed
diff --git a/aioquic/quic/__init__.py → src/aioquic/quic/__init__.py b/aioquic/quic/__init__.py → src/aioquic/quic/__init__.py
diff --git a/aioquic/quic/configuration.py → src/aioquic/quic/configuration.py b/aioquic/quic/configuration.py → src/aioquic/quic/configuration.py
diff --git a/aioquic/quic/connection.py → src/aioquic/quic/connection.py b/aioquic/quic/connection.py → src/aioquic/quic/connection.py
diff --git a/aioquic/quic/crypto.py → src/aioquic/quic/crypto.py b/aioquic/quic/crypto.py → src/aioquic/quic/crypto.py
diff --git a/aioquic/quic/events.py → src/aioquic/quic/events.py b/aioquic/quic/events.py → src/aioquic/quic/events.py
diff --git a/aioquic/quic/logger.py → src/aioquic/quic/logger.py b/aioquic/quic/logger.py → src/aioquic/quic/logger.py
diff --git a/aioquic/quic/packet.py → src/aioquic/quic/packet.py b/aioquic/quic/packet.py → src/aioquic/quic/packet.py
diff --git a/aioquic/quic/packet_builder.py → src/aioquic/quic/packet_builder.py b/aioquic/quic/packet_builder.py → src/aioquic/quic/packet_builder.py
diff --git a/aioquic/quic/rangeset.py → src/aioquic/quic/rangeset.py b/aioquic/quic/rangeset.py → src/aioquic/quic/rangeset.py
diff --git a/aioquic/quic/recovery.py → src/aioquic/quic/recovery.py b/aioquic/quic/recovery.py → src/aioquic/quic/recovery.py
diff --git a/aioquic/quic/retry.py → src/aioquic/quic/retry.py b/aioquic/quic/retry.py → src/aioquic/quic/retry.py
diff --git a/aioquic/quic/stream.py → src/aioquic/quic/stream.py b/aioquic/quic/stream.py → src/aioquic/quic/stream.py
diff --git a/aioquic/tls.py → src/aioquic/tls.py b/aioquic/tls.py → src/aioquic/tls.py