From 7269319fcd78bf969ff20e0b808a4f17d4158511 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20P=C3=A4rsson?= Date: Mon, 1 Dec 2025 15:46:26 +0100 Subject: [PATCH 1/3] Bump packaging To get around a compatibility issue with recent `twine` versions. See https://github.com/pypa/twine/issues/1216#issuecomment-2606531615 --- requirements-dev.txt | 2 +- requirements-docs.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 8784ceb..1ba6dd7 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -8,7 +8,7 @@ importlib-metadata==7.0.0 iniconfig==2.0.0 mypy==1.7.1 ; implementation_name == "cpython" mypy-extensions==1.0.0 -packaging==23.2 +packaging==25.0 pathspec==0.12.1 platformdirs==4.1.0 pluggy==1.3.0 diff --git a/requirements-docs.txt b/requirements-docs.txt index f6c9b46..c7c4036 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -9,7 +9,7 @@ idna==3.7 imagesize==1.4.1 jinja2==3.1.6 markupsafe==2.1.3 -packaging==23.2 +packaging==25.0 pygments==2.17.2 requests==2.32.4 snowballstemmer==2.2.0 From b53a66b9d6a4c38ccb61adf5e5b36a5b79df23ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20P=C3=A4rsson?= Date: Mon, 1 Dec 2025 15:48:48 +0100 Subject: [PATCH 2/3] Safer comment handling of requirements files --- setup.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index ef6c0f9..de9cb80 100644 --- a/setup.py +++ b/setup.py @@ -9,8 +9,10 @@ def obtain_requirements(file_name): with open(file_name) as fd_in: for line in fd_in: - if '#' not in line: - yield line.strip() + line = line.split('#')[0] + line = line.strip() + if line: + yield line class PyTest(Command): From 183cbd703a7932bc9c032b3c475834cd704a2959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20P=C3=A4rsson?= Date: Mon, 1 Dec 2025 15:48:35 +0100 Subject: [PATCH 3/3] Pass long description as markdown To remove the undefined dependency to `pypandoc`. --- setup.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/setup.py b/setup.py index de9cb80..af17271 100644 --- a/setup.py +++ b/setup.py @@ -48,14 +48,8 @@ def read_injector_variable(name): requirements_dev = list(obtain_requirements('requirements-dev.txt')) -try: - import pypandoc - - long_description = pypandoc.convert_file('README.md', 'rst') -except ImportError: - warnings.warn('Could not locate pandoc, using Markdown long_description.', ImportWarning) - with open('README.md') as f: - long_description = f.read() +with open('README.md') as f: + long_description = f.read() description = long_description.splitlines()[0].strip() @@ -68,6 +62,7 @@ def read_injector_variable(name): options=dict(egg_info=dict(tag_build=version_tag)), description=description, long_description=long_description, + long_description_content_type='text/markdown', license='BSD', platforms=['any'], packages=['injector'],