Merge pull request #286 from amcmahon-rh/RHELDST-17607

Use pubtools namespace to resolve init file conflict [RHELDST-17607]
release-engineering · Jun 10, 2024 · b851bbd · b851bbd
2 parents cbf5248 + a7ea163
commit b851bbd
Show file tree

Hide file tree

Showing 62 changed files with 5 additions and 5 deletions.
diff --git a/pubtools/__init__.py b/pubtools/__init__.py
diff --git a/setup.py b/setup.py
@@ -1,4 +1,4 @@
-from setuptools import setup, find_packages
+from setuptools import setup, find_namespace_packages
 
 
 def get_description():
@@ -22,7 +22,8 @@ def get_requirements():
 setup(
     name="pubtools-pulp",
     version="1.30.1",
-    packages=find_packages(exclude=["tests"]),
+    packages=find_namespace_packages(where="src"),
+    package_dir={"": "src"},
     url="https://github.com/release-engineering/pubtools-pulp",
     license="GNU General Public License",
     description=get_description(),

diff --git a/pubtools/_pulp/__init__.py → src/pubtools/_pulp/__init__.py b/pubtools/_pulp/__init__.py → src/pubtools/_pulp/__init__.py
diff --git a/pubtools/_pulp/arguments.py → src/pubtools/_pulp/arguments.py b/pubtools/_pulp/arguments.py → src/pubtools/_pulp/arguments.py
diff --git a/pubtools/_pulp/cdn.py → src/pubtools/_pulp/cdn.py b/pubtools/_pulp/cdn.py → src/pubtools/_pulp/cdn.py
diff --git a/pubtools/_pulp/hooks.py → src/pubtools/_pulp/hooks.py b/pubtools/_pulp/hooks.py → src/pubtools/_pulp/hooks.py
diff --git a/pubtools/_pulp/services/__init__.py → src/pubtools/_pulp/services/__init__.py b/pubtools/_pulp/services/__init__.py → src/pubtools/_pulp/services/__init__.py
diff --git a/pubtools/_pulp/services/base.py → src/pubtools/_pulp/services/base.py b/pubtools/_pulp/services/base.py → src/pubtools/_pulp/services/base.py
diff --git a/pubtools/_pulp/services/cachingpulp.py → src/pubtools/_pulp/services/cachingpulp.py b/pubtools/_pulp/services/cachingpulp.py → src/pubtools/_pulp/services/cachingpulp.py
diff --git a/pubtools/_pulp/services/cdn.py → src/pubtools/_pulp/services/cdn.py b/pubtools/_pulp/services/cdn.py → src/pubtools/_pulp/services/cdn.py
diff --git a/pubtools/_pulp/services/collector.py → src/pubtools/_pulp/services/collector.py b/pubtools/_pulp/services/collector.py → src/pubtools/_pulp/services/collector.py
diff --git a/pubtools/_pulp/services/fakepulp.py → src/pubtools/_pulp/services/fakepulp.py b/pubtools/_pulp/services/fakepulp.py → src/pubtools/_pulp/services/fakepulp.py
diff --git a/pubtools/_pulp/services/fastpurge_.py → src/pubtools/_pulp/services/fastpurge_.py b/pubtools/_pulp/services/fastpurge_.py → src/pubtools/_pulp/services/fastpurge_.py
diff --git a/pubtools/_pulp/services/pulp.py → src/pubtools/_pulp/services/pulp.py b/pubtools/_pulp/services/pulp.py → src/pubtools/_pulp/services/pulp.py
diff --git a/pubtools/_pulp/services/udcache.py → src/pubtools/_pulp/services/udcache.py b/pubtools/_pulp/services/udcache.py → src/pubtools/_pulp/services/udcache.py
diff --git a/pubtools/_pulp/step.py → src/pubtools/_pulp/step.py b/pubtools/_pulp/step.py → src/pubtools/_pulp/step.py
diff --git a/pubtools/_pulp/task.py → src/pubtools/_pulp/task.py b/pubtools/_pulp/task.py → src/pubtools/_pulp/task.py
diff --git a/pubtools/_pulp/tasks/__init__.py → src/pubtools/_pulp/tasks/__init__.py b/pubtools/_pulp/tasks/__init__.py → src/pubtools/_pulp/tasks/__init__.py
diff --git a/pubtools/_pulp/tasks/clear_repo.py → src/pubtools/_pulp/tasks/clear_repo.py b/pubtools/_pulp/tasks/clear_repo.py → src/pubtools/_pulp/tasks/clear_repo.py
diff --git a/pubtools/_pulp/tasks/common.py → src/pubtools/_pulp/tasks/common.py b/pubtools/_pulp/tasks/common.py → src/pubtools/_pulp/tasks/common.py
diff --git a/pubtools/_pulp/tasks/copy_repo.py → src/pubtools/_pulp/tasks/copy_repo.py b/pubtools/_pulp/tasks/copy_repo.py → src/pubtools/_pulp/tasks/copy_repo.py
diff --git a/pubtools/_pulp/tasks/delete.py → src/pubtools/_pulp/tasks/delete.py b/pubtools/_pulp/tasks/delete.py → src/pubtools/_pulp/tasks/delete.py
diff --git a/pubtools/_pulp/tasks/fix_cves.py → src/pubtools/_pulp/tasks/fix_cves.py b/pubtools/_pulp/tasks/fix_cves.py → src/pubtools/_pulp/tasks/fix_cves.py
diff --git a/pubtools/_pulp/tasks/garbage_collect.py → src/pubtools/_pulp/tasks/garbage_collect.py b/pubtools/_pulp/tasks/garbage_collect.py → src/pubtools/_pulp/tasks/garbage_collect.py
diff --git a/pubtools/_pulp/tasks/publish.py → src/pubtools/_pulp/tasks/publish.py b/pubtools/_pulp/tasks/publish.py → src/pubtools/_pulp/tasks/publish.py
diff --git a/pubtools/_pulp/tasks/push/__init__.py → src/pubtools/_pulp/tasks/push/__init__.py b/pubtools/_pulp/tasks/push/__init__.py → src/pubtools/_pulp/tasks/push/__init__.py
diff --git a/pubtools/_pulp/tasks/push/command.py → src/pubtools/_pulp/tasks/push/command.py b/pubtools/_pulp/tasks/push/command.py → src/pubtools/_pulp/tasks/push/command.py
diff --git a/...ols/_pulp/tasks/push/contextlib_compat.py → ...ols/_pulp/tasks/push/contextlib_compat.py b/...ols/_pulp/tasks/push/contextlib_compat.py → ...ols/_pulp/tasks/push/contextlib_compat.py
diff --git a/pubtools/_pulp/tasks/push/copy.py → src/pubtools/_pulp/tasks/push/copy.py b/pubtools/_pulp/tasks/push/copy.py → src/pubtools/_pulp/tasks/push/copy.py
diff --git a/pubtools/_pulp/tasks/push/items/__init__.py → ...btools/_pulp/tasks/push/items/__init__.py b/pubtools/_pulp/tasks/push/items/__init__.py → ...btools/_pulp/tasks/push/items/__init__.py
diff --git a/pubtools/_pulp/tasks/push/items/base.py → src/pubtools/_pulp/tasks/push/items/base.py b/pubtools/_pulp/tasks/push/items/base.py → src/pubtools/_pulp/tasks/push/items/base.py
diff --git a/pubtools/_pulp/tasks/push/items/comps.py → src/pubtools/_pulp/tasks/push/items/comps.py b/pubtools/_pulp/tasks/push/items/comps.py → src/pubtools/_pulp/tasks/push/items/comps.py
diff --git a/pubtools/_pulp/tasks/push/items/direct.py → ...pubtools/_pulp/tasks/push/items/direct.py b/pubtools/_pulp/tasks/push/items/direct.py → ...pubtools/_pulp/tasks/push/items/direct.py
diff --git a/pubtools/_pulp/tasks/push/items/erratum.py → ...ubtools/_pulp/tasks/push/items/erratum.py b/pubtools/_pulp/tasks/push/items/erratum.py → ...ubtools/_pulp/tasks/push/items/erratum.py
diff --git a/...ls/_pulp/tasks/push/items/erratum_conv.py → ...ls/_pulp/tasks/push/items/erratum_conv.py b/...ls/_pulp/tasks/push/items/erratum_conv.py → ...ls/_pulp/tasks/push/items/erratum_conv.py
diff --git a/pubtools/_pulp/tasks/push/items/file.py → src/pubtools/_pulp/tasks/push/items/file.py b/pubtools/_pulp/tasks/push/items/file.py → src/pubtools/_pulp/tasks/push/items/file.py
diff --git a/pubtools/_pulp/tasks/push/items/modulemd.py → ...btools/_pulp/tasks/push/items/modulemd.py b/pubtools/_pulp/tasks/push/items/modulemd.py → ...btools/_pulp/tasks/push/items/modulemd.py
diff --git a/pubtools/_pulp/tasks/push/items/productid.py → ...tools/_pulp/tasks/push/items/productid.py b/pubtools/_pulp/tasks/push/items/productid.py → ...tools/_pulp/tasks/push/items/productid.py
diff --git a/pubtools/_pulp/tasks/push/items/rpm.py → src/pubtools/_pulp/tasks/push/items/rpm.py b/pubtools/_pulp/tasks/push/items/rpm.py → src/pubtools/_pulp/tasks/push/items/rpm.py
diff --git a/pubtools/_pulp/tasks/push/phase/__init__.py → ...btools/_pulp/tasks/push/phase/__init__.py b/pubtools/_pulp/tasks/push/phase/__init__.py → ...btools/_pulp/tasks/push/phase/__init__.py
diff --git a/pubtools/_pulp/tasks/push/phase/associate.py → ...tools/_pulp/tasks/push/phase/associate.py b/pubtools/_pulp/tasks/push/phase/associate.py → ...tools/_pulp/tasks/push/phase/associate.py
diff --git a/pubtools/_pulp/tasks/push/phase/base.py → src/pubtools/_pulp/tasks/push/phase/base.py b/pubtools/_pulp/tasks/push/phase/base.py → src/pubtools/_pulp/tasks/push/phase/base.py
diff --git a/pubtools/_pulp/tasks/push/phase/buffer.py → ...pubtools/_pulp/tasks/push/phase/buffer.py b/pubtools/_pulp/tasks/push/phase/buffer.py → ...pubtools/_pulp/tasks/push/phase/buffer.py
diff --git a/pubtools/_pulp/tasks/push/phase/collect.py → ...ubtools/_pulp/tasks/push/phase/collect.py b/pubtools/_pulp/tasks/push/phase/collect.py → ...ubtools/_pulp/tasks/push/phase/collect.py
diff --git a/pubtools/_pulp/tasks/push/phase/constants.py → ...tools/_pulp/tasks/push/phase/constants.py b/pubtools/_pulp/tasks/push/phase/constants.py → ...tools/_pulp/tasks/push/phase/constants.py
diff --git a/pubtools/_pulp/tasks/push/phase/context.py → ...ubtools/_pulp/tasks/push/phase/context.py b/pubtools/_pulp/tasks/push/phase/context.py → ...ubtools/_pulp/tasks/push/phase/context.py
diff --git a/pubtools/_pulp/tasks/push/phase/end_push.py → ...btools/_pulp/tasks/push/phase/end_push.py b/pubtools/_pulp/tasks/push/phase/end_push.py → ...btools/_pulp/tasks/push/phase/end_push.py
diff --git a/pubtools/_pulp/tasks/push/phase/errors.py → ...pubtools/_pulp/tasks/push/phase/errors.py b/pubtools/_pulp/tasks/push/phase/errors.py → ...pubtools/_pulp/tasks/push/phase/errors.py
diff --git a/...ools/_pulp/tasks/push/phase/load_items.py → ...ools/_pulp/tasks/push/phase/load_items.py b/...ools/_pulp/tasks/push/phase/load_items.py → ...ools/_pulp/tasks/push/phase/load_items.py
diff --git a/pubtools/_pulp/tasks/push/phase/load_sums.py → ...tools/_pulp/tasks/push/phase/load_sums.py b/pubtools/_pulp/tasks/push/phase/load_sums.py → ...tools/_pulp/tasks/push/phase/load_sums.py
diff --git a/pubtools/_pulp/tasks/push/phase/progress.py → ...btools/_pulp/tasks/push/phase/progress.py b/pubtools/_pulp/tasks/push/phase/progress.py → ...btools/_pulp/tasks/push/phase/progress.py
diff --git a/pubtools/_pulp/tasks/push/phase/publish.py → ...ubtools/_pulp/tasks/push/phase/publish.py b/pubtools/_pulp/tasks/push/phase/publish.py → ...ubtools/_pulp/tasks/push/phase/publish.py
diff --git a/...ulp/tasks/push/phase/push_post_actions.py → ...ulp/tasks/push/phase/push_post_actions.py b/...ulp/tasks/push/phase/push_post_actions.py → ...ulp/tasks/push/phase/push_post_actions.py
diff --git a/...ools/_pulp/tasks/push/phase/query_pulp.py → ...ools/_pulp/tasks/push/phase/query_pulp.py b/...ools/_pulp/tasks/push/phase/query_pulp.py → ...ools/_pulp/tasks/push/phase/query_pulp.py
diff --git a/pubtools/_pulp/tasks/push/phase/update.py → ...pubtools/_pulp/tasks/push/phase/update.py b/pubtools/_pulp/tasks/push/phase/update.py → ...pubtools/_pulp/tasks/push/phase/update.py
diff --git a/pubtools/_pulp/tasks/push/phase/upload.py → ...pubtools/_pulp/tasks/push/phase/upload.py b/pubtools/_pulp/tasks/push/phase/upload.py → ...pubtools/_pulp/tasks/push/phase/upload.py
diff --git a/...s/_pulp/tasks/set_maintenance/__init__.py → ...s/_pulp/tasks/set_maintenance/__init__.py b/...s/_pulp/tasks/set_maintenance/__init__.py → ...s/_pulp/tasks/set_maintenance/__init__.py
diff --git a/pubtools/_pulp/tasks/set_maintenance/base.py → ...tools/_pulp/tasks/set_maintenance/base.py b/pubtools/_pulp/tasks/set_maintenance/base.py → ...tools/_pulp/tasks/set_maintenance/base.py
diff --git a/...ks/set_maintenance/set_maintenance_off.py → ...ks/set_maintenance/set_maintenance_off.py b/...ks/set_maintenance/set_maintenance_off.py → ...ks/set_maintenance/set_maintenance_off.py
diff --git a/...sks/set_maintenance/set_maintenance_on.py → ...sks/set_maintenance/set_maintenance_on.py b/...sks/set_maintenance/set_maintenance_on.py → ...sks/set_maintenance/set_maintenance_on.py
diff --git a/pubtools/_pulp/ud.py → src/pubtools/_pulp/ud.py b/pubtools/_pulp/ud.py → src/pubtools/_pulp/ud.py
diff --git a/tox.ini b/tox.ini
@@ -10,12 +10,12 @@ allowlist_externals=sh
 deps=
 	-rtest-requirements.txt
 commands=
-	sh -c 'pylint pubtools; test $(( $? & (1|2|4|32) )) = 0'
+	sh -c 'pylint src/pubtools/_pulp; test $(( $? & (1|2|4|32) )) = 0'
 
 [testenv:cov]
 usedevelop=true
 commands=
-	pytest --cov-report=html --cov-report=xml --cov=pubtools {posargs}
+	pytest --cov-report=html --cov-report=xml --cov=pubtools._pulp {posargs}
 
 [testenv:docs]
 use_develop=true