From 71f0432270ad067ffbb3f23639a6c1d533f0e7ce Mon Sep 17 00:00:00 2001 From: John Freeman Date: Sat, 20 Sep 2025 14:11:20 -0500 Subject: [PATCH 1/2] JCF: Issue #6: switch over to pyproject.toml. Note that documentation still needs to be sorted out --- docs/README.md | 1 + pyproject.toml | 31 +++++++++++++++++++++++++++++++ requirements.txt | 7 ------- setup.cfg | 24 ------------------------ setup.py | 13 ------------- src/elisa_client_api/__init__.py | 2 +- 6 files changed, 33 insertions(+), 45 deletions(-) create mode 100644 docs/README.md create mode 100644 pyproject.toml delete mode 100644 requirements.txt delete mode 100644 setup.cfg delete mode 100644 setup.py diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 0000000..b153340 --- /dev/null +++ b/docs/README.md @@ -0,0 +1 @@ +JCF, Sep-20-2025: this file doesn't yet contain info about `elisa_client_api`; please see https://github.com/DUNE-DAQ/elisa_client_api/tree/develop/doc for more diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..2427146 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,31 @@ +[build-system] +build-backend = "setuptools.build_meta" +requires = ["setuptools>=61.0"] + +[project] +name = "elisa_client_api" +description = "Description pending, please contact John Freeman for more info" +version = "1.0.0" +readme = "docs/README.md" +requires-python = ">=3.6" +urls = { "homepage" = "https://github.com/DUNE-DAQ/elisa_client_api" } +dependencies = [ + "lxml", + "requests", + ] + +[tool.setuptools] +package-dir = {"" = "src"} + +[tool.setuptools.packages.find] +where = ["src"] + +[tool.setuptools.package-data] +elisa_client_api = ["*"] + +[project.scripts] +elisa_config = "elisa_client_api.scripts.elisa_config:main" +elisa_get = "elisa_client_api.scripts.elisa_get:main" +elisa_insert = "elisa_client_api.scripts.elisa_insert:main" +elisa_reply = "elisa_client_api.scripts.elisa_reply:main" +elisa_update = "elisa_client_api.scripts.elisa_update:main" diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index aafd826..0000000 --- a/requirements.txt +++ /dev/null @@ -1,7 +0,0 @@ -requests -unittest -urllib -mimetypes -xml -lxml==5.1.0 -http diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 7c7a05f..0000000 --- a/setup.cfg +++ /dev/null @@ -1,24 +0,0 @@ -[metadata] -name = elisa_client_api -version = attr: elisa_client_api.__version__ -url = https://github.com/DUNE-DAQ/elisa_client_api -# long_description = file: docs/README.md -# long_description_content_type = text/markdown - -[options] -packages = find: -package_dir = =src -include_package_data = true -python_requires = >= 3.6 -# Dependencies are in setup.py for GitHub's dependency graph. - -[options.packages.find] -where = src - -[options.entry_points] -console_scripts = - elisa_config = elisa_client_api.scripts.elisa_config:main - elisa_get = elisa_client_api.scripts.elisa_get:main - elisa_insert = elisa_client_api.scripts.elisa_insert:main - elisa_reply = elisa_client_api.scripts.elisa_reply:main - elisa_update = elisa_client_api.scripts.elisa_update:main diff --git a/setup.py b/setup.py deleted file mode 100644 index b657379..0000000 --- a/setup.py +++ /dev/null @@ -1,13 +0,0 @@ -from setuptools import setup - -# Metadata goes in setup.cfg. These are here for GitHub's dependency graph. -setup( - name="elisa_client_api", - install_requires=[ - "requests", - # "urllib", - # "mimetypes", - # "xml", - # "http" - ] -) diff --git a/src/elisa_client_api/__init__.py b/src/elisa_client_api/__init__.py index 5becc17..8b13789 100644 --- a/src/elisa_client_api/__init__.py +++ b/src/elisa_client_api/__init__.py @@ -1 +1 @@ -__version__ = "1.0.0" + From d47104d707a432606a58be579ab0e03633283e04 Mon Sep 17 00:00:00 2001 From: John Freeman Date: Tue, 23 Sep 2025 11:21:01 -0500 Subject: [PATCH 2/2] JCF: Issue #6: add a description of the package to its pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 2427146..78f0b00 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ requires = ["setuptools>=61.0"] [project] name = "elisa_client_api" -description = "Description pending, please contact John Freeman for more info" +description = "Enables sending of messages to the Elisa logbook" version = "1.0.0" readme = "docs/README.md" requires-python = ">=3.6"