Move from flat-layout to src-layout

gvalkov · Feb 2, 2025 · cdb9c44 · cdb9c44
1 parent 3ff9816
commit cdb9c44
Show file tree

Hide file tree

Showing 19 changed files with 15 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,10 +17,10 @@ __pycache__
 .pytest_cache
 .ruff_cache
 
-evdev/*.so
-evdev/ecodes.c
-evdev/ecodes.pyi
+src/evdev/*.so
+src/evdev/ecodes.c
+src/evdev/ecodes.pyi
 docs/_build
-evdev/_ecodes.py
-evdev/_input.py
-evdev/_uinput.py
+src/evdev/_ecodes.py
+src/evdev/_input.py
+src/evdev/_uinput.py
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,5 @@
 # The _ecodes extension module source file needs to be generated against the
 # evdev headers of the running kernel. Refer to the 'build_ecodes' distutils
 # command in setup.py.
-exclude evdev/ecodes.c
-include evdev/ecodes.py
+exclude src/evdev/ecodes.c
+include src/evdev/ecodes.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -29,9 +29,6 @@ classifiers = [
 [project.urls]
 "Homepage" = "https://github.com/gvalkov/python-evdev"
 
-[tool.setuptools]
-packages = ["evdev"]
-
 [tool.ruff]
 line-length = 120
 

diff --git a/setup.py b/setup.py
@@ -10,7 +10,7 @@
 
 
 curdir = Path(__file__).resolve().parent
-ecodes_c_path = curdir / "evdev/ecodes.c"
+ecodes_c_path = curdir / "src/evdev/ecodes.c"
 
 
 def create_ecodes(headers=None):
@@ -60,7 +60,7 @@ def create_ecodes(headers=None):
 
     print("writing %s (using %s)" % (ecodes_c_path, " ".join(headers)))
     with ecodes_c_path.open("w") as fh:
-        cmd = [sys.executable, "evdev/genecodes_c.py", "--ecodes", *headers]
+        cmd = [sys.executable, "src/evdev/genecodes_c.py", "--ecodes", *headers]
         run(cmd, check=True, stdout=fh)
 
 
@@ -93,12 +93,12 @@ def generate_ecodes_py(self):
         ecodes_py = Path(self.build_lib) / "evdev/ecodes.py"
         print(f"writing {ecodes_py}")
         with ecodes_py.open("w") as fh:
-            cmd = [sys.executable, "-B", "evdev/genecodes_py.py"]
+            cmd = [sys.executable, "-B", "src/evdev/genecodes_py.py"]
             res = run(cmd, env={"PYTHONPATH": self.build_lib}, stdout=fh)
 
         if res.returncode != 0:
             print(f"failed to generate static {ecodes_py} - will use ecodes_runtime.py")
-            shutil.copy("evdev/ecodes_runtime.py", ecodes_py)
+            shutil.copy("src/evdev/ecodes_runtime.py", ecodes_py)
 
     def run(self):
         for cmd_name in self.get_sub_commands():
@@ -112,9 +112,9 @@ def run(self):
 cflags = ["-std=c99", "-Wno-error=declaration-after-statement"]
 setup(
     ext_modules=[
-        Extension("evdev._input", sources=["evdev/input.c"], extra_compile_args=cflags),
-        Extension("evdev._uinput", sources=["evdev/uinput.c"], extra_compile_args=cflags),
-        Extension("evdev._ecodes", sources=["evdev/ecodes.c"], extra_compile_args=cflags),
+        Extension("evdev._input", sources=["src/evdev/input.c"], extra_compile_args=cflags),
+        Extension("evdev._uinput", sources=["src/evdev/uinput.c"], extra_compile_args=cflags),
+        Extension("evdev._ecodes", sources=["src/evdev/ecodes.c"], extra_compile_args=cflags),
     ],
     cmdclass={
         "build_ext": build_ext,

diff --git a/evdev/__init__.py → src/evdev/__init__.py b/evdev/__init__.py → src/evdev/__init__.py
diff --git a/evdev/device.py → src/evdev/device.py b/evdev/device.py → src/evdev/device.py
diff --git a/evdev/ecodes.py → src/evdev/ecodes.py b/evdev/ecodes.py → src/evdev/ecodes.py
diff --git a/evdev/ecodes_runtime.py → src/evdev/ecodes_runtime.py b/evdev/ecodes_runtime.py → src/evdev/ecodes_runtime.py
diff --git a/evdev/eventio.py → src/evdev/eventio.py b/evdev/eventio.py → src/evdev/eventio.py
diff --git a/evdev/eventio_async.py → src/evdev/eventio_async.py b/evdev/eventio_async.py → src/evdev/eventio_async.py
diff --git a/evdev/events.py → src/evdev/events.py b/evdev/events.py → src/evdev/events.py
diff --git a/evdev/evtest.py → src/evdev/evtest.py b/evdev/evtest.py → src/evdev/evtest.py
diff --git a/evdev/ff.py → src/evdev/ff.py b/evdev/ff.py → src/evdev/ff.py
diff --git a/evdev/genecodes_c.py → src/evdev/genecodes_c.py b/evdev/genecodes_c.py → src/evdev/genecodes_c.py
diff --git a/evdev/genecodes_py.py → src/evdev/genecodes_py.py b/evdev/genecodes_py.py → src/evdev/genecodes_py.py
diff --git a/evdev/input.c → src/evdev/input.c b/evdev/input.c → src/evdev/input.c
diff --git a/evdev/uinput.c → src/evdev/uinput.c b/evdev/uinput.c → src/evdev/uinput.c
diff --git a/evdev/uinput.py → src/evdev/uinput.py b/evdev/uinput.py → src/evdev/uinput.py
diff --git a/evdev/util.py → src/evdev/util.py b/evdev/util.py → src/evdev/util.py