From 04fcce242262075ab3e932f8969fa3d7d39dd5a5 Mon Sep 17 00:00:00 2001 From: Samuel Gaist Date: Fri, 17 Sep 2021 10:46:36 +0200 Subject: [PATCH 1/6] [conda] remove bob/beat-devel from test requirements --- conda/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index fb2bd5d..750daf1 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -53,8 +53,6 @@ requirements: test: requires: - - bob-devel {{ bob_devel }}.* - - beat-devel {{ beat_devel }}.* - bob.extension - nose - coverage -- GitLab From 93550655549e1ee9e19030b0a6dbd007946155bb Mon Sep 17 00:00:00 2001 From: Samuel Gaist Date: Wed, 29 Sep 2021 09:50:02 +0200 Subject: [PATCH 2/6] [conda] Pin all packages defined in bob/bob.devtools> build config --- conda/meta.yaml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 750daf1..c98eff3 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -38,27 +38,28 @@ requirements: host: - python {{ python }} - setuptools {{ setuptools }} + - bob.extension + run: - python - setuptools - beat.backend.python - beat.core >1.9.0 - - termcolor - - docopt - - click - - click-plugins - - graphviz - - ncurses - - pillow + - {{ pin_compatible('termcolor') }} + - {{ pin_compatible('docopt') }} + - {{ pin_compatible('click') }} + - {{ pin_compatible('click_plugins') }} + - {{ pin_compatible('graphviz') }} + - {{ pin_compatible('ncurses') }} + - {{ pin_compatible('pillow') }} test: requires: - - bob.extension - - nose - - coverage - - sphinx - - sphinx_rtd_theme - - sphinxcontrib-programoutput + - nose {{ nose }} + - coverage {{ coverage }} + - sphinx {{ sphinx }} + - sphinx_rtd_theme {{ sphinx_rtd_theme }} + - sphinxcontrib-programoutput {{ sphinxcontrib_programoutput }} imports: - {{ name }} -- GitLab From 978534ae069a7c1ae9b4459c4196113f5feec341 Mon Sep 17 00:00:00 2001 From: Samuel Gaist Date: Wed, 29 Sep 2021 10:30:49 +0200 Subject: [PATCH 3/6] [conda] Use click-plugins for pining as the underscore version does not work --- conda/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index c98eff3..737aea1 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -48,7 +48,7 @@ requirements: - {{ pin_compatible('termcolor') }} - {{ pin_compatible('docopt') }} - {{ pin_compatible('click') }} - - {{ pin_compatible('click_plugins') }} + - {{ pin_compatible('click-plugins') }} - {{ pin_compatible('graphviz') }} - {{ pin_compatible('ncurses') }} - {{ pin_compatible('pillow') }} -- GitLab From 0c60e072abd5bd9fd0dfe131a8cebb4b958db0dd Mon Sep 17 00:00:00 2001 From: Samuel Gaist Date: Wed, 6 Oct 2021 17:46:39 +0200 Subject: [PATCH 4/6] [conda] Redo dependencies list following bob's guideline --- conda/meta.yaml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 737aea1..5006739 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -39,12 +39,19 @@ requirements: - python {{ python }} - setuptools {{ setuptools }} - bob.extension + - beat.backend.python + - beat.core >1.9.0 + - termcolor {{ termcolor }} + - docopt {{ docopt }} + - click {{ click }} + - click-plugins {{ click_plugins }} + - graphviz {{ graphviz }} + - ncurses {{ ncurses }} + - pillow {{ pillow }} run: - python - setuptools - - beat.backend.python - - beat.core >1.9.0 - {{ pin_compatible('termcolor') }} - {{ pin_compatible('docopt') }} - {{ pin_compatible('click') }} -- GitLab From 38e31636cb13ae16255972cbcbcde62a99b62d29 Mon Sep 17 00:00:00 2001 From: Samuel Gaist Date: Wed, 6 Oct 2021 18:01:54 +0200 Subject: [PATCH 5/6] [conda] Update install instructions --- conda/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 5006739..78cd15a 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -26,9 +26,9 @@ build: script: - cd {{ environ.get('RECIPE_DIR') + '/..' }} {% if environ.get('BUILD_EGG') %} - - python setup.py sdist --formats=zip + - "{{ PYTHON }} setup.py sdist --formats=zip" {% endif %} - - python setup.py install --single-version-externally-managed --record record.txt + - "{{ 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 }}" -- GitLab From be84706a96119a0e656299787124a039e96a3093 Mon Sep 17 00:00:00 2001 From: Samuel Gaist Date: Wed, 6 Oct 2021 18:11:03 +0200 Subject: [PATCH 6/6] [conda] Add pip to the dependencies --- conda/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/meta.yaml b/conda/meta.yaml index 78cd15a..ab4d4b8 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -38,6 +38,7 @@ requirements: host: - python {{ python }} - setuptools {{ setuptools }} + - pip {{ pip }} - bob.extension - beat.backend.python - beat.core >1.9.0 -- GitLab