From 850437db3da80607de6ef10289336b96ec79162a Mon Sep 17 00:00:00 2001 From: BryantHe Date: Mon, 6 Nov 2023 17:39:37 +0800 Subject: [PATCH] chore: switch to pdm from setuptools --- namekoplus/__init__.py | 1 - pyproject.toml | 7 ++----- src/namekoplus/__init__.py | 1 + {namekoplus => src/namekoplus}/chassis-agent/__init__.py | 0 .../chassis-agent/metric-configs/grafana.json.mako | 0 .../metric-configs/grafana_conf/config/grafana.ini | 0 .../grafana_conf/provisioning/dashboards/all.yaml | 0 .../grafana_conf/provisioning/datasources/all.yaml | 0 .../metric-configs/prometheus_conf/prometheus.yml | 0 .../chassis-agent/metric-configs/statsd_config.js | 0 .../chassis-agent/metric-configs/statsd_mapping.yml.mako | 0 .../chassis-agent/rabbitmq/docker-compose-rabbitmq.yml | 0 {namekoplus => src/namekoplus}/chassis/__init__.py | 0 {namekoplus => src/namekoplus}/chassis/chassis.py | 0 {namekoplus => src/namekoplus}/command.py | 0 {namekoplus => src/namekoplus}/templates/__init__.py | 0 {namekoplus => src/namekoplus}/templates/all/__init__.py | 0 {namekoplus => src/namekoplus}/templates/all/all_demo.py | 0 {namekoplus => src/namekoplus}/templates/all/config.yml | 0 {namekoplus => src/namekoplus}/templates/demo/__init__.py | 0 {namekoplus => src/namekoplus}/templates/demo/config.yml | 0 {namekoplus => src/namekoplus}/templates/demo/rpc_demo.py | 0 {namekoplus => src/namekoplus}/templates/event/__init__.py | 0 {namekoplus => src/namekoplus}/templates/event/config.yml | 0 .../namekoplus}/templates/event/events_demo.py | 0 {namekoplus => src/namekoplus}/templates/http/__init__.py | 0 {namekoplus => src/namekoplus}/templates/http/config.yml | 0 {namekoplus => src/namekoplus}/templates/http/http_demo.py | 0 {namekoplus => src/namekoplus}/templates/rpc/__init__.py | 0 {namekoplus => src/namekoplus}/templates/rpc/config.yml | 0 {namekoplus => src/namekoplus}/templates/rpc/rpc_demo.py | 0 {namekoplus => src/namekoplus}/templates/timer/__init__.py | 0 {namekoplus => src/namekoplus}/templates/timer/config.yml | 0 .../namekoplus}/templates/timer/timer_demo.py | 0 {namekoplus => src/namekoplus}/tests/__init__.py | 0 {namekoplus => src/namekoplus}/tests/unit/__init__.py | 0 {namekoplus => src/namekoplus}/tests/unit/test_service.py | 0 tests/__init__.py | 0 38 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 namekoplus/__init__.py create mode 100644 src/namekoplus/__init__.py rename {namekoplus => src/namekoplus}/chassis-agent/__init__.py (100%) rename {namekoplus => src/namekoplus}/chassis-agent/metric-configs/grafana.json.mako (100%) rename {namekoplus => src/namekoplus}/chassis-agent/metric-configs/grafana_conf/config/grafana.ini (100%) rename {namekoplus => src/namekoplus}/chassis-agent/metric-configs/grafana_conf/provisioning/dashboards/all.yaml (100%) rename {namekoplus => src/namekoplus}/chassis-agent/metric-configs/grafana_conf/provisioning/datasources/all.yaml (100%) rename {namekoplus => src/namekoplus}/chassis-agent/metric-configs/prometheus_conf/prometheus.yml (100%) rename {namekoplus => src/namekoplus}/chassis-agent/metric-configs/statsd_config.js (100%) rename {namekoplus => src/namekoplus}/chassis-agent/metric-configs/statsd_mapping.yml.mako (100%) rename {namekoplus => src/namekoplus}/chassis-agent/rabbitmq/docker-compose-rabbitmq.yml (100%) rename {namekoplus => src/namekoplus}/chassis/__init__.py (100%) rename {namekoplus => src/namekoplus}/chassis/chassis.py (100%) rename {namekoplus => src/namekoplus}/command.py (100%) rename {namekoplus => src/namekoplus}/templates/__init__.py (100%) rename {namekoplus => src/namekoplus}/templates/all/__init__.py (100%) rename {namekoplus => src/namekoplus}/templates/all/all_demo.py (100%) rename {namekoplus => src/namekoplus}/templates/all/config.yml (100%) rename {namekoplus => src/namekoplus}/templates/demo/__init__.py (100%) rename {namekoplus => src/namekoplus}/templates/demo/config.yml (100%) rename {namekoplus => src/namekoplus}/templates/demo/rpc_demo.py (100%) rename {namekoplus => src/namekoplus}/templates/event/__init__.py (100%) rename {namekoplus => src/namekoplus}/templates/event/config.yml (100%) rename {namekoplus => src/namekoplus}/templates/event/events_demo.py (100%) rename {namekoplus => src/namekoplus}/templates/http/__init__.py (100%) rename {namekoplus => src/namekoplus}/templates/http/config.yml (100%) rename {namekoplus => src/namekoplus}/templates/http/http_demo.py (100%) rename {namekoplus => src/namekoplus}/templates/rpc/__init__.py (100%) rename {namekoplus => src/namekoplus}/templates/rpc/config.yml (100%) rename {namekoplus => src/namekoplus}/templates/rpc/rpc_demo.py (100%) rename {namekoplus => src/namekoplus}/templates/timer/__init__.py (100%) rename {namekoplus => src/namekoplus}/templates/timer/config.yml (100%) rename {namekoplus => src/namekoplus}/templates/timer/timer_demo.py (100%) rename {namekoplus => src/namekoplus}/tests/__init__.py (100%) rename {namekoplus => src/namekoplus}/tests/unit/__init__.py (100%) rename {namekoplus => src/namekoplus}/tests/unit/test_service.py (100%) create mode 100644 tests/__init__.py diff --git a/namekoplus/__init__.py b/namekoplus/__init__.py deleted file mode 100644 index 47f7003..0000000 --- a/namekoplus/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from namekoplus.chassis.chassis import * \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index dd31e4e..23e2ddc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "namekoplus" -version = "0.5.2" +version = "0.5.3" description = "A lightweight Python distributed microservice solution" keywords = ["lightweight python distributed microservice solution"] readme = "README.md" @@ -27,11 +27,8 @@ dependencies = [ ] license = {text = "MIT"} -[pypi] -url = "https://upload.pypi.org/legacy/" - [project.urls] -Homepage = "" +"Homepage" = "https://github.com/Bryanthelol/namekoplus" "Source Code" = "https://github.com/Bryanthelol/namekoplus" "Bug Tracker" = "https://github.com/Bryanthelol/namekoplus/issues" diff --git a/src/namekoplus/__init__.py b/src/namekoplus/__init__.py new file mode 100644 index 0000000..12d4fbf --- /dev/null +++ b/src/namekoplus/__init__.py @@ -0,0 +1 @@ +from .chassis.chassis import * \ No newline at end of file diff --git a/namekoplus/chassis-agent/__init__.py b/src/namekoplus/chassis-agent/__init__.py similarity index 100% rename from namekoplus/chassis-agent/__init__.py rename to src/namekoplus/chassis-agent/__init__.py diff --git a/namekoplus/chassis-agent/metric-configs/grafana.json.mako b/src/namekoplus/chassis-agent/metric-configs/grafana.json.mako similarity index 100% rename from namekoplus/chassis-agent/metric-configs/grafana.json.mako rename to src/namekoplus/chassis-agent/metric-configs/grafana.json.mako diff --git a/namekoplus/chassis-agent/metric-configs/grafana_conf/config/grafana.ini b/src/namekoplus/chassis-agent/metric-configs/grafana_conf/config/grafana.ini similarity index 100% rename from namekoplus/chassis-agent/metric-configs/grafana_conf/config/grafana.ini rename to src/namekoplus/chassis-agent/metric-configs/grafana_conf/config/grafana.ini diff --git a/namekoplus/chassis-agent/metric-configs/grafana_conf/provisioning/dashboards/all.yaml b/src/namekoplus/chassis-agent/metric-configs/grafana_conf/provisioning/dashboards/all.yaml similarity index 100% rename from namekoplus/chassis-agent/metric-configs/grafana_conf/provisioning/dashboards/all.yaml rename to src/namekoplus/chassis-agent/metric-configs/grafana_conf/provisioning/dashboards/all.yaml diff --git a/namekoplus/chassis-agent/metric-configs/grafana_conf/provisioning/datasources/all.yaml b/src/namekoplus/chassis-agent/metric-configs/grafana_conf/provisioning/datasources/all.yaml similarity index 100% rename from namekoplus/chassis-agent/metric-configs/grafana_conf/provisioning/datasources/all.yaml rename to src/namekoplus/chassis-agent/metric-configs/grafana_conf/provisioning/datasources/all.yaml diff --git a/namekoplus/chassis-agent/metric-configs/prometheus_conf/prometheus.yml b/src/namekoplus/chassis-agent/metric-configs/prometheus_conf/prometheus.yml similarity index 100% rename from namekoplus/chassis-agent/metric-configs/prometheus_conf/prometheus.yml rename to src/namekoplus/chassis-agent/metric-configs/prometheus_conf/prometheus.yml diff --git a/namekoplus/chassis-agent/metric-configs/statsd_config.js b/src/namekoplus/chassis-agent/metric-configs/statsd_config.js similarity index 100% rename from namekoplus/chassis-agent/metric-configs/statsd_config.js rename to src/namekoplus/chassis-agent/metric-configs/statsd_config.js diff --git a/namekoplus/chassis-agent/metric-configs/statsd_mapping.yml.mako b/src/namekoplus/chassis-agent/metric-configs/statsd_mapping.yml.mako similarity index 100% rename from namekoplus/chassis-agent/metric-configs/statsd_mapping.yml.mako rename to src/namekoplus/chassis-agent/metric-configs/statsd_mapping.yml.mako diff --git a/namekoplus/chassis-agent/rabbitmq/docker-compose-rabbitmq.yml b/src/namekoplus/chassis-agent/rabbitmq/docker-compose-rabbitmq.yml similarity index 100% rename from namekoplus/chassis-agent/rabbitmq/docker-compose-rabbitmq.yml rename to src/namekoplus/chassis-agent/rabbitmq/docker-compose-rabbitmq.yml diff --git a/namekoplus/chassis/__init__.py b/src/namekoplus/chassis/__init__.py similarity index 100% rename from namekoplus/chassis/__init__.py rename to src/namekoplus/chassis/__init__.py diff --git a/namekoplus/chassis/chassis.py b/src/namekoplus/chassis/chassis.py similarity index 100% rename from namekoplus/chassis/chassis.py rename to src/namekoplus/chassis/chassis.py diff --git a/namekoplus/command.py b/src/namekoplus/command.py similarity index 100% rename from namekoplus/command.py rename to src/namekoplus/command.py diff --git a/namekoplus/templates/__init__.py b/src/namekoplus/templates/__init__.py similarity index 100% rename from namekoplus/templates/__init__.py rename to src/namekoplus/templates/__init__.py diff --git a/namekoplus/templates/all/__init__.py b/src/namekoplus/templates/all/__init__.py similarity index 100% rename from namekoplus/templates/all/__init__.py rename to src/namekoplus/templates/all/__init__.py diff --git a/namekoplus/templates/all/all_demo.py b/src/namekoplus/templates/all/all_demo.py similarity index 100% rename from namekoplus/templates/all/all_demo.py rename to src/namekoplus/templates/all/all_demo.py diff --git a/namekoplus/templates/all/config.yml b/src/namekoplus/templates/all/config.yml similarity index 100% rename from namekoplus/templates/all/config.yml rename to src/namekoplus/templates/all/config.yml diff --git a/namekoplus/templates/demo/__init__.py b/src/namekoplus/templates/demo/__init__.py similarity index 100% rename from namekoplus/templates/demo/__init__.py rename to src/namekoplus/templates/demo/__init__.py diff --git a/namekoplus/templates/demo/config.yml b/src/namekoplus/templates/demo/config.yml similarity index 100% rename from namekoplus/templates/demo/config.yml rename to src/namekoplus/templates/demo/config.yml diff --git a/namekoplus/templates/demo/rpc_demo.py b/src/namekoplus/templates/demo/rpc_demo.py similarity index 100% rename from namekoplus/templates/demo/rpc_demo.py rename to src/namekoplus/templates/demo/rpc_demo.py diff --git a/namekoplus/templates/event/__init__.py b/src/namekoplus/templates/event/__init__.py similarity index 100% rename from namekoplus/templates/event/__init__.py rename to src/namekoplus/templates/event/__init__.py diff --git a/namekoplus/templates/event/config.yml b/src/namekoplus/templates/event/config.yml similarity index 100% rename from namekoplus/templates/event/config.yml rename to src/namekoplus/templates/event/config.yml diff --git a/namekoplus/templates/event/events_demo.py b/src/namekoplus/templates/event/events_demo.py similarity index 100% rename from namekoplus/templates/event/events_demo.py rename to src/namekoplus/templates/event/events_demo.py diff --git a/namekoplus/templates/http/__init__.py b/src/namekoplus/templates/http/__init__.py similarity index 100% rename from namekoplus/templates/http/__init__.py rename to src/namekoplus/templates/http/__init__.py diff --git a/namekoplus/templates/http/config.yml b/src/namekoplus/templates/http/config.yml similarity index 100% rename from namekoplus/templates/http/config.yml rename to src/namekoplus/templates/http/config.yml diff --git a/namekoplus/templates/http/http_demo.py b/src/namekoplus/templates/http/http_demo.py similarity index 100% rename from namekoplus/templates/http/http_demo.py rename to src/namekoplus/templates/http/http_demo.py diff --git a/namekoplus/templates/rpc/__init__.py b/src/namekoplus/templates/rpc/__init__.py similarity index 100% rename from namekoplus/templates/rpc/__init__.py rename to src/namekoplus/templates/rpc/__init__.py diff --git a/namekoplus/templates/rpc/config.yml b/src/namekoplus/templates/rpc/config.yml similarity index 100% rename from namekoplus/templates/rpc/config.yml rename to src/namekoplus/templates/rpc/config.yml diff --git a/namekoplus/templates/rpc/rpc_demo.py b/src/namekoplus/templates/rpc/rpc_demo.py similarity index 100% rename from namekoplus/templates/rpc/rpc_demo.py rename to src/namekoplus/templates/rpc/rpc_demo.py diff --git a/namekoplus/templates/timer/__init__.py b/src/namekoplus/templates/timer/__init__.py similarity index 100% rename from namekoplus/templates/timer/__init__.py rename to src/namekoplus/templates/timer/__init__.py diff --git a/namekoplus/templates/timer/config.yml b/src/namekoplus/templates/timer/config.yml similarity index 100% rename from namekoplus/templates/timer/config.yml rename to src/namekoplus/templates/timer/config.yml diff --git a/namekoplus/templates/timer/timer_demo.py b/src/namekoplus/templates/timer/timer_demo.py similarity index 100% rename from namekoplus/templates/timer/timer_demo.py rename to src/namekoplus/templates/timer/timer_demo.py diff --git a/namekoplus/tests/__init__.py b/src/namekoplus/tests/__init__.py similarity index 100% rename from namekoplus/tests/__init__.py rename to src/namekoplus/tests/__init__.py diff --git a/namekoplus/tests/unit/__init__.py b/src/namekoplus/tests/unit/__init__.py similarity index 100% rename from namekoplus/tests/unit/__init__.py rename to src/namekoplus/tests/unit/__init__.py diff --git a/namekoplus/tests/unit/test_service.py b/src/namekoplus/tests/unit/test_service.py similarity index 100% rename from namekoplus/tests/unit/test_service.py rename to src/namekoplus/tests/unit/test_service.py diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 0000000..e69de29