Merge branch 'conda-verify' into 'master'

Conda verify

See merge request !13

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')

conda/meta.yaml

@@ -35,6 +35,7 @@ requirements:
     - click-plugins
     - conda=4
     - conda-build=3.16
+    - conda-verify=3
     - certifi
     - pytz
     - python-dateutil

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
 
 
 

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',