Merge branch 'cookiecutter_restructuration' into 'master'

Cookiecutter restructuration

Closes #47

See merge request !69

.gitignore

@@ -17,7 +17,7 @@ dist
 build
 .DS_Store
 *.egg
-src/
 record.txt
 dask-worker-space
 .gitlab-ci-local*
+html/

MANIFEST.in

-include LICENSE README.rst buildout.cfg develop.cfg requirements.txt version.txt
+include LICENSE README.rst
 recursive-include doc conf.py *.rst
-recursive-include bob/learn/em *.cpp *.h
-recursive-include bob/learn/em/data *.*
+recursive-include src/bob/learn/em/data *.*

README.rst

@@ -2,11 +2,11 @@
 .. Mon 15 Aug 2016 09:48:28 CEST
 
 .. image:: https://img.shields.io/badge/docs-latest-orange.svg
-   :target: https://www.idiap.ch/software/bob/docs/bob/bob.learn.em/master/index.html
+   :target: https://www.idiap.ch/software/bob/docs/bob/bob.learn.em/master/sphinx/index.html
 .. image:: https://gitlab.idiap.ch/bob/bob.learn.em/badges/master/pipeline.svg
    :target: https://gitlab.idiap.ch/bob/bob.learn.em/commits/master
 .. image:: https://gitlab.idiap.ch/bob/bob.learn.em/badges/master/coverage.svg
-   :target: https://gitlab.idiap.ch/bob/bob.learn.em/commits/master
+   :target: https://www.idiap.ch/software/bob/docs/bob/bob.learn.em/master/coverage
 .. image:: https://img.shields.io/badge/gitlab-project-0000c0.svg
    :target: https://gitlab.idiap.ch/bob/bob.learn.em
 

conda/meta.yaml

 {% set data = load_file_data(RECIPE_DIR + '/../pyproject.toml') %}
 {% set name = data['project']['name'] %}
-{% set project_dir = environ.get('RECIPE_DIR') + '/..' %}
 
 package:
   name: {{ name }}
   version: {{ data['project']['version'] }}
 
+source:
+  path: ..
+
 build:
+  noarch: python
   number: {{ environ.get('BOB_BUILD_NUMBER', 0) }}
   run_exports:
     - {{ pin_subpackage(name) }}
   script:
-    - cd {{ project_dir }}
-    - "{{ PYTHON }} -m pip install . -vv"
-    # installs the documentation source, readme to share/doc so it is available
-    # during test time
-    - install -d "${PREFIX}/share/doc/{{ name }}"
-    - cp -R README.rst requirements.txt doc "${PREFIX}/share/doc/{{ name }}/"
+    - "{{ PYTHON }} -m pip install {{ SRC_DIR }} -vv"
 
 requirements:
   host:
     - python {{ python }}
     - setuptools {{ setuptools }}
     - pip {{ pip }}
-    - bob.extension
     - numpy {{ numpy }}
     - dask {{ dask }}
     - dask-ml {{ dask_ml }}
@@ -33,26 +30,21 @@ requirements:
   run:
     - python
     - setuptools
-    - {{ pin_compatible('numpy', max_pin='x.x') }}
+    - {{ pin_compatible('numpy') }}
     - {{ pin_compatible('dask') }}
     - {{ pin_compatible('dask-ml') }}
     - {{ pin_compatible('h5py') }}
-    # scikit-learn keeps breaking API in minor versions, so we pin to the
-    # next minor version
-    - {{ pin_compatible('scikit-learn', max_pin='x.x') }}
+    - {{ pin_compatible('scikit-learn') }}
 
 test:
   imports:
-    - {{ name }}
+    - {{ name.replace('-','_') }}
   commands:
-    # runs tests for package only, report only what is in the package
-    # creates xml tests report and place it in a specific directory
-    # creates html and xml coverage reports and place them in a specific directory
     - conda inspect linkages -p $PREFIX {{ name }}  # [not win]
     - conda inspect objects -p $PREFIX {{ name }}  # [osx]
 
 about:
   home: {{ data['project']['urls']['homepage'] }}
-  license: {{ data['project']['description'] }}
-  summary: {{ data['project']['license']['text'] }}
+  summary: {{ data['project']['description'] }}
+  license: {{ data['project']['license']['text'] }}
   license_family: BSD

doc/conf.py

@@ -2,13 +2,10 @@
 # vim: set fileencoding=utf-8 :
 
 import os
-import sys
 
 import pkg_resources
 
 # -- General configuration -----------------------------------------------------
-# Adding the parent directory to the python path.
-sys.path.insert(0, os.path.abspath("../"))
 
 # If your documentation needs a minimal Sphinx version, state it here.
 needs_sphinx = "1.3"

pyproject.toml

@@ -7,7 +7,7 @@
     version = "3.2.1b0"
     requires-python = ">=3.9"
     description = "Bindings for EM machines and trainers of Bob"
-    dynamic = ["readme", "dependencies"]
+    dynamic = ["readme"]
     license = {text = "BSD 3-Clause License"}
     authors = [
     {name = "Andre Anjos"},
@@ -25,6 +25,14 @@
         "Programming Language :: Python :: 3",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ]
+    dependencies = [
+        "setuptools",
+        "bob.extension",
+        "dask",
+        "dask-ml",
+        "h5py >= 3",
+        "scikit-learn",
+    ]
 
 [project.urls]
     documentation = "https://www.idiap.ch/software/bob/docs/bob/bob.learn.em/stable/"
@@ -49,12 +57,10 @@
 
 [tool.setuptools]
     zip-safe = false
-    include-package-data = true
-    packages = ["bob"]
+    package-dir = {"" = "src"}
 
 [tool.setuptools.dynamic]
     readme = {file = "README.rst"}
-    dependencies = {file = "requirements.txt"}
 
 
 [tool.distutils.bdist_wheel]

requirements.txt

-setuptools
-bob.extension
-dask
-dask-ml
-h5py >= 3
-scikit-learn

bob/learn/em/__init__.py → src/bob/learn/em/__init__.py

-import bob.extension
-
 from .factor_analysis import ISVMachine, JFAMachine
 from .gmm import GMMMachine, GMMStats
 from .ivector import IVectorMachine
@@ -9,11 +7,6 @@ from .wccn import WCCN
 from .whitening import Whitening
 
 
-def get_config():
-    """Returns a string containing the configuration information."""
-    return bob.extension.get_config(__name__)
-
-
 # gets sphinx autodoc done right - don't remove it
 def __appropriate__(*args):
     """Says object was actually declared here, an not on the import module.