Move python code to py/

Author: jelmer

.gitignore

@@ -32,3 +32,5 @@ Cargo.lock
 target
 janitor/_worker.*.so
 .testrepository
+py/janitor/config_pb2.py
+py/janitor/_worker.*.so

Makefile

@@ -1,7 +1,7 @@
 DOCKER_TAG ?= latest
 PYTHON ?= python3
 
-core: janitor/site/_static/pygments.css build-inplace
+core: py/janitor/site/_static/pygments.css build-inplace
 
 build-inplace:
 	$(PYTHON) setup.py build_ext -i
@@ -20,7 +20,7 @@ check:: style
 check:: ruff
 
 ruff:
-	ruff check .
+	ruff check py tests
 
 fix:: ruff-fix
 
@@ -35,8 +35,10 @@ ruff-fix:
 suite-references:
 	git grep "\\(lintian-brush\|lintian-fixes\|debianize\|fresh-releases\|fresh-snapshots\\)" | grep -v .example
 
-test: build-inplace
-	PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python $(PYTHON) -m pytest tests
+test:: build-inplace
+	PYTHONPATH=$(shell pwd)/py PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python $(PYTHON) -m pytest tests
+
+test::
 	cargo test
 
 style:: yamllint
@@ -50,9 +52,9 @@ djlint:
 	djlint -i J018,H030,H031,H021 --profile jinja janitor/site/templates
 
 typing:
-	$(PYTHON) -m mypy janitor tests
+	$(PYTHON) -m mypy py/janitor tests
 
-janitor/site/_static/pygments.css:
+py/janitor/site/_static/pygments.css:
 	pygmentize -S default -f html > $@
 
 clean:
@@ -69,4 +71,4 @@ docker-all: docker-site docker-runner docker-publish docker-archive docker-worke
 reformat:: reformat-html
 
 reformat-html:
-	djlint --reformat --format-css janitor/site/templates/
+	djlint --reformat --format-css py/janitor/site/templates/

build.rs

@@ -7,7 +7,7 @@ fn main() {
 
     protobuf_codegen::Codegen::new()
         .cargo_out_dir("generated")
-        .inputs([top_dir.join("janitor/config.proto")])
+        .inputs([top_dir.join("py/janitor/config.proto")])
         .include(top_dir)
         .run_from_script();
 }

janitor/__init__.py py/janitor/__init__.py

@@ -158,15 +158,12 @@ script-files = [
     "create-sbuild-chroot-schroot.py",
     "create-sbuild-chroot-unshare.py",
 ]
-packages = [
-    "janitor",
-    "janitor.debian",
-    "janitor.generic",
-    "janitor.site",
-    "janitor.site.cupboard",
-]
 include-package-data = false
 
+[tool.setuptools.packages.find]
+where = ["py"]
+include = ["janitor*"]
+
 [tool.setuptools.package-data]
 "*" = ["py.typed"]
 "janitor.site" = [
@@ -239,5 +236,5 @@ ignore-words = ".codespell-ignore-words"
 [tool.setuptools-protobuf]
 mypy = true
 protobufs = [
-    "janitor/config.proto"
+    "py/janitor/config.proto"
 ]