Merge branch 'test-issue-1' into 'master'

Rebuilds with latest changes to software stack

Closes #1

See merge request !3

conda/meta.yaml

@@ -25,25 +25,33 @@ requirements:
     - python {{ python }}
     - setuptools {{ setuptools }}
     - pip {{ pip }}
+    - matplotlib {{ matplotlib }}
     - numpy {{ numpy }}
-    - scipy {{ scipy }}
+    - pandas {{ pandas }}
+    - pillow {{ pillow }}
+    - psutil {{ psutil }}
     - pytorch {{ pytorch }}
+    - scikit-learn {{ scikit_learn }}
+    - scipy {{ scipy }}
+    - tabulate {{ tabulate }}
     - torchvision  {{ torchvision }}
+    - tqdm {{ tqdm }}
     - bob.extension
     - bob.measure
   run:
     - python
     - setuptools
-    - {{ pin_compatible('numpy') }}
-    - {{ pin_compatible('scipy') }}
-    - {{ pin_compatible('pytorch') }}
-    - {{ pin_compatible('torchvision') }}
-    - {{ pin_compatible('tabulate') }}
     - {{ pin_compatible('matplotlib') }}
+    - {{ pin_compatible('numpy') }}
     - {{ pin_compatible('pandas') }}
+    - {{ pin_compatible('pillow') }}
+    - {{ pin_compatible('psutil') }}
+    - {{ pin_compatible('pytorch') }}
     - {{ pin_compatible('scikit-learn') }}
+    - {{ pin_compatible('scipy') }}
+    - {{ pin_compatible('tabulate') }}
+    - {{ pin_compatible('torchvision') }}
     - {{ pin_compatible('tqdm') }}
-    - {{ pin_compatible('psutil') }}
 
 test:
   imports:
@@ -53,8 +61,7 @@ test:
     # runs tests for package only, report only what is in the package
     # creates html and xml reports and place them in specific directories
     - pytest --capture=no --verbose --cov {{ name }} --cov-report term-missing --cov-report html:{{ project_dir }}/sphinx/coverage --cov-report xml:{{ project_dir }}/coverage.xml --pyargs {{ name }}
-    #- sphinx-build -aEW {{ project_dir }}/doc {{ project_dir }}/sphinx
-    - sphinx-build -aE {{ project_dir }}/doc {{ project_dir }}/sphinx
+    - sphinx-build -aEW {{ project_dir }}/doc {{ project_dir }}/sphinx
     - sphinx-build -aEb doctest {{ project_dir }}/doc sphinx
     - conda inspect linkages -p $PREFIX {{ name }}  # [not win]
     - conda inspect objects -p $PREFIX {{ name }}  # [osx]

doc/conf.py

@@ -237,26 +237,18 @@ autodoc_default_options = {
   "show-inheritance": True,
 }
 
+# For inter-documentation mapping: notice sphinx changes to the current
+# directory to build the documentation
+from bob.extension.utils import link_documentation
 
-# For inter-documentation mapping:
-from bob.extension.utils import link_documentation, load_requirements
-sphinx_requirements = "extra-intersphinx.txt"
-if os.path.exists(sphinx_requirements):
+if os.path.exists("requirements.txt"):
+    # building on the CI, with a copy of requirements.txt
     intersphinx_mapping = link_documentation(
-        additional_packages=['python', 'numpy'] + \
-            load_requirements(sphinx_requirements))
+        requirements_file="requirements.txt"
+    )
 else:
+    # building locally
     intersphinx_mapping = link_documentation()
 
-intersphinx_mapping['torch'] = ('https://pytorch.org/docs/stable/', None)
-intersphinx_mapping['PIL'] = ('http://pillow.readthedocs.io/en/stable', None)
-intersphinx_mapping['pandas'] = ('https://pandas.pydata.org/pandas-docs/stable/',None)
-
-# Figures out the major click version we use
-import pkg_resources
-click_version = pkg_resources.require('click')[0].version.split('.')[0]
-click_version += '.x'
-intersphinx_mapping['click'] = ('https://click.palletsprojects.com/en/%s/' % (click_version,),None)
-
 # Add our private index (for extras and fixes)
-intersphinx_mapping['extras'] = ('', 'extras.inv')
+intersphinx_mapping["extras"] = ("", "extras.inv")

doc/extras.txt

@@ -2,22 +2,24 @@
 # Project: extras
 # Version: stable
 # The remainder of this file is compressed using zlib.
+torch.device py:class 1 https://pytorch.org/docs/master/tensor_attributes.html#torch.torch.device -
 torch.optim.optimizer.Optimizer py:class 1 https://pytorch.org/docs/stable/optim.html#torch.optim.Optimizer -
 torch.nn.Module py:class 1 https://pytorch.org/docs/stable/nn.html?highlight=module#torch.nn.Module -
 torch.nn.modules.module.Module py:class 1 https://pytorch.org/docs/stable/nn.html?highlight=module#torch.nn.Module -
 torch.utils.data.dataset.Dataset py:class 1 https://pytorch.org/docs/stable/data.html?highlight=dataset#torch.utils.data.Dataset -
 unittest.case.TestCase py:class 1 https://docs.python.org/3/library/unittest.html?highlight=testcase#unittest.TestCase -
 click.core.Option py:class 1 https://click.palletsprojects.com/en/7.x/api/#click.Option -
-torchvision.transforms.transforms.ColorJitter py:class 1 https://pytorch.org/docs/stable/torchvision/transforms.html#torchvision.transforms.ColorJitter -
-torchvision.transforms.transforms.RandomRotation py:class 1 https://pytorch.org/docs/stable/torchvision/transforms.html#torchvision.transforms.RandomRotation -
-torchvision.transforms.transforms.RandomVerticalFlip py:class 1 https://pytorch.org/docs/stable/torchvision/transforms.html#torchvision.transforms.RandomVerticalFlip -
-torchvision.transforms.transforms.RandomHorizontalFlip py:class 1 https://pytorch.org/docs/stable/torchvision/transforms.html#torchvision.transforms.RandomHorizontalFlip -
-torchvision.transforms.transforms.Compose py:class 1 https://pytorch.org/docs/stable/torchvision/transforms.html#torchvision.transforms.Compose -
-torchvision.transforms.transforms.ToTensor py:class 1 https://pytorch.org/docs/stable/torchvision/transforms.html#torchvision.transforms.ToTensor -
-torchvision.transforms.transforms.Resize py:class 1 https://pytorch.org/docs/stable/torchvision/transforms.html#torchvision.transforms.Resize -
-torchvision.transforms.transforms.Pad py:class 1 https://pytorch.org/docs/stable/torchvision/transforms.html#torchvision.transforms.Pad -
-torchvision.transforms.transforms.CenterCrop py:class 1 https://pytorch.org/docs/stable/torchvision/transforms.html#torchvision.transforms.CenterCrop -
-torchvision.transforms py:module 1 https://pytorch.org/docs/stable/torchvision/transforms.html -
-torchvision.models.mobilenet.MobileNetV2 py:class 1 https://pytorch.org/docs/stable/torchvision/models.html#mobilenet-v2 -
-torchvision.models.resnet.ResNet py:class 1 https://pytorch.org/docs/stable/torchvision/models.html#id10 -
-torchvision.models.vgg.VGG py:class 1 https://pytorch.org/docs/stable/torchvision/models.html#id2 -
+torchvision.transforms.transforms.ColorJitter py:class 1 https://pytorch.org/vision/stable/transforms.html#torchvision.transforms.ColorJitter -
+torchvision.transforms.transforms.RandomRotation py:class 1 https://pytorch.org/vision/stable/transforms.html#torchvision.transforms.RandomRotation -
+torchvision.transforms.transforms.RandomVerticalFlip py:class 1 https://pytorch.org/vision/stable/transforms.html#torchvision.transforms.RandomVerticalFlip -
+torchvision.transforms.transforms.RandomHorizontalFlip py:class 1 https://pytorch.org/vision/stable/transforms.html#torchvision.transforms.RandomHorizontalFlip -
+torchvision.transforms.transforms.Compose py:class 1 https://pytorch.org/vision/stable/transforms.html#torchvision.transforms.Compose -
+torchvision.transforms.transforms.ToTensor py:class 1 https://pytorch.org/vision/stable/transforms.html#torchvision.transforms.ToTensor -
+torchvision.transforms.transforms.Resize py:class 1 https://pytorch.org/vision/stable/transforms.html#torchvision.transforms.Resize -
+torchvision.transforms.transforms.Pad py:class 1 https://pytorch.org/vision/stable/transforms.html#torchvision.transforms.Pad -
+torchvision.transforms.transforms.CenterCrop py:class 1 https://pytorch.org/vision/stable/transforms.html#torchvision.transforms.CenterCrop -
+torchvision.transforms.transforms.GaussianBlur py:class 1 https://pytorch.org/vision/master/generated/torchvision.transforms.GaussianBlur.html#gaussianblur -
+torchvision.transforms py:module 1 https://pytorch.org/vision/stable/transforms.html -
+torchvision.models.mobilenetv2.MobileNetV2 py:class 1 https://pytorch.org/vision/stable/models.html#mobilenet-v2 -
+torchvision.models.resnet.ResNet py:class 1 https://pytorch.org/vision/stable/models.html#id10 -
+torchvision.models.vgg.VGG py:class 1 https://pytorch.org/vision/stable/models.html#id2 -

requirements.txt

@@ -8,3 +8,7 @@ scikit-learn
 tqdm
 psutil
 tabulate
+matplotlib
+pillow
+torch>=1.8
+torchvision>=0.10