chore: switch to pdm from setuptools \5

.github/workflows/python-publish.yml

@@ -12,28 +12,41 @@ on:
   release:
     types: [published]
 
-permissions:
-  contents: read
+# permissions:
+#   contents: read
 
 jobs:
-  deploy:
+  # deploy:
 
+  #   runs-on: ubuntu-latest
+
+    # steps:
+    # - uses: actions/checkout@v3
+    # - name: Set up Python
+    #   uses: actions/setup-python@v3
+    #   with:
+    #     python-version: '3.x'
+    # - name: Install dependencies
+    #   run: |
+    #     python -m pip install --upgrade pip
+    #     pip install build
+    # - name: Build package
+    #   run: python -m build
+    # - name: Publish package
+    #   uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
+      # with:
+      #   user: ${{ secrets.PYPI_API_USER }}
+      #   password: ${{ secrets.PYPI_API_PASSWORD }}
+
+  pypi-publish:
+    name: upload release to PyPI
     runs-on: ubuntu-latest
-
+    permissions:
+      contents: read
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python
-      uses: actions/setup-python@v3
-      with:
-        python-version: '3.x'
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install build
-    - name: Build package
-      run: python -m build
-    - name: Publish package
-      uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
-      with:
-        user: ${{ secrets.PYPI_API_USER }}
-        password: ${{ secrets.PYPI_API_PASSWORD }}
+      - uses: actions/checkout@v3
+
+      - uses: pdm-project/setup-pdm@v3
+
+      - name: Publish package distributions to PyPI
+        run: pdm publish -u ${{ secrets.PYPI_API_USER }} -P ${{ secrets.PYPI_API_PASSWORD }}

.gitignore

@@ -108,6 +108,8 @@ ipython_config.py
 #   in version control.
 #   https://pdm.fming.dev/#use-with-ide
 .pdm.toml
+.pdm-python
+.pdm-build/
 
 # PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
 __pypackages__/

namekoplus/templates/all/config.yml

@@ -2,7 +2,8 @@ AMQP_URI: pyamqp://${RABBIT_USER:admin}:${RABBIT_PASSWORD:admin}@${RABBIT_HOST:l
 WEB_SERVER_ADDRESS: '0.0.0.0:8000'
 RPC_EXCHANGE: 'nameko-rpc'
 
-max_workers: 10
+max_workers: 20
+PREFETCH_COUNT: 20
 parent_calls_tracked: 20
 
 LOGGING:

namekoplus/templates/demo/config.yml

@@ -1,5 +1,6 @@
 AMQP_URI: pyamqp://${RABBIT_USER:admin}:${RABBIT_PASSWORD:admin}@${RABBIT_HOST:localhost}:${RABBIT_PORT:5672}/
 RPC_EXCHANGE: 'nameko-rpc'
 
-max_workers: 10
+max_workers: 20
+PREFETCH_COUNT: 20
 parent_calls_tracked: 20

namekoplus/templates/event/config.yml

@@ -1,7 +1,8 @@
 AMQP_URI: pyamqp://${RABBIT_USER:admin}:${RABBIT_PASSWORD:admin}@${RABBIT_HOST:localhost}:${RABBIT_PORT:5672}/
 RPC_EXCHANGE: 'nameko-rpc'
 
-max_workers: 10
+max_workers: 20
+PREFETCH_COUNT: 20
 parent_calls_tracked: 20
 
 LOGGING:

namekoplus/templates/http/config.yml

@@ -2,7 +2,8 @@ AMQP_URI: pyamqp://${RABBIT_USER:admin}:${RABBIT_PASSWORD:admin}@${RABBIT_HOST:l
 WEB_SERVER_ADDRESS: '0.0.0.0:8000'
 RPC_EXCHANGE: 'nameko-rpc'
 
-max_workers: 10
+max_workers: 20
+PREFETCH_COUNT: 20
 parent_calls_tracked: 20
 
 LOGGING:

namekoplus/templates/rpc/config.yml

@@ -1,7 +1,8 @@
 AMQP_URI: pyamqp://${RABBIT_USER:admin}:${RABBIT_PASSWORD:admin}@${RABBIT_HOST:localhost}:${RABBIT_PORT:5672}/
 RPC_EXCHANGE: 'nameko-rpc'
 
-max_workers: 10
+max_workers: 20
+PREFETCH_COUNT: 20
 parent_calls_tracked: 20
 
 LOGGING:

namekoplus/templates/timer/config.yml

@@ -1,7 +1,8 @@
 AMQP_URI: pyamqp://${RABBIT_USER:admin}:${RABBIT_PASSWORD:admin}@${RABBIT_HOST:localhost}:${RABBIT_PORT:5672}/
 RPC_EXCHANGE: 'nameko-rpc'
 
-max_workers: 10
+max_workers: 20
+PREFETCH_COUNT: 20
 parent_calls_tracked: 20
 
 LOGGING:

pyproject.toml

@@ -0,0 +1,71 @@
+
+[project]
+name = "namekoplus"
+version = "0.5.2"
+description = "A lightweight Python distributed microservice solution"
+keywords = ["lightweight python distributed microservice solution"]
+readme = "README.md"
+authors = [
+    {name = "Bryant He", email = "bryantsisu@qq.com"},
+]
+classifiers = [
+    "Development Status :: 3 - Alpha",
+    "Environment :: Web Environment",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Programming Language :: Python :: 3",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+]
+requires-python = ">=3.8, <4"
+dependencies = [
+    "click==8.1.5",
+    "mako==1.2.4",
+    "nameko==3.0.0rc11",
+    "pytest==7.4.0",
+    "python-on-whales==0.65.0",
+    "shortuuid==1.0.11",
+]
+license = {text = "MIT"}
+
+[pypi]
+url = "https://upload.pypi.org/legacy/"
+
+[project.urls]
+Homepage = ""
+"Source Code" = "https://github.com/Bryanthelol/namekoplus"
+"Bug Tracker" = "https://github.com/Bryanthelol/namekoplus/issues"
+
+[project.optional-dependencies]
+ha = [
+    "cachetools==5.3.0",
+    "circuitbreaker==2.0.0",
+    "tenacity==8.2.2",
+]
+ob = [
+    "nameko-sentry==1.0.0",
+    "nameko-tracer==1.4.0",
+]
+log = [
+    "logstash_formatter==0.5.17",
+    "loguru==0.7.2",
+]
+metric = [
+    "statsd==4.0.1",
+]
+schema = [
+    "marshmallow==3.20.1",
+]
+security = [
+    "cryptography",
+]
+dev = [
+    "environs==9.5.0",
+    "python-dotenv==1.0.0",
+]
+
+[project.scripts]
+namekoplus = "namekoplus.command:cli"
+
+[build-system]
+requires = ["pdm-backend"]
+build-backend = "pdm.backend"

setup.py

@@ -1,70 +0,0 @@
-from setuptools import setup, find_packages
-from codecs import open
-from os import path
-
-here = path.abspath(path.dirname(__file__))
-
-with open(path.join(here, 'README.md'), encoding='utf-8') as f:
-    long_description = f.read()
-
-setup(
-    name='namekoplus',
-    version='0.4.26',
-    description='A lightweight Python distributed microservice solution',
-    long_description=long_description,
-    long_description_content_type='text/markdown',
-    url='',
-    project_urls={
-        'Documentation': 'https://doc.bearcatlog.com/',
-        'Source Code': 'https://github.com/Bryanthelol/namekoplus',
-        'Bug Tracker': 'https://github.com/Bryanthelol/namekoplus/issues',
-    },
-    author='Bryant He',
-    author_email='bryantsisu@qq.com',
-
-    license='MIT',
-
-    classifiers=[
-        'Development Status :: 3 - Alpha',
-        'Environment :: Web Environment',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python :: 3',
-        'Topic :: Software Development :: Libraries :: Python Modules',
-    ],
-    platforms='any',
-    python_requires='>=3.8, <4',
-
-    keywords='lightweight python distributed microservice solution',
-
-    packages=find_packages(exclude=['contrib', 'docs', 'tests']),
-    include_package_data=True,
-    data_files=['README.md'],
-
-    entry_points={
-        'console_scripts': [
-            'namekoplus = namekoplus.command:cli',
-        ],
-    },
-
-    install_requires=[
-        'nameko==3.0.0rc11',
-        'click==8.1.5',
-        'python-on-whales==0.64.0',
-        'pytest==7.4.0',
-        'mako==1.2.4',
-        'shortuuid==1.0.11'
-    ],
-    extras_require={
-        'ha': ['tenacity==8.2.2',
-               'cachetools==5.3.0',
-               'circuitbreaker==2.0.0',
-               'logstash_formatter==0.5.17'],
-        'ob': ['statsd==4.0.1',
-               'nameko-sentry==1.0.0',
-               'nameko-tracer==1.4.0'],
-        'schema': ['marshmallow==3.20.1'],
-        'security': ['cryptography'],
-        'dev': ['environs==9.5.0']
-    },
-)