From 3efbd301f802a72519e3963277e1756db21d83b6 Mon Sep 17 00:00:00 2001 From: Amir MOHAMMADI <amir.mohammadi@idiap.ch> Date: Thu, 26 Jul 2018 14:20:24 +0200 Subject: [PATCH] Fix the list of packages --- .gitignore | 34 +++++++++++++--------------------- README.rst | 1 + conda/meta.yaml | 13 ++++++------- doc/index.rst | 18 ++++++++---------- doc/readme_index.rst | 20 +++++++++----------- requirements.txt | 6 ++---- 6 files changed, 39 insertions(+), 53 deletions(-) diff --git a/.gitignore b/.gitignore index 9ed1a97..7dbfa1b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,10 @@ *.swo *.swp *~ -.installed.cfg -bin/ -bob.docs.egg-info/ -develop-eggs/ +doc/bob/ doc/bob.ap/ doc/bob.bio.base/ -doc/bob.bio.caffe_face +doc/bob.bio.caffe_face/ doc/bob.bio.face/ doc/bob.bio.gmm/ doc/bob.bio.spear/ @@ -28,37 +25,34 @@ doc/bob.db.biosecure/ doc/bob.db.biosecurid.face/ doc/bob.db.casme2/ doc/bob.db.caspeal/ -doc/bob.db.cbsr_nir_vis_2 +doc/bob.db.cbsr_nir_vis_2/ doc/bob.db.cohface/ doc/bob.db.cuhk_cufs/ -doc/bob.db.cuhk_cufsf +doc/bob.db.cuhk_cufsf/ doc/bob.db.frgc/ doc/bob.db.fv3d/ doc/bob.db.gbu/ doc/bob.db.hci_tagging/ -doc/bob.db.hkpu -doc/bob.db.hmtvein doc/bob.db.ijba/ -doc/bob.db.ijbc +doc/bob.db.ijbc/ doc/bob.db.iris/ doc/bob.db.kboc16/ doc/bob.db.lfw/ doc/bob.db.livdet2013/ -doc/bob.db.mmcbnu6k +doc/bob.db.maskattack/ doc/bob.db.mnist/ doc/bob.db.mobio/ doc/bob.db.msu_mfsd_mod/ doc/bob.db.multipie/ doc/bob.db.nist_sre12/ -doc/bob.db.nivl +doc/bob.db.nivl/ doc/bob.db.oulunpu/ doc/bob.db.pericrosseye/ -doc/bob.db.pola_thermal +doc/bob.db.pola_thermal/ doc/bob.db.putvein/ doc/bob.db.replay/ doc/bob.db.replaymobile/ doc/bob.db.scface/ -doc/bob.db.thufvdt doc/bob.db.utfvp/ doc/bob.db.uvad/ doc/bob.db.verafinger/ @@ -74,7 +68,7 @@ doc/bob.io.image/ doc/bob.io.matlab/ doc/bob.io.video/ doc/bob.ip.base/ -doc/bob.ip.caffe_extractor +doc/bob.ip.caffe_extractor/ doc/bob.ip.color/ doc/bob.ip.dlib/ doc/bob.ip.draw/ @@ -82,12 +76,12 @@ doc/bob.ip.facedetect/ doc/bob.ip.facelandmarks/ doc/bob.ip.flandmark/ doc/bob.ip.gabor/ -doc/bob.ip.mtcnn +doc/bob.ip.mtcnn/ doc/bob.ip.optflow.hornschunck/ doc/bob.ip.optflow.liu/ doc/bob.ip.qualitymeasure/ doc/bob.ip.skincolorfilter/ -doc/bob.ip.tensorflow_extractor +doc/bob.ip.tensorflow_extractor/ doc/bob.learn.activation/ doc/bob.learn.boosting/ doc/bob.learn.em/ @@ -100,11 +94,9 @@ doc/bob.pad.base/ doc/bob.pad.face/ doc/bob.pad.vein/ doc/bob.pad.voice/ -doc/bob.rppg.base +doc/bob.rppg.base/ doc/bob.sp/ -doc/bob/ -doc/extra-intersphinx.txt doc/gridtk/ +doc/extra-intersphinx.txt doc/nitpick-exceptions.txt -eggs/ sphinx/ diff --git a/README.rst b/README.rst index c9fd48e..fc06fdc 100644 --- a/README.rst +++ b/README.rst @@ -11,6 +11,7 @@ Adding a new package To add a new package: * Make sure the package is **public** first. Do not add private packages here. +* Make sure the package is in https://gitlab.idiap.ch/bob/bob first. * Add it in ``conda/meta.yaml`` and ``requirements.txt``. * Add it in ``doc/index.rst`` (you need to add it in several places in this file). * Add it in ``doc/readme_index.rst``. diff --git a/conda/meta.yaml b/conda/meta.yaml index 3a62818..1975ce5 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -16,7 +16,7 @@ requirements: - bob - bob.ap - bob.bio.base - - bob.bio.caffe_face + - bob.bio.caffe_face - bob.bio.face - bob.bio.gmm - bob.bio.spear @@ -45,19 +45,18 @@ requirements: - bob.db.fv3d - bob.db.gbu - bob.db.hci_tagging - - bob.db.hmtvein - - bob.db.hkpu - bob.db.ijba - bob.db.ijbc - bob.db.iris - bob.db.kboc16 - bob.db.lfw - bob.db.livdet2013 - - bob.db.mmcbnu6k + - bob.db.maskattack - bob.db.mnist - bob.db.mobio - bob.db.msu_mfsd_mod - bob.db.multipie + - bob.db.nist_sre12 - bob.db.nivl - bob.db.oulunpu - bob.db.pericrosseye @@ -66,7 +65,6 @@ requirements: - bob.db.replay - bob.db.replaymobile - bob.db.scface - - bob.db.thufvdt - bob.db.utfvp - bob.db.uvad - bob.db.verafinger @@ -83,7 +81,7 @@ requirements: - bob.io.video - bob.ip.base - bob.ip.caffe_extractor - - bob.ip.color + - bob.ip.color - bob.ip.dlib - bob.ip.draw - bob.ip.facedetect @@ -95,7 +93,7 @@ requirements: - bob.ip.optflow.liu - bob.ip.qualitymeasure - bob.ip.skincolorfilter - - bob.ip.tensorflow_extractor + - bob.ip.tensorflow_extractor - bob.learn.activation - bob.learn.boosting - bob.learn.em @@ -111,6 +109,7 @@ requirements: - bob.rppg.base - bob.sp - gridtk + test: commands: - sphinx-build {{ project_dir }}/doc {{ project_dir }}/sphinx diff --git a/doc/index.rst b/doc/index.rst index 7857d95..12032ff 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -42,6 +42,7 @@ Signal, Audio, Image and Video Processing * :ref:`bob.ip.skincolorfilter` * :ref:`bob.ip.mtcnn` * :ref:`bob.ip.caffe_extractor` +* :ref:`bob.ip.tensorflow_extractor` Machine Learning ---------------- @@ -75,8 +76,9 @@ Biometric Recognition * :ref:`bob.bio.vein` * :ref:`bob.bio.video` * :ref:`bob.bio.gmm` -* :ref:`bob.bio.caffe_face` +* :ref:`bob.ip.caffe_extractor` * :ref:`bob.ip.tensorflow_extractor` +* :ref:`bob.bio.caffe_face` Presentation Attack Detection (anti-spoofing) @@ -117,19 +119,18 @@ Database Interfaces * :ref:`bob.db.fv3d` * :ref:`bob.db.gbu` * :ref:`bob.db.hci_tagging` -* :ref:`bob.db.hkpu` -* :ref:`bob.db.hmtvein` * :ref:`bob.db.ijba` * :ref:`bob.db.ijbc` * :ref:`bob.db.iris` * :ref:`bob.db.kboc16` * :ref:`bob.db.lfw` * :ref:`bob.db.livdet2013` -* :ref:`bob.db.mmcbnu6k` +* :ref:`bob.db.maskattack` * :ref:`bob.db.mnist` * :ref:`bob.db.mobio` * :ref:`bob.db.msu_mfsd_mod` * :ref:`bob.db.multipie` +* :ref:`bob.db.nist_sre12` * :ref:`bob.db.nivl` * :ref:`bob.db.oulunpu` * :ref:`bob.db.pericrosseye` @@ -138,7 +139,6 @@ Database Interfaces * :ref:`bob.db.replay` * :ref:`bob.db.replaymobile` * :ref:`bob.db.scface` -* :ref:`bob.db.thufvdt` * :ref:`bob.db.utfvp` * :ref:`bob.db.uvad` * :ref:`bob.db.verafinger` @@ -189,19 +189,18 @@ Index of all Packages bob.db.fv3d <bob.db.fv3d/doc/index.rst> bob.db.gbu <bob.db.gbu/doc/index.rst> bob.db.hci_tagging <bob.db.hci_tagging/doc/index.rst> - bob.db.hkpu <bob.db.hkpu/README.rst> - bob.db.hmtvein <bob.db.hmtvein/README.rst> bob.db.ijba <bob.db.ijba/doc/index.rst> - bob.db.ijbc <bob.db.ijbc/README.rst> + bob.db.ijbc <bob.db.ijbc/README.rst> bob.db.iris <bob.db.iris/doc/index.rst> bob.db.kboc16 <bob.db.kboc16/doc/index.rst> bob.db.lfw <bob.db.lfw/doc/index.rst> bob.db.livdet2013 <bob.db.livdet2013/doc/index.rst> - bob.db.mmcbnu6k <bob.db.mmcbnu6k/README.rst> + bob.db.maskattack <bob.db./doc/index.rst> bob.db.mnist <bob.db.mnist/doc/index.rst> bob.db.mobio <bob.db.mobio/doc/index.rst> bob.db.msu_mfsd_mod <bob.db.msu_mfsd_mod/doc/index.rst> bob.db.multipie <bob.db.multipie/doc/index.rst> + bob.db.nist_sre12 <bob.db.nist_sre12/doc/index.rst> bob.db.nivl <bob.db.nivl/README.rst> bob.db.oulunpu <bob.db.oulunpu/doc/index.rst> bob.db.pericrosseye <bob.db.pericrosseye/doc/index.rst> @@ -210,7 +209,6 @@ Index of all Packages bob.db.replay <bob.db.replay/doc/index.rst> bob.db.replaymobile <bob.db.replaymobile/doc/index.rst> bob.db.scface <bob.db.scface/doc/index.rst> - bob.db.thufvdt <bob.db.thufvdt/README.rst> bob.db.utfvp <bob.db.utfvp/doc/index.rst> bob.db.uvad <bob.db.uvad/doc/index.rst> bob.db.verafinger <bob.db.verafinger/doc/index.rst> diff --git a/doc/readme_index.rst b/doc/readme_index.rst index 8fad1ed..ac42c05 100644 --- a/doc/readme_index.rst +++ b/doc/readme_index.rst @@ -18,7 +18,7 @@ README of all Packages bob.bio.video <bob.bio.video/README.rst> bob.blitz <bob.blitz/README.rst> bob.buildout <bob.buildout/README.rst> - bob.core <bob.core/README.rst> + bob.core <bob.core/README.rst> bob.db.arface <bob.db.arface/README.rst> bob.db.asvspoof <bob.db.asvspoof/README.rst> bob.db.asvspoof2017 <bob.db.asvspoof2017/README.rst> @@ -30,37 +30,35 @@ README of all Packages bob.db.biosecure <bob.db.biosecure/README.rst> bob.db.biosecurid.face <bob.db.biosecurid.face/README.rst> bob.db.casme2 <bob.db.casme2/README.rst> - bob.db.cbsr_nir_vis_2 <bob.db.cbsr_nir_vis_2/README.rst> bob.db.caspeal <bob.db.caspeal/README.rst> + bob.db.cbsr_nir_vis_2 <bob.db.cbsr_nir_vis_2/README.rst> bob.db.cohface <bob.db.cohface/README.rst> bob.db.cuhk_cufs <bob.db.cuhk_cufs/README.rst> - bob.db.cuhk_cufsf <bob.db.cuhk_cufsf/README.rst> + bob.db.cuhk_cufsf <bob.db.cuhk_cufsf/README.rst> bob.db.frgc <bob.db.frgc/README.rst> bob.db.fv3d <bob.db.fv3d/README.rst> bob.db.gbu <bob.db.gbu/README.rst> bob.db.hci_tagging <bob.db.hci_tagging/README.rst> - bob.db.hkpu <bob.db.hkpu/README.rst> - bob.db.hmtvein <bob.db.hmtvein/README.rst> bob.db.ijba <bob.db.ijba/README.rst> bob.db.ijbc <bob.db.ijbc/README.rst> bob.db.iris <bob.db.iris/README.rst> bob.db.kboc16 <bob.db.kboc16/README.rst> bob.db.lfw <bob.db.lfw/README.rst> bob.db.livdet2013 <bob.db.livdet2013/README.rst> - bob.db.mmcbnu6k <bob.db.mmcbnu6k/README.rst> + bob.db.maskattack <bob.db.maskattack/README.rst> bob.db.mnist <bob.db.mnist/README.rst> bob.db.mobio <bob.db.mobio/README.rst> bob.db.msu_mfsd_mod <bob.db.msu_mfsd_mod/README.rst> bob.db.multipie <bob.db.multipie/README.rst> + bob.db.nist_sre12 <bob.db.nist_sre12/README.rst> bob.db.nivl <bob.db.nivl/README.rst> bob.db.oulunpu <bob.db.oulunpu/README.rst> bob.db.pericrosseye <bob.db.pericrosseye/README.rst> - bob.db.pola_thermal<bob.db.pola_thermal/README.rst> + bob.db.pola_thermal <bob.db.pola_thermal/README.rst> bob.db.putvein <bob.db.putvein/README.rst> bob.db.replay <bob.db.replay/README.rst> bob.db.replaymobile <bob.db.replaymobile/README.rst> bob.db.scface <bob.db.scface/README.rst> - bob.db.thufvdt <bob.db.thufvdt/README.rst> bob.db.utfvp <bob.db.utfvp/README.rst> bob.db.uvad <bob.db.uvad/README.rst> bob.db.verafinger <bob.db.verafinger/README.rst> @@ -84,12 +82,12 @@ README of all Packages bob.ip.facelandmarks <bob.ip.facelandmarks/README.rst> bob.ip.flandmark <bob.ip.flandmark/README.rst> bob.ip.gabor <bob.ip.gabor/README.rst> - bob.ip.mtcnn <bob.ip.mtcnn/README.rst> + bob.ip.mtcnn <bob.ip.mtcnn/README.rst> bob.ip.optflow.hornschunck <bob.ip.optflow.hornschunck/README.rst> bob.ip.optflow.liu <bob.ip.optflow.liu/README.rst> bob.ip.qualitymeasure <bob.ip.qualitymeasure/README.rst> bob.ip.skincolorfilter <bob.ip.skincolorfilter/README.rst> - bob.ip.tensorflow_extractor <bob.ip.tensorflow_extractor/README.rst> + bob.ip.tensorflow_extractor <bob.ip.tensorflow_extractor/README.rst> bob.learn.activation <bob.learn.activation/README.rst> bob.learn.boosting <bob.learn.boosting/README.rst> bob.learn.em <bob.learn.em/README.rst> @@ -102,6 +100,6 @@ README of all Packages bob.pad.face <bob.pad.face/README.rst> bob.pad.vein <bob.pad.vein/README.rst> bob.pad.voice <bob.pad.voice/README.rst> - bob.sp <bob.sp/README.rst> bob.rppg.base <bob.rppg.base/README.rst> + bob.sp <bob.sp/README.rst> gridtk <gridtk/README.rst> diff --git a/requirements.txt b/requirements.txt index 84295cc..f1abd65 100644 --- a/requirements.txt +++ b/requirements.txt @@ -30,19 +30,18 @@ bob.db.frgc bob.db.fv3d bob.db.gbu bob.db.hci_tagging -bob.db.hkpu -bob.db.hmtvein bob.db.ijba bob.db.ijbc bob.db.iris bob.db.kboc16 bob.db.lfw bob.db.livdet2013 -bob.db.mmcbnu6k +bob.db.maskattack bob.db.mnist bob.db.mobio bob.db.msu_mfsd_mod bob.db.multipie +bob.db.nist_sre12 bob.db.nivl bob.db.oulunpu bob.db.pericrosseye @@ -51,7 +50,6 @@ bob.db.putvein bob.db.replay bob.db.replaymobile bob.db.scface -bob.db.thufvdt bob.db.utfvp bob.db.uvad bob.db.verafinger -- GitLab