diff --git a/bob/devtools/bootstrap.py b/bob/devtools/bootstrap.py index f413b8981138e0c3668b14a93a74832a5f2fef30..a0fda861340675ae987298f0e0cd4a43e5e36b06 100644 --- a/bob/devtools/bootstrap.py +++ b/bob/devtools/bootstrap.py @@ -384,6 +384,7 @@ if __name__ == '__main__': conda_version = '4' conda_build_version = '3.16' + conda_verify_version = '3' conda_verbosity = [] #if args.verbose >= 2: @@ -398,6 +399,7 @@ if __name__ == '__main__': 'python', 'conda=%s' % conda_version, 'conda-build=%s' % conda_build_version, + 'conda-verify=%s' % conda_verify_version, 'twine', #required for checking readme of python (zip) distro ]) @@ -408,6 +410,7 @@ if __name__ == '__main__': 'python', 'conda=%s' % conda_version, 'conda-build=%s' % conda_build_version, + 'conda-verify=%s' % conda_verify_version, 'twine', #required for checking readme of python (zip) distro ]) conda_bld_path = os.path.join(args.conda_root, 'conda-bld') diff --git a/conda/meta.yaml b/conda/meta.yaml index 3badca3cf7c9bb90332d755c69b658473fabb477..255ffca2116474ebf52421215c1826856ecdc9a0 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -35,6 +35,7 @@ requirements: - click-plugins - conda=4 - conda-build=3.16 + - conda-verify=3 - certifi - pytz - python-dateutil diff --git a/doc/install.rst b/doc/install.rst index 0f29391520beef5662d8ff5ec5aec997f83127ad..4903bd8801b28a0acfe216158f0e3cc8e03a20a6 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -8,17 +8,30 @@ ============== You can install this package via conda_, simply pointing to our stable or beta -channels:: +channels: - $ conda create -n bdt -c https://www.idiap.ch/software/bob/conda bob.devtools - # or, for beta releases: - $ conda create -n bdt -c https://www.idiap.ch/software/bob/conda/label/beta bob.devtools +.. code-block:: sh -We provide packages for both 64-bit Linux and MacOS. Once installed, you can -use these tools within the created environment like this:: + $ conda create -n bdt -c https://www.idiap.ch/software/bob/conda bob.devtools + # or, for beta releases: + $ conda create -n bdt -c https://www.idiap.ch/software/bob/conda/label/beta -c https://www.idiap.ch/software/bob/conda bob.devtools - $ conda activate bdt - (bdt) $ bdt --help +If you use one of our supported Python versions on your base environment, you +may also install ``bdt`` on it: + +.. code-block:: sh + + $ conda install -n base -c https://www.idiap.ch/software/bob/conda bob.devtools + # or, for beta releases: + $ conda install -n base -c https://www.idiap.ch/software/bob/conda/label/beta -c https://www.idiap.ch/software/bob/conda bob.devtools + +We provide packages for both 64-bit Linux and MacOS, for Python 3.6+. Once +installed, you can use these tools within the created environment like this: + +.. code-block:: sh + + $ conda activate base #or bdt, depending where you installed it + (bdt) $ bdt --help diff --git a/setup.py b/setup.py index 01918fb2ffcbeb365f69dbfa00430be17ff57aa5..f1dd0ff7977904896aa53bacc9eb1446571f8395 100644 --- a/setup.py +++ b/setup.py @@ -7,9 +7,11 @@ version = open("version.txt").read().rstrip() requires = [ 'setuptools', - 'click>=7.0.0', + 'click>=7', 'click-plugins', - 'conda-build>=3.0.0', + 'conda>=4,<5', + 'conda-build>=3,<4', + 'conda-verify>=3,<4', 'certifi', 'requests', 'gitpython',