From 4726cbf7ec372e4bf4600a1614878cb3c13243b4 Mon Sep 17 00:00:00 2001 From: Fedor Lyanguzov Date: Sun, 4 Jan 2026 12:01:55 +0300 Subject: [PATCH] Move project to src structure --- README.md | 3 --- pyproject.toml | 19 ++++++++++--------- {vpn_manager => src/wcm}/__init__.py | 0 {vpn_manager => src/wcm}/__main__.py | 0 .../wcm/archive}/_test_cidr4_merger.py | 0 {archive => src/wcm/archive}/cidr4_merger.py | 0 .../archive}/insurance_functions_example.md | 0 .../wcm}/cidr4_merge/README.md | 0 .../wcm}/cidr4_merge/__init__.py | 0 .../wcm}/cidr4_merge/cidr4_merger.py | 0 {vpn_manager => src/wcm}/cidr4_merge/fast.py | 0 .../wcm}/cidr4_merge/precise.py | 0 {vpn_manager => src/wcm}/cidr4_merge/util.py | 0 make_configs.py => src/wcm/make_configs.py | 0 uv.lock | 2 +- 15 files changed, 11 insertions(+), 13 deletions(-) rename {vpn_manager => src/wcm}/__init__.py (100%) rename {vpn_manager => src/wcm}/__main__.py (100%) rename {archive => src/wcm/archive}/_test_cidr4_merger.py (100%) rename {archive => src/wcm/archive}/cidr4_merger.py (100%) rename {archive => src/wcm/archive}/insurance_functions_example.md (100%) rename {vpn_manager => src/wcm}/cidr4_merge/README.md (100%) rename {vpn_manager => src/wcm}/cidr4_merge/__init__.py (100%) rename {vpn_manager => src/wcm}/cidr4_merge/cidr4_merger.py (100%) rename {vpn_manager => src/wcm}/cidr4_merge/fast.py (100%) rename {vpn_manager => src/wcm}/cidr4_merge/precise.py (100%) rename {vpn_manager => src/wcm}/cidr4_merge/util.py (100%) rename make_configs.py => src/wcm/make_configs.py (100%) diff --git a/README.md b/README.md index 13d9aa5..ca67a9b 100644 --- a/README.md +++ b/README.md @@ -56,9 +56,6 @@ black wcm Test runs: ```bash -# package -$ python -m wcm -run # script declared in pyproject.toml $ example run diff --git a/pyproject.toml b/pyproject.toml index 10b70d5..83c963b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,12 +1,5 @@ -[build-system] -requires = ["setuptools>=61"] -build-backend = "setuptools.build_meta" - -[tool.setuptools] -packages = ["vpn_manager"] - [project] -name = "vpn-manager" +name = "wcm" description = "Manage WireGuard VPN peers (both server and clients)" version = "2024.12.0a" license = {file = "LICENSE"} @@ -25,4 +18,12 @@ dev = [ ] [project.scripts] -example = "vpn_manager.__main__:main" +example = "wcm.__main__:main" + +[build-system] +requires = ["uv_build>=0.9.21,<0.10.0"] +build-backend = "uv_build" + +[tool.setuptools] +packages = ["wcm"] + diff --git a/vpn_manager/__init__.py b/src/wcm/__init__.py similarity index 100% rename from vpn_manager/__init__.py rename to src/wcm/__init__.py diff --git a/vpn_manager/__main__.py b/src/wcm/__main__.py similarity index 100% rename from vpn_manager/__main__.py rename to src/wcm/__main__.py diff --git a/archive/_test_cidr4_merger.py b/src/wcm/archive/_test_cidr4_merger.py similarity index 100% rename from archive/_test_cidr4_merger.py rename to src/wcm/archive/_test_cidr4_merger.py diff --git a/archive/cidr4_merger.py b/src/wcm/archive/cidr4_merger.py similarity index 100% rename from archive/cidr4_merger.py rename to src/wcm/archive/cidr4_merger.py diff --git a/archive/insurance_functions_example.md b/src/wcm/archive/insurance_functions_example.md similarity index 100% rename from archive/insurance_functions_example.md rename to src/wcm/archive/insurance_functions_example.md diff --git a/vpn_manager/cidr4_merge/README.md b/src/wcm/cidr4_merge/README.md similarity index 100% rename from vpn_manager/cidr4_merge/README.md rename to src/wcm/cidr4_merge/README.md diff --git a/vpn_manager/cidr4_merge/__init__.py b/src/wcm/cidr4_merge/__init__.py similarity index 100% rename from vpn_manager/cidr4_merge/__init__.py rename to src/wcm/cidr4_merge/__init__.py diff --git a/vpn_manager/cidr4_merge/cidr4_merger.py b/src/wcm/cidr4_merge/cidr4_merger.py similarity index 100% rename from vpn_manager/cidr4_merge/cidr4_merger.py rename to src/wcm/cidr4_merge/cidr4_merger.py diff --git a/vpn_manager/cidr4_merge/fast.py b/src/wcm/cidr4_merge/fast.py similarity index 100% rename from vpn_manager/cidr4_merge/fast.py rename to src/wcm/cidr4_merge/fast.py diff --git a/vpn_manager/cidr4_merge/precise.py b/src/wcm/cidr4_merge/precise.py similarity index 100% rename from vpn_manager/cidr4_merge/precise.py rename to src/wcm/cidr4_merge/precise.py diff --git a/vpn_manager/cidr4_merge/util.py b/src/wcm/cidr4_merge/util.py similarity index 100% rename from vpn_manager/cidr4_merge/util.py rename to src/wcm/cidr4_merge/util.py diff --git a/make_configs.py b/src/wcm/make_configs.py similarity index 100% rename from make_configs.py rename to src/wcm/make_configs.py diff --git a/uv.lock b/uv.lock index 8ea96f4..d658350 100644 --- a/uv.lock +++ b/uv.lock @@ -605,7 +605,7 @@ wheels = [ ] [[package]] -name = "vpn-manager" +name = "wcm" version = "2024.12.0a0" source = { editable = "." } dependencies = [