From daae4d218a8b2cb1854a99eff3f6277ba330fc07 Mon Sep 17 00:00:00 2001 From: Jakob van Santen Date: Mon, 26 Jan 2026 14:39:24 +0100 Subject: [PATCH 1/2] move conf into package --- ampel-plot/{ => ampel}/conf/ampel-plot/ampel.yml | 0 ampel-plot/{ => ampel}/conf/ampel-plot/mongo/data.yaml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename ampel-plot/{ => ampel}/conf/ampel-plot/ampel.yml (100%) rename ampel-plot/{ => ampel}/conf/ampel-plot/mongo/data.yaml (100%) diff --git a/ampel-plot/conf/ampel-plot/ampel.yml b/ampel-plot/ampel/conf/ampel-plot/ampel.yml similarity index 100% rename from ampel-plot/conf/ampel-plot/ampel.yml rename to ampel-plot/ampel/conf/ampel-plot/ampel.yml diff --git a/ampel-plot/conf/ampel-plot/mongo/data.yaml b/ampel-plot/ampel/conf/ampel-plot/mongo/data.yaml similarity index 100% rename from ampel-plot/conf/ampel-plot/mongo/data.yaml rename to ampel-plot/ampel/conf/ampel-plot/mongo/data.yaml From 0df96d8743475b9a1cedf2972c4074fac6b854db Mon Sep 17 00:00:00 2001 From: Jakob van Santen Date: Mon, 26 Jan 2026 14:05:02 +0100 Subject: [PATCH 2/2] setup.py -> build PyPI no longer accepts source distributions with unnormalized names (like python `setup.py` makes) --- ampel-plot/pyproject.toml | 29 +++++++++++++++++++++++++++++ ampel-plot/setup.py | 28 ---------------------------- 2 files changed, 29 insertions(+), 28 deletions(-) create mode 100644 ampel-plot/pyproject.toml delete mode 100644 ampel-plot/setup.py diff --git a/ampel-plot/pyproject.toml b/ampel-plot/pyproject.toml new file mode 100644 index 0000000..71bc4c5 --- /dev/null +++ b/ampel-plot/pyproject.toml @@ -0,0 +1,29 @@ +[build-system] +requires = ["setuptools", "wheel"] +build-backend = "setuptools.build_meta" + +[project] +name = "ampel-plot" +version = "0.9.2a0" +description = "" +readme = "README.md" +requires-python = ">=3.10" + +[project.optional-dependencies] +MPL = ["matplotlib"] + +[tool.setuptools.packages.find] +namespaces = true + +[tool.setuptools.package-data] +'*' = [ + "*.json", + "**/*.json", + "**/**/*.json", + "*.yaml", + "**/*.yaml", + "**/**/*.yaml", + "*.yml", + "**/*.yml", + "**/**/*.yml" +] diff --git a/ampel-plot/setup.py b/ampel-plot/setup.py deleted file mode 100644 index faf1fa8..0000000 --- a/ampel-plot/setup.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# File: Ampel-plot/ampel-plot/setup.py -# License: BSD-3-Clause -# Author: valery brinnel -# Date: 23.02.2021 -# Last Modified Date: 18.01.2023 -# Last Modified By: valery brinnel - -from setuptools import setup, find_namespace_packages # type: ignore -from pathlib import Path - -setup( - name='ampel-plot', - version='0.9.1', - long_description=(Path(__file__).parent / "README.md").read_text(), - long_description_content_type="text/markdown", - packages=find_namespace_packages(), - package_data = { - 'conf': [ - '*.json', '**/*.json', '**/**/*.json', - '*.yaml', '**/*.yaml', '**/**/*.yaml', - '*.yml', '**/*.yml', '**/**/*.yml' - ] - }, - python_requires = '>=3.10,<3.15', - extras_require={"MPL": ["matplotlib"]} -)