move python source in examples under python/ subdir

davidhewitt · davidhewitt · commit 87a1389d130a · 2023-08-04T10:32:31.000+01:00
diff --git a/examples/hello-world-script/MANIFEST.in b/examples/hello-world-script/MANIFEST.in
@@ -1,2 +1,3 @@
 include Cargo.toml
 recursive-include src *
+recursive-include python *
diff --git a/examples/hello-world-script/python/hello_world/__init__.py b/examples/hello-world-script/python/hello_world/__init__.py
diff --git a/examples/hello-world-script/setup.py b/examples/hello-world-script/setup.py
@@ -1,10 +1,12 @@
-from setuptools import setup
+from setuptools import find_packages, setup
 
 from setuptools_rust import RustExtension, Binding
 
 setup(
     name="hello-world-script",
     version="1.0",
+    packages=find_packages(where="python"),
+    package_dir={"": "python"},
     rust_extensions=[
         RustExtension(
             {"hello-world-script": "hello_world.hello-world-script"},
diff --git a/examples/hello-world/MANIFEST.in b/examples/hello-world/MANIFEST.in
@@ -1,2 +1,3 @@
 include Cargo.toml
 recursive-include src *
+recursive-include python *
diff --git a/examples/hello-world/python/hello_world/__init__.py b/examples/hello-world/python/hello_world/__init__.py
diff --git a/examples/hello-world/setup.py b/examples/hello-world/setup.py
@@ -1,10 +1,12 @@
-from setuptools import setup
+from setuptools import find_packages, setup
 
 from setuptools_rust import RustBin
 
 setup(
     name="hello-world",
     version="1.0",
+    packages=find_packages(where="python"),
+    package_dir={"": "python"},
     rust_extensions=[
         RustBin(
             "hello-world",
diff --git a/examples/html-py-ever/MANIFEST.in b/examples/html-py-ever/MANIFEST.in
@@ -1,2 +1,3 @@
 include Cargo.toml
 recursive-include src *
+recursive-include python *
diff --git a/examples/html-py-ever/python/html_py_ever/__init__.py b/examples/html-py-ever/python/html_py_ever/__init__.py
diff --git a/examples/html-py-ever/setup.py b/examples/html-py-ever/setup.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
-import sys
 
-from setuptools import setup
+from setuptools import find_packages, setup
 
 from setuptools_rust import RustExtension
 
 setup(
+    packages=find_packages(where="python"),
+    package_dir={"": "python"},
     rust_extensions=[RustExtension("html_py_ever.html_py_ever")],
 )
diff --git a/examples/namespace_package/MANIFEST.in b/examples/namespace_package/MANIFEST.in
@@ -1,2 +1,3 @@
 include Cargo.toml
 recursive-include src *
+recursive-include python *
diff --git a/examples/namespace_package/python/namespace_package/python/__init__.py b/examples/namespace_package/python/namespace_package/python/__init__.py
diff --git a/examples/namespace_package/setup.py b/examples/namespace_package/setup.py
@@ -5,7 +5,8 @@
 setup(
     name="namespace_package",
     version="0.1.0",
-    packages=find_namespace_packages(include=["namespace_package.*"]),
+    packages=find_namespace_packages(include=["namespace_package.*"], where="python"),
+    package_dir={"": "python"},
     zip_safe=False,
     rust_extensions=[
         RustExtension(
diff --git a/examples/rust_with_cffi/MANIFEST.in b/examples/rust_with_cffi/MANIFEST.in
@@ -1,3 +1,4 @@
 include Cargo.toml
 include cffi_module.py
 recursive-include src *
+recursive-include python *
diff --git a/examples/rust_with_cffi/python/rust_with_cffi/__init__.py b/examples/rust_with_cffi/python/rust_with_cffi/__init__.py
diff --git a/examples/rust_with_cffi/setup.py b/examples/rust_with_cffi/setup.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from setuptools import setup
+from setuptools import find_packages, setup
 from setuptools_rust import RustExtension
 
 setup(
@@ -14,7 +14,8 @@
         "Operating System :: POSIX",
         "Operating System :: MacOS :: MacOS X",
     ],
-    packages=["rust_with_cffi"],
+    packages=find_packages(where="python"),
+    package_dir={"": "python"},
     rust_extensions=[
         RustExtension("rust_with_cffi.rust", py_limited_api="auto"),
     ],

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`include Cargo.toml`
`2`	`2`	`recursive-include src *`
	`3`	`+recursive-include python *`