From 4fd868e1081d6eea6cb0c71c060a4ca708d802f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filipe=20La=C3=ADns?= Date: Wed, 28 Aug 2024 02:10:23 +0100 Subject: [PATCH 1/2] scripts: move scripts to the Python package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Filipe Laíns --- {scripts => moonraker/scripts}/backup-database.sh | 0 {scripts => moonraker/scripts}/build-zip-release.sh | 0 {scripts => moonraker/scripts}/build_release.py | 0 {scripts => moonraker/scripts}/data-path-fix.sh | 0 {scripts => moonraker/scripts}/dbtool.py | 0 {scripts => moonraker/scripts}/fetch-apikey.sh | 0 {scripts => moonraker/scripts}/finish-upgrade.sh | 0 {scripts => moonraker/scripts}/install-moonraker.sh | 0 {scripts => moonraker/scripts}/make_sysdeps.py | 0 .../scripts}/moonraker-dev-reqs.txt | 0 .../scripts}/moonraker-requirements.txt | 0 .../scripts}/moonraker-speedups.txt | 0 {scripts => moonraker/scripts}/pk-enum-convertor.py | 0 .../python_wheels/zeroconf-0.131.0-py3-none-any.whl | Bin {scripts => moonraker/scripts}/restore-database.sh | 0 .../scripts}/set-policykit-rules.sh | 0 {scripts => moonraker/scripts}/sudo_fix.sh | 0 {scripts => moonraker/scripts}/sync_dependencies.py | 0 .../scripts}/system-dependencies.json | 0 {scripts => moonraker/scripts}/tag-release.sh | 0 .../scripts}/uninstall-moonraker.sh | 0 pdm_build.py | 10 ---------- pyproject.toml | 4 ---- scripts | 1 + 24 files changed, 1 insertion(+), 14 deletions(-) rename {scripts => moonraker/scripts}/backup-database.sh (100%) rename {scripts => moonraker/scripts}/build-zip-release.sh (100%) rename {scripts => moonraker/scripts}/build_release.py (100%) rename {scripts => moonraker/scripts}/data-path-fix.sh (100%) rename {scripts => moonraker/scripts}/dbtool.py (100%) rename {scripts => moonraker/scripts}/fetch-apikey.sh (100%) rename {scripts => moonraker/scripts}/finish-upgrade.sh (100%) rename {scripts => moonraker/scripts}/install-moonraker.sh (100%) rename {scripts => moonraker/scripts}/make_sysdeps.py (100%) rename {scripts => moonraker/scripts}/moonraker-dev-reqs.txt (100%) rename {scripts => moonraker/scripts}/moonraker-requirements.txt (100%) rename {scripts => moonraker/scripts}/moonraker-speedups.txt (100%) rename {scripts => moonraker/scripts}/pk-enum-convertor.py (100%) rename {scripts => moonraker/scripts}/python_wheels/zeroconf-0.131.0-py3-none-any.whl (100%) rename {scripts => moonraker/scripts}/restore-database.sh (100%) rename {scripts => moonraker/scripts}/set-policykit-rules.sh (100%) rename {scripts => moonraker/scripts}/sudo_fix.sh (100%) rename {scripts => moonraker/scripts}/sync_dependencies.py (100%) rename {scripts => moonraker/scripts}/system-dependencies.json (100%) rename {scripts => moonraker/scripts}/tag-release.sh (100%) rename {scripts => moonraker/scripts}/uninstall-moonraker.sh (100%) create mode 120000 scripts diff --git a/scripts/backup-database.sh b/moonraker/scripts/backup-database.sh similarity index 100% rename from scripts/backup-database.sh rename to moonraker/scripts/backup-database.sh diff --git a/scripts/build-zip-release.sh b/moonraker/scripts/build-zip-release.sh similarity index 100% rename from scripts/build-zip-release.sh rename to moonraker/scripts/build-zip-release.sh diff --git a/scripts/build_release.py b/moonraker/scripts/build_release.py similarity index 100% rename from scripts/build_release.py rename to moonraker/scripts/build_release.py diff --git a/scripts/data-path-fix.sh b/moonraker/scripts/data-path-fix.sh similarity index 100% rename from scripts/data-path-fix.sh rename to moonraker/scripts/data-path-fix.sh diff --git a/scripts/dbtool.py b/moonraker/scripts/dbtool.py similarity index 100% rename from scripts/dbtool.py rename to moonraker/scripts/dbtool.py diff --git a/scripts/fetch-apikey.sh b/moonraker/scripts/fetch-apikey.sh similarity index 100% rename from scripts/fetch-apikey.sh rename to moonraker/scripts/fetch-apikey.sh diff --git a/scripts/finish-upgrade.sh b/moonraker/scripts/finish-upgrade.sh similarity index 100% rename from scripts/finish-upgrade.sh rename to moonraker/scripts/finish-upgrade.sh diff --git a/scripts/install-moonraker.sh b/moonraker/scripts/install-moonraker.sh similarity index 100% rename from scripts/install-moonraker.sh rename to moonraker/scripts/install-moonraker.sh diff --git a/scripts/make_sysdeps.py b/moonraker/scripts/make_sysdeps.py similarity index 100% rename from scripts/make_sysdeps.py rename to moonraker/scripts/make_sysdeps.py diff --git a/scripts/moonraker-dev-reqs.txt b/moonraker/scripts/moonraker-dev-reqs.txt similarity index 100% rename from scripts/moonraker-dev-reqs.txt rename to moonraker/scripts/moonraker-dev-reqs.txt diff --git a/scripts/moonraker-requirements.txt b/moonraker/scripts/moonraker-requirements.txt similarity index 100% rename from scripts/moonraker-requirements.txt rename to moonraker/scripts/moonraker-requirements.txt diff --git a/scripts/moonraker-speedups.txt b/moonraker/scripts/moonraker-speedups.txt similarity index 100% rename from scripts/moonraker-speedups.txt rename to moonraker/scripts/moonraker-speedups.txt diff --git a/scripts/pk-enum-convertor.py b/moonraker/scripts/pk-enum-convertor.py similarity index 100% rename from scripts/pk-enum-convertor.py rename to moonraker/scripts/pk-enum-convertor.py diff --git a/scripts/python_wheels/zeroconf-0.131.0-py3-none-any.whl b/moonraker/scripts/python_wheels/zeroconf-0.131.0-py3-none-any.whl similarity index 100% rename from scripts/python_wheels/zeroconf-0.131.0-py3-none-any.whl rename to moonraker/scripts/python_wheels/zeroconf-0.131.0-py3-none-any.whl diff --git a/scripts/restore-database.sh b/moonraker/scripts/restore-database.sh similarity index 100% rename from scripts/restore-database.sh rename to moonraker/scripts/restore-database.sh diff --git a/scripts/set-policykit-rules.sh b/moonraker/scripts/set-policykit-rules.sh similarity index 100% rename from scripts/set-policykit-rules.sh rename to moonraker/scripts/set-policykit-rules.sh diff --git a/scripts/sudo_fix.sh b/moonraker/scripts/sudo_fix.sh similarity index 100% rename from scripts/sudo_fix.sh rename to moonraker/scripts/sudo_fix.sh diff --git a/scripts/sync_dependencies.py b/moonraker/scripts/sync_dependencies.py similarity index 100% rename from scripts/sync_dependencies.py rename to moonraker/scripts/sync_dependencies.py diff --git a/scripts/system-dependencies.json b/moonraker/scripts/system-dependencies.json similarity index 100% rename from scripts/system-dependencies.json rename to moonraker/scripts/system-dependencies.json diff --git a/scripts/tag-release.sh b/moonraker/scripts/tag-release.sh similarity index 100% rename from scripts/tag-release.sh rename to moonraker/scripts/tag-release.sh diff --git a/scripts/uninstall-moonraker.sh b/moonraker/scripts/uninstall-moonraker.sh similarity index 100% rename from scripts/uninstall-moonraker.sh rename to moonraker/scripts/uninstall-moonraker.sh diff --git a/pdm_build.py b/pdm_build.py index 47f5f5e60..882760cff 100644 --- a/pdm_build.py +++ b/pdm_build.py @@ -83,16 +83,6 @@ def pdm_build_initialize(context: Context) -> None: data_path.mkdir(parents=True, exist_ok=True) if rinfo_data: data_path.joinpath("release_info").write_text(rinfo_data) - scripts_path: pathlib.Path = context.root.joinpath("scripts") - scripts_dest: pathlib.Path = data_path.joinpath("scripts") - scripts_dest.mkdir() - for item in scripts_path.iterdir(): - if item.name in ("__pycache__", "python_wheels"): - continue - if item.is_dir(): - shutil.copytree(str(item), str(scripts_dest.joinpath(item.name))) - else: - shutil.copy2(str(item), str(scripts_dest)) git_ignore = build_dir.joinpath(".gitignore") if git_ignore.is_file(): git_ignore.unlink() diff --git a/pyproject.toml b/pyproject.toml index 3356c146e..2f916147a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -67,13 +67,9 @@ write_template = "__version__ = '{}'\n" [tool.pdm.build] excludes = ["./**/.git", "moonraker/moonraker.py"] includes = ["moonraker"] -source-includes = ["scripts"] editable-backend = "path" custom-hook = "pdm_build.py" -[tool.pdm.build.wheel-data] -data = [{path = "share/moonraker/**/*", relative-to = "."}] - [project.scripts] moonraker = "moonraker.server:main" diff --git a/scripts b/scripts new file mode 120000 index 000000000..5a6b3706d --- /dev/null +++ b/scripts @@ -0,0 +1 @@ +moonraker/scripts \ No newline at end of file From 2860e033b23b1aeae2dece3e1e067f47de87ce9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filipe=20La=C3=ADns?= Date: Wed, 28 Aug 2024 03:47:28 +0100 Subject: [PATCH 2/2] rinfo: remove release_info file in the package data MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Filipe Laíns --- pdm_build.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pdm_build.py b/pdm_build.py index 882760cff..3108f0ab0 100644 --- a/pdm_build.py +++ b/pdm_build.py @@ -48,7 +48,6 @@ def pdm_build_initialize(context: Context) -> None: context.ensure_build_dir() proj_name: str = context.config.metadata['name'] build_dir = pathlib.Path(context.build_dir) - data_path = context.root.joinpath(f"share/{proj_name}") pkg_path = build_dir.joinpath(__package_name__) pkg_path.mkdir(parents=True, exist_ok=True) rinfo_path: pathlib.Path = pkg_path.joinpath("release_info") @@ -80,9 +79,6 @@ def pdm_build_initialize(context: Context) -> None: rinfo_data = rinfo_path.read_text() else: rinfo_data = "" - data_path.mkdir(parents=True, exist_ok=True) - if rinfo_data: - data_path.joinpath("release_info").write_text(rinfo_data) git_ignore = build_dir.joinpath(".gitignore") if git_ignore.is_file(): git_ignore.unlink()