diff --git a/bob/devtools/bootstrap.py b/bob/devtools/bootstrap.py index be3d3d1cdbe7a34c3d94194093e8e91739c6c115..57c645e50d1d5637d3b15425cb1780178a480379 100644 --- a/bob/devtools/bootstrap.py +++ b/bob/devtools/bootstrap.py @@ -525,6 +525,7 @@ if __name__ == "__main__": ) ) + # These are the same versions as in bob.devtools/conda/meta.yaml conda_version = "4" conda_build_version = "3" mamba_version = "0.23" diff --git a/bob/devtools/build.py b/bob/devtools/build.py index e11b8235f7aee0bd1d7539102fcef351f5b98e97..fdc8d86e6a410c2610e87cc209b2da864a5c9c55 100644 --- a/bob/devtools/build.py +++ b/bob/devtools/build.py @@ -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): """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 ``public`` and ``stable``: - * public and stable: only returns the public stable channel(s) - * public and not stable: returns both public stable and beta channels - * not public and stable: returns both public and private stable channels - * not public and not stable: returns all channels - - Beta channels have priority over stable channels, if returned. Private - channels have priority over public channles, if turned. + * public and stable: only returns the public stable folder + * public and not stable: only returns the public beta folder + * not public and stable: returns public and private stable folders + * not public and not stable: returns public and private beta folders + If returned, Priavte channels have **lower** priority over public channles + because, private packages become public eventually. Args: @@ -473,7 +476,8 @@ def get_docserver_setup(public, stable, server, intranet, group): server: The base address of the server containing our conda channels intranet: Boolean indicating if we should add "private"/"public" prefixes 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 our internal webserver. Currently, only "bob" or "beat" will work. @@ -493,6 +497,7 @@ def get_docserver_setup(public, stable, server, intranet, group): # public documentation: always can access prefix = "/software/%s" % group + if stable: entries += [ server + prefix + "/docs/" + group + "/%(name)s/%(version)s/", diff --git a/bob/devtools/data/conda_build_config.yaml b/bob/devtools/data/conda_build_config.yaml index 7c1b96ae7ed908e9070892b21512010cbd88753a..2af1c2132de4432c46ca3d7f6354fc2b3f1894f0 100644 --- a/bob/devtools/data/conda_build_config.yaml +++ b/bob/devtools/data/conda_build_config.yaml @@ -1,3 +1,6 @@ +# 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 # 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 diff --git a/bob/devtools/data/gitlab-ci/single-package.yaml b/bob/devtools/data/gitlab-ci/single-package.yaml index 4df03e18d7d9965cca0d75b785c1b086ad7e6a26..abf1526a29b2665dd8e9a703760963a0a791fec9 100644 --- a/bob/devtools/data/gitlab-ci/single-package.yaml +++ b/bob/devtools/data/gitlab-ci/single-package.yaml @@ -54,6 +54,8 @@ stages: tags: - bob - 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 artifacts: paths: diff --git a/bob/devtools/data/recipe_append.yaml b/bob/devtools/data/recipe_append.yaml index 25e260fdbce2e29ba6919df557026031594b47f8..ba10db3362c4e2c28bf07da9a648ed82a6cb0f4a 100644 --- a/bob/devtools/data/recipe_append.yaml +++ b/bob/devtools/data/recipe_append.yaml @@ -1,9 +1,5 @@ -build: - script_env: - - DOCSERVER - - NOSE_EVAL_ATTR - - PYTEST_ADDOPTS - +# Because we want to use centos 7 +# https://conda-forge.org/docs/maintainer/knowledge_base.html#using-centos-7 requirements: # [linux64] build: # [linux64] - sysroot_linux-64 2.17 # [linux64] diff --git a/conda/meta.yaml b/conda/meta.yaml index a4506c419babf485ecd1bd7b4561c9703076f36e..8ec321a8a33a4d317a75d39924b791f8092364cf 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -31,6 +31,8 @@ requirements: - black >=19 - click >=7 - click-plugins + # conda, conda-build, mamba, boa versions below are the same versions as in + # bob.devtools/bob/devtools/bootstrap.py - conda=4 - conda-build=3 - mamba=0.23 diff --git a/conda/recipe_append.yaml b/conda/recipe_append.yaml index f02e4e0b4b8705948e6b44528c579bfd1798cfa0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/conda/recipe_append.yaml +++ b/conda/recipe_append.yaml @@ -1,5 +0,0 @@ -build: - script_env: - - DOCSERVER - - NOSE_EVAL_ATTR - - PYTEST_ADDOPTS