From f77e616c3d90efea619bd616b00ac0cfa3c4dfce Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Tue, 5 Oct 2021 20:03:09 +0200
Subject: [PATCH] point to our template in check error
---
bob/devtools/scripts/ci.py | 8 +++++---
bob/devtools/templates/conda/meta.yaml | 2 --
conda/meta.yaml | 8 +++-----
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/bob/devtools/scripts/ci.py b/bob/devtools/scripts/ci.py
index e7f5a26e..8e8068d2 100644
--- a/bob/devtools/scripts/ci.py
+++ b/bob/devtools/scripts/ci.py
@@ -1026,11 +1026,13 @@ def check():
if os.path.isfile(path):
with open(path) as f:
content = f.read()
- if '- "{{ PYTHON }} -m pip install . -vv"' not in content:
+ if (
+ '- "{{ PYTHON }} -m pip install . -vv"' not in content
+ or " - pip {{ pip }}" not in content
+ ):
raise RuntimeError(
f"""Could not find the pip install line inside the {path} file.
-Please apply similar changes to the {path} file:
-https://gitlab.idiap.ch/bob/bob.extension/-/merge_requests/133/diffs"""
+Please see bob/devtools/templates/conda/meta.yaml for a template."""
)
# if there is a pre-commit configuration file, run the tests
diff --git a/bob/devtools/templates/conda/meta.yaml b/bob/devtools/templates/conda/meta.yaml
index b13c27a7..af357cf4 100644
--- a/bob/devtools/templates/conda/meta.yaml
+++ b/bob/devtools/templates/conda/meta.yaml
@@ -48,7 +48,6 @@ test:
imports:
- {{ name }}
commands:
- - pip check
# runs tests for package only, report only what is in the package
# creates html and xml reports and place them in specific directories
- pytest --verbose --cov {{ name }} --cov-report term-missing --cov-report html:{{ project_dir }}/sphinx/coverage --cov-report xml:{{ project_dir }}/coverage.xml --pyargs {{ name }}
@@ -57,7 +56,6 @@ test:
- conda inspect linkages -p $PREFIX {{ name }} # [not win]
- conda inspect objects -p $PREFIX {{ name }} # [osx]
requires:
- - pip {{ pip }}
- pytest {{ pytest }}
- pytest-cov {{ pytest_cov }}
- coverage {{ coverage }}
diff --git a/conda/meta.yaml b/conda/meta.yaml
index f97be00a..9a4be6f2 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -56,14 +56,12 @@ requirements:
test:
requires:
- - pip
- - sphinx_rtd_theme
- - pytest
- - pytest-cov
+ - sphinx_rtd_theme {{ sphinx_rtd_theme }}
+ - pytest {{ pytest }}
+ - pytest-cov {{ pytest_cov }}
imports:
- {{ name }}
commands:
- - pip check
- bdt -h
- bdt -?
- bdt --help
--
GitLab