From 8c348661f59c1a8c520ddf930165bd75382021a7 Mon Sep 17 00:00:00 2001
From: Andre Mayoraz <andre.mayoraz@idiap.ch>
Date: Mon, 3 Oct 2022 14:44:16 +0200
Subject: [PATCH] [ci] Adapted the config to use citools process instead of bdt
---
.gitlab-ci.yml | 5 ++-
doc/conf.py | 3 ++
pyproject.toml | 83 +++++++++++++++++++++++++++++++++++++++++++++++++-
setup.py | 35 ++-------------------
4 files changed, 91 insertions(+), 35 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 845b719..80ad328 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1 +1,4 @@
-include: 'https://gitlab.idiap.ch/bob/bob.devtools/raw/master/bob/devtools/data/gitlab-ci/single-package.yaml'
+include:
+ - project: bob/citools
+ ref: master
+ file: /src/citools/data/python.yml
diff --git a/doc/conf.py b/doc/conf.py
index 5996403..2999f19 100755
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -2,10 +2,13 @@
# 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"
diff --git a/pyproject.toml b/pyproject.toml
index b738dc8..8a551c7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,76 @@
[build-system]
- requires = ["setuptools", "wheel", "bob.extension"]
+ requires = ["setuptools>=61.0.0", "wheel"]
build-backend = "setuptools.build_meta"
+[project]
+ name = "bob.learn.em"
+ requires-python = ">=3.9"
+ description = "Bindings for EM machines and trainers of Bob"
+ dynamic = ["readme", "version", "dependencies"]
+ license = {text = "BSD 3-Clause License"}
+ authors = [
+ {name = "Andre Anjos"},
+ {email = "andre.anjos@idiap.ch"},
+ ]
+ keywords = ["bob", "em", "expectation-maximization"]
+
+ classifiers=[
+ "Framework :: Bob",
+ "Development Status :: 4 - Beta",
+ "Intended Audience :: Developers",
+ "License :: OSI Approved :: BSD License",
+ "Natural Language :: English",
+ "Programming Language :: Python",
+ "Programming Language :: Python :: 3",
+ "Topic :: Software Development :: Libraries :: Python Modules",
+ ]
+
+[project.urls]
+ documentation = "https://www.idiap.ch/software/bob/docs/bob/bob.learn.em/stable/"
+ homepage = "https://pypi.org/project/bob.learn.em/"
+ repository = "https://gitlab.idiap.ch/bob/bob.learn.em"
+ changelog = "https://gitlab.idiap.ch/bob/bob.learn.em/-/releases"
+
+[project.optional-dependencies]
+ qa = ["pre-commit"]
+ doc = [
+ "sphinx",
+ "sphinx_rtd_theme",
+ "sphinx-autodoc-typehints",
+ "sphinxcontrib-programoutput",
+ "matplotlib",
+ ]
+ test = [
+ "pytest",
+ "pytest-cov",
+ "coverage",
+ ]
+
+[project.entry-points."bob.learn.em.test.config"]
+ first = "tests.data.basic_config"
+ first-a = "tests.data.basic_config:a"
+ first-b = "tests.data.basic_config:b"
+ second = "tests.data.second_config"
+ second-b = "tests.data.second_config:b"
+ second-c = "tests.data.second_config:c"
+ complex = "tests.data.complex"
+ complex-var = "tests.data.complex:cplx"
+ verbose-config = "tests.data.verbose_config"
+ error-config = "tests.data.doesnt_exist"
+
+[tool.setuptools]
+ zip-safe = false
+ package-dir = {"" = "bob"}
+
+[tool.setuptools.dynamic]
+ readme = {file = "README.rst"}
+ version = {file = "version.txt"}
+ dependencies = {file = "requirements.txt"}
+
+
+[tool.distutils.bdist_wheel]
+ universal = true
+
[tool.isort]
profile = "black"
line_length = 80
@@ -10,3 +79,15 @@
[tool.black]
line-length = 80
+
+[tool.coverage.run]
+ relative_files = true
+
+[tool.pytest.ini_options]
+ addopts = [
+ "--import-mode=append",
+ "--cov-report=term-missing",
+ "--cov=bob.learn.em",
+ ]
+ junit_logging = "all"
+ junit_log_passing_tests = false
diff --git a/setup.py b/setup.py
index 21a202f..3a3aaad 100644
--- a/setup.py
+++ b/setup.py
@@ -1,37 +1,6 @@
#!/usr/bin/env python
# vim: set fileencoding=utf-8 :
-from setuptools import dist, setup
+from setuptools import setup
-dist.Distribution(dict(setup_requires=["bob.extension"]))
-
-from bob.extension.utils import find_packages, load_requirements
-
-install_requires = load_requirements()
-
-
-setup(
- name="bob.learn.em",
- version=open("version.txt").read().rstrip(),
- description="Bindings for EM machines and trainers of Bob",
- url="http://gitlab.idiap.ch/bob/bob.learn.em",
- license="BSD",
- author="Andre Anjos",
- author_email="andre.anjos@idiap.ch",
- keywords="bob, em, expectation-maximization",
- long_description=open("README.rst").read(),
- packages=find_packages(),
- include_package_data=True,
- zip_safe=False,
- install_requires=install_requires,
- classifiers=[
- "Framework :: Bob",
- "Development Status :: 4 - Beta",
- "Intended Audience :: Developers",
- "License :: OSI Approved :: BSD License",
- "Natural Language :: English",
- "Programming Language :: Python",
- "Programming Language :: Python :: 3",
- "Topic :: Software Development :: Libraries :: Python Modules",
- ],
-)
+setup()
--
GitLab