From 459d12b24de3ddb7c01484d5b39824331996a665 Mon Sep 17 00:00:00 2001 From: Arun Babu Neelicattu Date: Fri, 10 Jul 2020 14:23:41 +0200 Subject: [PATCH] =?UTF-8?q?Move=20betterproto=20=E2=86=92=20src/betterprot?= =?UTF-8?q?o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change avoids some nasty import issues and also ensures that the right code is tested and arbitrary code is not included when packaging. --- Makefile | 4 ++-- pyproject.toml | 5 +++-- {betterproto => src/betterproto}/__init__.py | 0 {betterproto => src/betterproto}/_types.py | 0 {betterproto => src/betterproto}/casing.py | 0 {betterproto => src/betterproto}/compile/__init__.py | 0 {betterproto => src/betterproto}/compile/importing.py | 0 {betterproto => src/betterproto}/compile/naming.py | 0 {betterproto => src/betterproto}/grpc/__init__.py | 0 {betterproto => src/betterproto}/grpc/grpclib_client.py | 0 {betterproto => src/betterproto}/grpc/util/__init__.py | 0 {betterproto => src/betterproto}/grpc/util/async_channel.py | 0 {betterproto => src/betterproto}/lib/__init__.py | 0 {betterproto => src/betterproto}/lib/google/__init__.py | 0 .../betterproto}/lib/google/protobuf/__init__.py | 0 {betterproto => src/betterproto}/plugin.bat | 0 {betterproto => src/betterproto}/plugin.py | 0 {betterproto => src/betterproto}/py.typed | 0 {betterproto => src/betterproto}/templates/template.py.j2 | 0 19 files changed, 5 insertions(+), 4 deletions(-) rename {betterproto => src/betterproto}/__init__.py (100%) rename {betterproto => src/betterproto}/_types.py (100%) rename {betterproto => src/betterproto}/casing.py (100%) rename {betterproto => src/betterproto}/compile/__init__.py (100%) rename {betterproto => src/betterproto}/compile/importing.py (100%) rename {betterproto => src/betterproto}/compile/naming.py (100%) rename {betterproto => src/betterproto}/grpc/__init__.py (100%) rename {betterproto => src/betterproto}/grpc/grpclib_client.py (100%) rename {betterproto => src/betterproto}/grpc/util/__init__.py (100%) rename {betterproto => src/betterproto}/grpc/util/async_channel.py (100%) rename {betterproto => src/betterproto}/lib/__init__.py (100%) rename {betterproto => src/betterproto}/lib/google/__init__.py (100%) rename {betterproto => src/betterproto}/lib/google/protobuf/__init__.py (100%) rename {betterproto => src/betterproto}/plugin.bat (100%) rename {betterproto => src/betterproto}/plugin.py (100%) rename {betterproto => src/betterproto}/py.typed (100%) rename {betterproto => src/betterproto}/templates/template.py.j2 (100%) diff --git a/Makefile b/Makefile index acf80a0..9ec4554 100644 --- a/Makefile +++ b/Makefile @@ -6,13 +6,13 @@ help: ## - Show this help. # Dev workflow tasks generate: ## - Generate test cases (do this once before running test) - poetry run ./tests/generate.py + poetry run python -m tests.generate test: ## - Run tests poetry run pytest --cov betterproto types: ## - Check types with mypy - poetry run mypy betterproto --ignore-missing-imports + poetry run mypy src/betterproto --ignore-missing-imports format: ## - Apply black formatting to source code poetry run black . --exclude tests/output_ diff --git a/pyproject.toml b/pyproject.toml index 6b6a116..400a797 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,8 +7,9 @@ readme = "README.md" repository = "https://github.com/danielgtaylor/python-betterproto" keywords = ["protobuf", "gRPC"] license = "MIT" - -exclude = ["betterproto/tests"] +packages = [ + { include = "betterproto", from = "src" } +] [tool.poetry.dependencies] python = "^3.6" diff --git a/betterproto/__init__.py b/src/betterproto/__init__.py similarity index 100% rename from betterproto/__init__.py rename to src/betterproto/__init__.py diff --git a/betterproto/_types.py b/src/betterproto/_types.py similarity index 100% rename from betterproto/_types.py rename to src/betterproto/_types.py diff --git a/betterproto/casing.py b/src/betterproto/casing.py similarity index 100% rename from betterproto/casing.py rename to src/betterproto/casing.py diff --git a/betterproto/compile/__init__.py b/src/betterproto/compile/__init__.py similarity index 100% rename from betterproto/compile/__init__.py rename to src/betterproto/compile/__init__.py diff --git a/betterproto/compile/importing.py b/src/betterproto/compile/importing.py similarity index 100% rename from betterproto/compile/importing.py rename to src/betterproto/compile/importing.py diff --git a/betterproto/compile/naming.py b/src/betterproto/compile/naming.py similarity index 100% rename from betterproto/compile/naming.py rename to src/betterproto/compile/naming.py diff --git a/betterproto/grpc/__init__.py b/src/betterproto/grpc/__init__.py similarity index 100% rename from betterproto/grpc/__init__.py rename to src/betterproto/grpc/__init__.py diff --git a/betterproto/grpc/grpclib_client.py b/src/betterproto/grpc/grpclib_client.py similarity index 100% rename from betterproto/grpc/grpclib_client.py rename to src/betterproto/grpc/grpclib_client.py diff --git a/betterproto/grpc/util/__init__.py b/src/betterproto/grpc/util/__init__.py similarity index 100% rename from betterproto/grpc/util/__init__.py rename to src/betterproto/grpc/util/__init__.py diff --git a/betterproto/grpc/util/async_channel.py b/src/betterproto/grpc/util/async_channel.py similarity index 100% rename from betterproto/grpc/util/async_channel.py rename to src/betterproto/grpc/util/async_channel.py diff --git a/betterproto/lib/__init__.py b/src/betterproto/lib/__init__.py similarity index 100% rename from betterproto/lib/__init__.py rename to src/betterproto/lib/__init__.py diff --git a/betterproto/lib/google/__init__.py b/src/betterproto/lib/google/__init__.py similarity index 100% rename from betterproto/lib/google/__init__.py rename to src/betterproto/lib/google/__init__.py diff --git a/betterproto/lib/google/protobuf/__init__.py b/src/betterproto/lib/google/protobuf/__init__.py similarity index 100% rename from betterproto/lib/google/protobuf/__init__.py rename to src/betterproto/lib/google/protobuf/__init__.py diff --git a/betterproto/plugin.bat b/src/betterproto/plugin.bat similarity index 100% rename from betterproto/plugin.bat rename to src/betterproto/plugin.bat diff --git a/betterproto/plugin.py b/src/betterproto/plugin.py similarity index 100% rename from betterproto/plugin.py rename to src/betterproto/plugin.py diff --git a/betterproto/py.typed b/src/betterproto/py.typed similarity index 100% rename from betterproto/py.typed rename to src/betterproto/py.typed diff --git a/betterproto/templates/template.py.j2 b/src/betterproto/templates/template.py.j2 similarity index 100% rename from betterproto/templates/template.py.j2 rename to src/betterproto/templates/template.py.j2