From a0d284f308ca5c895385f5ab413067985cbb6c41 Mon Sep 17 00:00:00 2001 From: shenjack <3695888@qq.com> Date: Sat, 25 Nov 2023 03:18:18 +0800 Subject: [PATCH] rebase folder --- docs/change_log.md | 12 +++++++++ pyproject.toml | 25 +++++++++++++------ {lib_not_dr => src/lib_not_dr}/__init__.py | 0 .../lib_not_dr}/command/__init__.py | 0 .../lib_not_dr}/command/data.py | 0 .../lib_not_dr}/command/descriptor.py | 0 .../lib_not_dr}/command/exception.py | 0 .../lib_not_dr}/command/nodes.py | 0 .../lib_not_dr}/logger/__init__.py | 0 .../lib_not_dr}/logger/formatter/__init__.py | 0 .../lib_not_dr}/logger/formatter/colors.py | 0 .../lib_not_dr}/logger/logger.py | 0 .../lib_not_dr}/logger/outstream.py | 0 .../lib_not_dr}/logger/structer.md | 0 .../lib_not_dr}/logger/structure.py | 0 .../lib_not_dr}/nuitka/__init__.py | 0 .../lib_not_dr}/nuitka/compile.py | 0 .../lib_not_dr}/nuitka/parse.py | 0 .../lib_not_dr}/types/__init__.py | 0 .../lib_not_dr}/types/options.py | 0 .../lib_not_dr}/types/version.py | 0 {lndl_nuitka => src/lndl_nuitka}/__init__.py | 0 {lndl_nuitka => src/lndl_nuitka}/__main__.py | 0 23 files changed, 30 insertions(+), 7 deletions(-) rename {lib_not_dr => src/lib_not_dr}/__init__.py (100%) rename {lib_not_dr => src/lib_not_dr}/command/__init__.py (100%) rename {lib_not_dr => src/lib_not_dr}/command/data.py (100%) rename {lib_not_dr => src/lib_not_dr}/command/descriptor.py (100%) rename {lib_not_dr => src/lib_not_dr}/command/exception.py (100%) rename {lib_not_dr => src/lib_not_dr}/command/nodes.py (100%) rename {lib_not_dr => src/lib_not_dr}/logger/__init__.py (100%) rename {lib_not_dr => src/lib_not_dr}/logger/formatter/__init__.py (100%) rename {lib_not_dr => src/lib_not_dr}/logger/formatter/colors.py (100%) rename {lib_not_dr => src/lib_not_dr}/logger/logger.py (100%) rename {lib_not_dr => src/lib_not_dr}/logger/outstream.py (100%) rename {lib_not_dr => src/lib_not_dr}/logger/structer.md (100%) rename {lib_not_dr => src/lib_not_dr}/logger/structure.py (100%) rename {lib_not_dr => src/lib_not_dr}/nuitka/__init__.py (100%) rename {lib_not_dr => src/lib_not_dr}/nuitka/compile.py (100%) rename {lib_not_dr => src/lib_not_dr}/nuitka/parse.py (100%) rename {lib_not_dr => src/lib_not_dr}/types/__init__.py (100%) rename {lib_not_dr => src/lib_not_dr}/types/options.py (100%) rename {lib_not_dr => src/lib_not_dr}/types/version.py (100%) rename {lndl_nuitka => src/lndl_nuitka}/__init__.py (100%) rename {lndl_nuitka => src/lndl_nuitka}/__main__.py (100%) diff --git a/docs/change_log.md b/docs/change_log.md index ab89d2c..eef3894 100644 --- a/docs/change_log.md +++ b/docs/change_log.md @@ -1,5 +1,17 @@ # Change log / 更新日志 +## 0.2.0-beta.0/1 + +### 重构 + +- 重构了文件目录结构 + - 保证 `setuptools` 可以正常工作 + +### lndl-nuitka + +- 添加了脚本 `lndl-nuitka` + - 用于解析 `pyproject.toml` 中的 `tool.lndl.nuitka` 部分 + ## 0.2.0-alpha0 ### Logger diff --git a/pyproject.toml b/pyproject.toml index e95d111..230fb6b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,12 +26,24 @@ classifiers = [ license = { file = "LICENSE" } dynamic = ["version"] -# [build-system] -# requires = ["setuptools>=61.0"] -# build-backend = "setuptools.build_meta" +[build-system] +requires = ["setuptools>=61.0"] +build-backend = "setuptools.build_meta" -[tool.setuptools] -packages = ["lib_not_dr", "lndl_nuitka"] +#[tool.setuptools] +#packages = ["lib_not_dr", "lndl_nuitka"] + +#[tool.setuptools.packages.find] +#namespaces = false +#include = [ +# "lib_not_dr", +# "lndl_nuitka" +#] +#where = ["."] + +#[tool.setuptools.package-dir] +#lib_not_dr = "lib_not_dr" +#lndl_nuitka = "lndl_nuitka" [tool.setuptools.dynamic] version = { attr = "lib_not_dr.__version__"} @@ -48,6 +60,5 @@ lndl_nuitka = "lndl_nuitka:main" target-version = "py38" line-length = 150 src = [ - "lib_not_dr", - "lndl" + "src", ] diff --git a/lib_not_dr/__init__.py b/src/lib_not_dr/__init__.py similarity index 100% rename from lib_not_dr/__init__.py rename to src/lib_not_dr/__init__.py diff --git a/lib_not_dr/command/__init__.py b/src/lib_not_dr/command/__init__.py similarity index 100% rename from lib_not_dr/command/__init__.py rename to src/lib_not_dr/command/__init__.py diff --git a/lib_not_dr/command/data.py b/src/lib_not_dr/command/data.py similarity index 100% rename from lib_not_dr/command/data.py rename to src/lib_not_dr/command/data.py diff --git a/lib_not_dr/command/descriptor.py b/src/lib_not_dr/command/descriptor.py similarity index 100% rename from lib_not_dr/command/descriptor.py rename to src/lib_not_dr/command/descriptor.py diff --git a/lib_not_dr/command/exception.py b/src/lib_not_dr/command/exception.py similarity index 100% rename from lib_not_dr/command/exception.py rename to src/lib_not_dr/command/exception.py diff --git a/lib_not_dr/command/nodes.py b/src/lib_not_dr/command/nodes.py similarity index 100% rename from lib_not_dr/command/nodes.py rename to src/lib_not_dr/command/nodes.py diff --git a/lib_not_dr/logger/__init__.py b/src/lib_not_dr/logger/__init__.py similarity index 100% rename from lib_not_dr/logger/__init__.py rename to src/lib_not_dr/logger/__init__.py diff --git a/lib_not_dr/logger/formatter/__init__.py b/src/lib_not_dr/logger/formatter/__init__.py similarity index 100% rename from lib_not_dr/logger/formatter/__init__.py rename to src/lib_not_dr/logger/formatter/__init__.py diff --git a/lib_not_dr/logger/formatter/colors.py b/src/lib_not_dr/logger/formatter/colors.py similarity index 100% rename from lib_not_dr/logger/formatter/colors.py rename to src/lib_not_dr/logger/formatter/colors.py diff --git a/lib_not_dr/logger/logger.py b/src/lib_not_dr/logger/logger.py similarity index 100% rename from lib_not_dr/logger/logger.py rename to src/lib_not_dr/logger/logger.py diff --git a/lib_not_dr/logger/outstream.py b/src/lib_not_dr/logger/outstream.py similarity index 100% rename from lib_not_dr/logger/outstream.py rename to src/lib_not_dr/logger/outstream.py diff --git a/lib_not_dr/logger/structer.md b/src/lib_not_dr/logger/structer.md similarity index 100% rename from lib_not_dr/logger/structer.md rename to src/lib_not_dr/logger/structer.md diff --git a/lib_not_dr/logger/structure.py b/src/lib_not_dr/logger/structure.py similarity index 100% rename from lib_not_dr/logger/structure.py rename to src/lib_not_dr/logger/structure.py diff --git a/lib_not_dr/nuitka/__init__.py b/src/lib_not_dr/nuitka/__init__.py similarity index 100% rename from lib_not_dr/nuitka/__init__.py rename to src/lib_not_dr/nuitka/__init__.py diff --git a/lib_not_dr/nuitka/compile.py b/src/lib_not_dr/nuitka/compile.py similarity index 100% rename from lib_not_dr/nuitka/compile.py rename to src/lib_not_dr/nuitka/compile.py diff --git a/lib_not_dr/nuitka/parse.py b/src/lib_not_dr/nuitka/parse.py similarity index 100% rename from lib_not_dr/nuitka/parse.py rename to src/lib_not_dr/nuitka/parse.py diff --git a/lib_not_dr/types/__init__.py b/src/lib_not_dr/types/__init__.py similarity index 100% rename from lib_not_dr/types/__init__.py rename to src/lib_not_dr/types/__init__.py diff --git a/lib_not_dr/types/options.py b/src/lib_not_dr/types/options.py similarity index 100% rename from lib_not_dr/types/options.py rename to src/lib_not_dr/types/options.py diff --git a/lib_not_dr/types/version.py b/src/lib_not_dr/types/version.py similarity index 100% rename from lib_not_dr/types/version.py rename to src/lib_not_dr/types/version.py diff --git a/lndl_nuitka/__init__.py b/src/lndl_nuitka/__init__.py similarity index 100% rename from lndl_nuitka/__init__.py rename to src/lndl_nuitka/__init__.py diff --git a/lndl_nuitka/__main__.py b/src/lndl_nuitka/__main__.py similarity index 100% rename from lndl_nuitka/__main__.py rename to src/lndl_nuitka/__main__.py