From 352783cf7c2710ed9ef4d31f4ea4b2dacf187148 Mon Sep 17 00:00:00 2001 From: Robert Sachunsky <38561704+bertsky@users.noreply.github.com> Date: Thu, 23 May 2024 20:50:49 +0200 Subject: [PATCH 1/2] non-legacy namespace package --- __init__.py | 1 - qurator/__init__.py | 2 -- setup.py | 1 - 3 files changed, 4 deletions(-) delete mode 100644 __init__.py delete mode 100644 qurator/__init__.py diff --git a/__init__.py b/__init__.py deleted file mode 100644 index de40ea7..0000000 --- a/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__import__('pkg_resources').declare_namespace(__name__) diff --git a/qurator/__init__.py b/qurator/__init__.py deleted file mode 100644 index 8d17c21..0000000 --- a/qurator/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -__import__('pkg_resources').declare_namespace(__name__) - diff --git a/setup.py b/setup.py index a1293b9..8236c2d 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,6 @@ packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]), install_requires=install_requires, - namespace_packages=['qurator'], package_data={ '': ['*.json'] }, From 133a9a5d01cd2fa628d71c8778816d6d94b4e04c Mon Sep 17 00:00:00 2001 From: Robert Sachunsky <38561704+bertsky@users.noreply.github.com> Date: Fri, 24 May 2024 16:42:49 +0200 Subject: [PATCH 2/2] fix namespace pkg setup --- setup.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 8236c2d..9e6b762 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from io import open from json import load -from setuptools import find_packages, setup +from setuptools import find_namespace_packages, setup with open('requirements.txt') as fp: install_requires = fp.read() @@ -18,8 +18,7 @@ keywords='qurator', license='Apache License 2.0', url="https://github.com/qurator-spk/neath", - packages=find_packages(exclude=["*.tests", "*.tests.*", - "tests.*", "tests"]), + packages=find_namespace_packages(include=['qurator']), install_requires=install_requires, package_data={ '': ['*.json']