introduced pyproject.toml

Signed-off-by: iripiri <[email protected]>

Author: iripiri

Dockerfile

@@ -1,12 +1,20 @@
-FROM python:3.11
+# build stage
+FROM python:3.11 AS builder
 
-COPY requirements.txt /tmp
-RUN pip3 install -r /tmp/requirements.txt
+WORKDIR /build
+COPY . .
 
-COPY . /tmp/controller
-RUN cd /tmp/controller && \
-	python3 setup.py sdist && \
-	pip3 install dist/*.tar.gz && \
-	rm -rf /tmp/controller
+COPY requirements.txt /tmp/
+RUN pip install --no-cache-dir -r /tmp/requirements.txt
 
-ENTRYPOINT [ "villas-controller" ]
+RUN python3 setup.py sdist && \
+    pip install dist/*.tar.gz --target /install
+
+# minimal runtime image
+FROM python:3.11-slim AS runtime
+
+COPY --from=builder /install /usr/local/lib/python3.11/site-packages
+COPY etc/*.json etc/*.yaml /etc/villas/controller/
+COPY villas-controller.service /etc/systemd/system/
+
+ENTRYPOINT ["villas-controller"]

pyproject.toml

@@ -0,0 +1,40 @@
+[build-system]
+requires = ["setuptools>=61", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "villas-controller"
+dynamic = ["version"]
+description = "A controller/orchestration API for real-time power system simulators"
+readme = "README.md"
+requires-python = ">=3.7"
+authors = [
+    { name="Steffen Vogel", email="[email protected]" }
+]
+dependencies = [
+    "dotmap",
+    "kombu",
+    "termcolor",
+    "psutil",
+    "requests",
+    "villas-node>=0.10.2",
+    "kubernetes",
+    "xdg",
+    "PyYAML",
+    "tornado",
+    "jsonschema>=4.1.0",
+    "pyusb"
+]
+
+[project.license]
+text = "Apache-2.0"
+
+[tool.setuptools.dynamic]
+version = { attr = "villas.controller.__version__" }
+
+[tool.setuptools.packages.find]
+include = ["villas*"]
+
+[project.scripts]
+villas-controller = "villas.controller.main:main"
+villas-ctl = "villas.controller.main:main"

setup.py

@@ -1,69 +1,9 @@
-from setuptools import setup, find_namespace_packages
+from setuptools import setup
 from glob import glob
 
-import os
-import re
-
-
-def get_version():
-    here = os.path.abspath(os.path.dirname(__file__))
-    init_file = os.path.join(here, "villas", "controller", "__init__.py")
-
-    with open(init_file, "r") as f:
-        content = f.read()
-
-    match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]", content, re.M)
-    if match:
-        return match.group(1)
-
-    raise RuntimeError("Version not found")
-
-
-with open('README.md') as f:
-    long_description = f.read()
-
 setup(
-    name='villas-controller',
-    version=get_version(),
-    description='A controller/orchestration API for real-time '
-                'power system simulators',
-    long_description=long_description,
-    long_description_content_type='text/markdown',
-    url='https://www.fein-aachen.org/projects/villas-controller/',
-    author='Steffen Vogel',
-    author_email='[email protected]',
-    license='Apache License 2.0',
-    keywords='simulation controller villas',
-    classifiers=[
-        'Development Status :: 3 - Alpha',
-        'License :: OSI Approved :: Apache Software License',
-        'Programming Language :: Python :: 3'
-    ],
-    packages=find_namespace_packages(include=['villas.*']),
-    install_requires=[
-        'dotmap',
-        'kombu',
-        'termcolor',
-        'psutil',
-        'requests',
-        'villas-node>=0.10.2',
-        'kubernetes',
-        'xdg',
-        'PyYAML',
-        'tornado',
-        'jsonschema>=4.1.0',
-        'psutil',
-        'pyusb'
-    ],
     data_files=[
         ('/etc/villas/controller', glob('etc/*.{json,yaml}')),
         ('/etc/systemd/system', ['villas-controller.service'])
-    ],
-    entry_points={
-        'console_scripts': [
-            'villas-ctl=villas.controller.main:main',
-            'villas-controller=villas.controller.main:main'
-        ],
-    },
-    include_package_data=True
+    ]
 )

villas/controller/__init__.py

@@ -1 +1 @@
-__version__ = "0.4.0"
+__version__ = "0.4.1"