diff --git a/MANIFEST.in b/MANIFEST.in index 8e20ff6ee125b5d91dea0842d563d574ac5ea03b..7a903e17c32d64c100bc481dae827aea5e16d1bf 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,2 @@ include LICENSE README.rst buildout.cfg develop.cfg requirements.txt version.txt -recursive-include doc conf.py *.rst -recursive-include bob/learn/linear *.cpp *.h -recursive-include bob/learn/linear/data *.* +recursive-include doc *.py *.rst diff --git a/bob/learn/__init__.py b/bob/learn/__init__.py index 2ab1e28b150f0549def9963e9e87de3fdd6b2579..edbb4090fca046b19d22d3982711084621bff3be 100644 --- a/bob/learn/__init__.py +++ b/bob/learn/__init__.py @@ -1,3 +1,4 @@ # see https://docs.python.org/3/library/pkgutil.html from pkgutil import extend_path + __path__ = extend_path(__path__, __name__) diff --git a/conda/meta.yaml b/conda/meta.yaml index af2fafa66cb37fca9130da958f9ea06dbe3ec92e..f49b90eb55c2f819df80741d5550f95115ca8dc5 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -41,7 +41,7 @@ test: imports: - {{ name }} commands: - - pytest --verbose --cov {{ name }} --cov-report term-missing --cov-report html:{{ project_dir }}/sphinx/coverage --cov-report xml:{{ project_dir }} + - pytest --capture=no --verbose --cov {{ name }} --cov-config {{ project_dir }}/pyproject.toml --cov-report term-missing --cov-report html:{{ project_dir }}/sphinx/coverage --cov-report xml:{{ project_dir }}/coverage.xml --pyargs {{ name }} - sphinx-build -aEW {{ project_dir }}/doc {{ project_dir }}/sphinx - sphinx-build -aEb doctest {{ project_dir }}/doc sphinx - conda inspect linkages -p $PREFIX {{ name }} # [not win] diff --git a/setup.py b/setup.py index 32d6cafdd5d1fec2d1067b81bed13ec973d4c099..365b9527735ad9b4614fda87bf6aa6e95b61b880 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ from setuptools import setup, find_packages, dist from bob.extension.utils import load_requirements -build_requires = load_requirements() +install_requires = load_requirements() # Define package version version = open("version.txt").read().rstrip() @@ -25,9 +25,15 @@ setup( long_description=open("README.rst").read(), include_package_data=True, zip_safe=False, - setup_requires=build_requires, - install_requires=build_requires, - ext_modules=[], + setup_requires=install_requires, + # This line is required for any distutils based packaging. + packages=find_packages(), + # This line defines which packages should be installed when you "install" + # this package. All packages that are mentioned here, but are not installed + # on the current system will be installed locally and only visible to the + # scripts of this package. Don't worry - You won't need administrative + # privileges when using buildout. + install_requires=install_requires, entry_points={"console_scripts": [],}, classifiers=[ "Framework :: Bob", @@ -40,3 +46,4 @@ setup( "Topic :: Software Development :: Libraries :: Python Modules", ], ) +