From 7a9ece777eb8a767584fabd71aafb5333f953cb2 Mon Sep 17 00:00:00 2001 From: Dominik Gresch Date: Thu, 2 Jun 2022 18:24:28 +0200 Subject: [PATCH] Switch to 'src' layout This avoids issues where 'ansys-tools-protoc-helper' will find the .proto files which are located in the 'build' directory. --- ansys/api/acp/VERSION | 1 - setup.py | 5 +++-- src/ansys/api/acp/VERSION | 1 + {ansys => src/ansys}/api/acp/__init__.py | 0 {ansys => src/ansys}/api/acp/py.typed | 0 {ansys => src/ansys}/api/acp/v0/base.proto | 0 {ansys => src/ansys}/api/acp/v0/control.proto | 0 {ansys => src/ansys}/api/acp/v0/model.proto | 0 {ansys => src/ansys}/api/acp/v0/modeling_group.proto | 0 9 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 ansys/api/acp/VERSION create mode 100644 src/ansys/api/acp/VERSION rename {ansys => src/ansys}/api/acp/__init__.py (100%) rename {ansys => src/ansys}/api/acp/py.typed (100%) rename {ansys => src/ansys}/api/acp/v0/base.proto (100%) rename {ansys => src/ansys}/api/acp/v0/control.proto (100%) rename {ansys => src/ansys}/api/acp/v0/model.proto (100%) rename {ansys => src/ansys}/api/acp/v0/modeling_group.proto (100%) diff --git a/ansys/api/acp/VERSION b/ansys/api/acp/VERSION deleted file mode 100644 index a76d256..0000000 --- a/ansys/api/acp/VERSION +++ /dev/null @@ -1 +0,0 @@ -0.1.0dev \ No newline at end of file diff --git a/setup.py b/setup.py index 4aead77..c25369d 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ with open(os.path.join(HERE, "README.md"), encoding="utf-8") as f: long_description = f.read() -with open(os.path.join(HERE, "ansys", "api", "acp", "VERSION"), encoding="utf-8") as f: +with open(os.path.join(HERE, "src", "ansys", "api", "acp", "VERSION"), encoding="utf-8") as f: version = f.read().strip() package_name = "ansys-api-acp" @@ -32,7 +32,8 @@ license="MIT", python_requires=">=3.7", install_requires=["grpcio~=1.17", "protobuf~=3.19"], - packages=setuptools.find_namespace_packages(".", include=("ansys.*",)), + package_dir = {"": "src"}, + packages=setuptools.find_namespace_packages("src", include=("ansys.*",)), package_data={ "": ["*.proto", "*.pyi", "py.typed", "VERSION"], }, diff --git a/src/ansys/api/acp/VERSION b/src/ansys/api/acp/VERSION new file mode 100644 index 0000000..1821d33 --- /dev/null +++ b/src/ansys/api/acp/VERSION @@ -0,0 +1 @@ +0.1.0.dev0 diff --git a/ansys/api/acp/__init__.py b/src/ansys/api/acp/__init__.py similarity index 100% rename from ansys/api/acp/__init__.py rename to src/ansys/api/acp/__init__.py diff --git a/ansys/api/acp/py.typed b/src/ansys/api/acp/py.typed similarity index 100% rename from ansys/api/acp/py.typed rename to src/ansys/api/acp/py.typed diff --git a/ansys/api/acp/v0/base.proto b/src/ansys/api/acp/v0/base.proto similarity index 100% rename from ansys/api/acp/v0/base.proto rename to src/ansys/api/acp/v0/base.proto diff --git a/ansys/api/acp/v0/control.proto b/src/ansys/api/acp/v0/control.proto similarity index 100% rename from ansys/api/acp/v0/control.proto rename to src/ansys/api/acp/v0/control.proto diff --git a/ansys/api/acp/v0/model.proto b/src/ansys/api/acp/v0/model.proto similarity index 100% rename from ansys/api/acp/v0/model.proto rename to src/ansys/api/acp/v0/model.proto diff --git a/ansys/api/acp/v0/modeling_group.proto b/src/ansys/api/acp/v0/modeling_group.proto similarity index 100% rename from ansys/api/acp/v0/modeling_group.proto rename to src/ansys/api/acp/v0/modeling_group.proto