Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use pubtools namespace to resolve init file conflict [RHELDST-17607] #49

Merged
merged 1 commit into from
Jun 10, 2024
Merged

Use pubtools namespace to resolve init file conflict [RHELDST-17607] #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pubtools/__init__.py
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

# import pkg_resources
import sys
from setuptools import setup, find_packages
from setuptools import setup, find_namespace_packages
from setuptools.command.test import test as TestCommand


Expand Down Expand Up @@ -72,7 +72,8 @@ def read_content(filepath):
url="https://gitlab.cee.redhat.com/jluza/pubtools-iib",
classifiers=classifiers,
python_requires=">=3.6",
packages=find_packages(exclude=["tests"]),
packages=find_namespace_packages(where="src"),
package_dir={"": "src"},
data_files=[],
install_requires=INSTALL_REQURIES,
dependency_links=DEPENDENCY_LINKS,
Expand Down
0 pubtools/iib/__init__.py → src/pubtools/iib/__init__.py
View file
Open in desktop
File renamed without changes.
0 pubtools/iib/iib_ops.py → src/pubtools/iib/iib_ops.py
View file
Open in desktop
File renamed without changes.
0 pubtools/iib/utils.py → src/pubtools/iib/utils.py
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ exclude=.svn,CVS,.bzr,.hg,.git,__pycache__,.tox,setup.py,docs
deps=
{[py]deps}
basepython = python3.10
commands = python -m pytest -v --cov=pubtools --cov-report=html --cov-report=xml {posargs}
commands = python -m pytest -v --cov=pubtools.iib --cov-report=html --cov-report=xml {posargs}

[testenv:pypy3]
deps=
Expand All @@ -43,14 +43,14 @@ deps=
black
basepython = python3.10
commands =
pycodestyle --config=.pycodestyle --first pubtools
black --check pubtools
pycodestyle --config=.pycodestyle --first src/pubtools
black --check src/pubtools
exclude=.svn,cvs,.bzr,.hg,.git,__pycache__,.tox,setup.py,docs

[testenv:pydocstyle]
deps=
pydocstyle
commands = pydocstyle pubtools
commands = pydocstyle src/pubtools
basepython = python3.10
exclude=.svn,CVS,.bzr,.hg,.git,__pycache__,.tox,setup.py,docs

Expand All @@ -75,7 +75,7 @@ deps =
types-setuptools
mypy
commands =
mypy pubtools
mypy src/pubtools

[testenv:cov-travis]
passenv =
Expand All @@ -86,7 +86,7 @@ deps=
coveralls
usedevelop=true
commands=
pytest --cov=pubtools {posargs}
pytest --cov=pubtools.iib {posargs}
coveralls

[testenv:pidiff]
Expand Down
Loading