Skip to content
Snippets Groups Projects
Commit 8a73bab6 authored by Amir MOHAMMADI's avatar Amir MOHAMMADI
Browse files

Add more docs to explain details and fix #99

Fixes #99 where the extra env variables exposed via
recipe_append.yaml are no longer exposed.
parent dfa4a19a
No related branches found
No related tags found
1 merge request!293Add more docs to explain details and fix #99
Pipeline #62250 passed
...@@ -525,6 +525,7 @@ if __name__ == "__main__": ...@@ -525,6 +525,7 @@ if __name__ == "__main__":
) )
) )
# These are the same versions as in bob.devtools/conda/meta.yaml
conda_version = "4" conda_version = "4"
conda_build_version = "3" conda_build_version = "3"
mamba_version = "0.23" mamba_version = "0.23"
......
...@@ -452,17 +452,20 @@ def conda_create(conda, name, overwrite, condarc, packages, dry_run, use_local): ...@@ -452,17 +452,20 @@ def conda_create(conda, name, overwrite, condarc, packages, dry_run, use_local):
def get_docserver_setup(public, stable, server, intranet, group): def get_docserver_setup(public, stable, server, intranet, group):
"""Returns a setup for BOB_DOCUMENTATION_SERVER. """Returns a setup for BOB_DOCUMENTATION_SERVER.
BOB_DOCUMENTATION_SERVER is used in bob.extension.utils.link_documentation
to find the links of the documentation of Bob packages. The initial servers in
the output servers list have higher priority.
What is available to build the documentation depends on the setup of What is available to build the documentation depends on the setup of
``public`` and ``stable``: ``public`` and ``stable``:
* public and stable: only returns the public stable channel(s) * public and stable: only returns the public stable folder
* public and not stable: returns both public stable and beta channels * public and not stable: only returns the public beta folder
* not public and stable: returns both public and private stable channels * not public and stable: returns public and private stable folders
* not public and not stable: returns all channels * not public and not stable: returns public and private beta folders
Beta channels have priority over stable channels, if returned. Private
channels have priority over public channles, if turned.
If returned, Priavte channels have **lower** priority over public channles
because, private packages become public eventually.
Args: Args:
...@@ -473,7 +476,8 @@ def get_docserver_setup(public, stable, server, intranet, group): ...@@ -473,7 +476,8 @@ def get_docserver_setup(public, stable, server, intranet, group):
server: The base address of the server containing our conda channels server: The base address of the server containing our conda channels
intranet: Boolean indicating if we should add "private"/"public" prefixes intranet: Boolean indicating if we should add "private"/"public" prefixes
on the returned paths on the returned paths
group: The group of packages (gitlab namespace) the package we're compiling group: The group of packages (gitlab namespace) the package we're
compiling
is part of. Values should match URL namespaces currently available on is part of. Values should match URL namespaces currently available on
our internal webserver. Currently, only "bob" or "beat" will work. our internal webserver. Currently, only "bob" or "beat" will work.
...@@ -493,6 +497,7 @@ def get_docserver_setup(public, stable, server, intranet, group): ...@@ -493,6 +497,7 @@ def get_docserver_setup(public, stable, server, intranet, group):
# public documentation: always can access # public documentation: always can access
prefix = "/software/%s" % group prefix = "/software/%s" % group
if stable: if stable:
entries += [ entries += [
server + prefix + "/docs/" + group + "/%(name)s/%(version)s/", server + prefix + "/docs/" + group + "/%(name)s/%(version)s/",
......
# Make sure this file is up-to-date with:
# https://github.com/conda-forge/conda-forge-pinning-feedstock/blob/main/recipe/conda_build_config.yaml
# This differs from target_platform in that it determines what subdir the compiler # This differs from target_platform in that it determines what subdir the compiler
# will target, not what subdir the compiler package will be itself. # will target, not what subdir the compiler package will be itself.
# For example, we need a win-64 vs2008_win-32 package, so that we compile win-32 # For example, we need a win-64 vs2008_win-32 package, so that we compile win-32
......
...@@ -54,6 +54,8 @@ stages: ...@@ -54,6 +54,8 @@ stages:
tags: tags:
- bob - bob
- docker - docker
# make sure we use the same image as conda-forge:
# https://github.com/conda-forge/conda-forge-pinning-feedstock/blob/main/recipe/conda_build_config.yaml
image: quay.io/condaforge/linux-anvil-cos7-x86_64 image: quay.io/condaforge/linux-anvil-cos7-x86_64
artifacts: artifacts:
paths: paths:
......
build: # Because we want to use centos 7
script_env: # https://conda-forge.org/docs/maintainer/knowledge_base.html#using-centos-7
- DOCSERVER
- NOSE_EVAL_ATTR
- PYTEST_ADDOPTS
requirements: # [linux64] requirements: # [linux64]
build: # [linux64] build: # [linux64]
- sysroot_linux-64 2.17 # [linux64] - sysroot_linux-64 2.17 # [linux64]
...@@ -31,6 +31,8 @@ requirements: ...@@ -31,6 +31,8 @@ requirements:
- black >=19 - black >=19
- click >=7 - click >=7
- click-plugins - click-plugins
# conda, conda-build, mamba, boa versions below are the same versions as in
# bob.devtools/bob/devtools/bootstrap.py
- conda=4 - conda=4
- conda-build=3 - conda-build=3
- mamba=0.23 - mamba=0.23
......
build:
script_env:
- DOCSERVER
- NOSE_EVAL_ATTR
- PYTEST_ADDOPTS
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment