Skip to content
Snippets Groups Projects
Commit 07cc775c authored by Amir MOHAMMADI's avatar Amir MOHAMMADI
Browse files

Merge branch 'drop-free-channel' into 'master'

[conda] Drop free channel from the defaults list

Closes #33

See merge request !90
parents 46d5bf34 bf205b4a
No related branches found
No related tags found
1 merge request!90[conda] Drop free channel from the defaults list
Pipeline #32395 passed
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
_BASE_CONDARC = """\ _BASE_CONDARC = """\
default_channels: #!final default_channels: #!final
- https://repo.anaconda.com/pkgs/main - https://repo.anaconda.com/pkgs/main
- https://repo.anaconda.com/pkgs/free
add_pip_as_python_dependency: false #!final add_pip_as_python_dependency: false #!final
always_yes: true #!final always_yes: true #!final
quiet: true #!final quiet: true #!final
......
...@@ -51,12 +51,12 @@ zip_keys: ...@@ -51,12 +51,12 @@ zip_keys:
# This version of bob-devel will be used at test time of packages: # This version of bob-devel will be used at test time of packages:
bob_devel: bob_devel:
- 2019.08.04 - 2019.08.09
# This version of beat-devel will be used at test time of packages. Notice it # This version of beat-devel will be used at test time of packages. Notice it
# uses bob-devel and should have a version that is greater or equal its value # uses bob-devel and should have a version that is greater or equal its value
beat_devel: beat_devel:
- 2019.08.04 - 2019.08.09
# The build time only dependencies (build requirements). # The build time only dependencies (build requirements).
# Updating these to the latest version all the time is OK and a good idea. # Updating these to the latest version all the time is OK and a good idea.
...@@ -66,8 +66,6 @@ cmake: ...@@ -66,8 +66,6 @@ cmake:
- 3.14.0 - 3.14.0
pkg_config: pkg_config:
- 0.29.2 - 0.29.2
cython:
- 0.29.12
# The dependencies that we link against (host requirements). # The dependencies that we link against (host requirements).
# Ideally we want to build against the oldest possible version of packages when # Ideally we want to build against the oldest possible version of packages when
...@@ -91,8 +89,6 @@ libblitz: ...@@ -91,8 +89,6 @@ libblitz:
- 1.0.1 - 1.0.1
libmatio: libmatio:
- 1.5.15 - 1.5.15
libogg:
- 1.3.2
libpng: libpng:
- 1.6.35 - 1.6.35
libsvm: libsvm:
...@@ -101,22 +97,10 @@ libtiff: ...@@ -101,22 +97,10 @@ libtiff:
- 4.0.9 - 4.0.9
mkl: mkl:
- 2019.1 - 2019.1
openfst:
- 1.6.7
sox: sox:
- 14.4.2 - 14.4.2
speex:
- 1.2.0
speexdsp:
- 1.2rc3
sqlite:
- 3.29.0
vlfeat: vlfeat:
- 0.9.21 - 0.9.21
xz:
- 5.2.3
zlib:
- 1.2.11
# The dependencies that are needed for runtime only (run requirements). # The dependencies that are needed for runtime only (run requirements).
# These versions **should** match the versions inside bob-devel recipe. # These versions **should** match the versions inside bob-devel recipe.
...@@ -125,11 +109,9 @@ caffe: ...@@ -125,11 +109,9 @@ caffe:
click: click:
- 7.0 - 7.0
click_plugins: click_plugins:
- 1.0.4 - 1.1.1
coverage:
- 4.5.3
cyvlfeat: cyvlfeat:
- 0.4.6 - 0.5.1
dlib: dlib:
- 19.7 - 19.7
docopt: docopt:
...@@ -139,71 +121,53 @@ h5py: ...@@ -139,71 +121,53 @@ h5py:
jinja2: jinja2:
- 2.10.1 - 2.10.1
kaldi: kaldi:
- 2017.03.13 - 1!5.5.164
madmom:
- 0.16.1
matplotlib: matplotlib:
- 3.0.3 - 3.1.0
menpo: menpo:
- 0.8.1 - 0.9.1
menpofit: menpofit:
- 0.5.0 - 0.6.1
mido:
- 1.2.9
mne: mne:
- 0.15.2 - 0.18.1
mr_developer:
- 1.38
nose:
- 1.3.7
opencv: opencv:
- 3.4.2 - 3.4.2
pillow: pillow:
- 5.4.1 - 6.1.0
pyedflib: pyedflib:
- 0.1.11 - 0.1.14
pytorch: pytorch:
- 1.0.1 - 1.1.0
pyyaml: pyyaml:
- 5.1 - 5.1.1
requests: requests:
- 2.21.0 - 2.22.0
schema: schema:
- 0.6.7 - 0.7.0
scikit_image: scikit_image:
- 0.14.2 - 0.15.0
scikit_learn: scikit_learn:
- 0.20.3 - 0.21.2
scipy: scipy:
- 1.2.1 - 1.2.1
setuptools: setuptools:
- 41.0.0 - 41.0.1
six: six:
- 1.12.0 - 1.12.0
sphinx:
- 1.8.5
sphinx_rtd_theme:
- 0.4.3
sqlalchemy: sqlalchemy:
- 1.3.1 - 1.3.1
tabulate: tabulate:
- 0.8.3 - 0.8.3
tensorflow: tensorflow:
- 1.13.1 - 1.14.0
termcolor:
- 1.1.0
torchvision: torchvision:
- 0.2.1 - 0.3.0
zc_buildout:
- 2.12.2
zc_recipe_egg:
- 2.0.7
# The dependencies that are needed for runtime only (run requirements) of BEAT # The dependencies that are needed for runtime only (run requirements) of BEAT
# packages. These versions **should** match the versions inside beat-devel # packages. These versions **should** match the versions inside beat-devel
# recipe. # recipe.
docker_py: docker_py:
- 3.6.0 - 4.0.2
jsonschema: jsonschema:
- 3.0.1 - 3.0.1
oset: oset:
...@@ -215,7 +179,7 @@ pyzmq: ...@@ -215,7 +179,7 @@ pyzmq:
simplejson: simplejson:
- 3.16.0 - 3.16.0
sphinxcontrib_programoutput: sphinxcontrib_programoutput:
- 0.11 - 0.14
sphinxcontrib_httpdomain: sphinxcontrib_httpdomain:
- 1.7.0 - 1.7.0
nodejs: nodejs:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment