Merge branch 'new-pins-conservative' into 'master'

Adds conservative pins

See merge request !327

.gitlab-ci.yml

@@ -2,7 +2,7 @@
 variables:
   PYTHONUNBUFFERED: "1"
   CONDA_ROOT: "${CI_PROJECT_DIR}/miniconda"
-  PRE_COMMIT_HOME: "${CI_PROJECT_DIR}/.cache/pre-commit"
+  XDG_CACHE_HOME: "${CI_PROJECT_DIR}/cache"
 
 
 before_script:
@@ -27,7 +27,7 @@ stages:
   cache:
     paths:
       - miniconda.sh
-      - ${PRE_COMMIT_HOME}
+      - cache/pre-commit
 
 
 .build_linux_template:
@@ -85,7 +85,7 @@ code_quality:
   cache:
     key: "$CI_JOB_STAGE"
     paths:
-      - ${PRE_COMMIT_HOME}
+      - cache/pre-commit
 
   before_script:
     - git config --global --add safe.directory ${CI_PROJECT_DIR}

bob/devtools/bootstrap.py

@@ -215,22 +215,22 @@ def ensure_miniconda_sh():
 
     # WARNING: if you update this version, remember to update hashes below
     # AND our "mirror" in the internal webserver
-    path = "https://github.com/conda-forge/miniforge/releases/download/4.12.0-0/Mambaforge-4.12.0-0-%s-%s.sh"
+    path = "https://github.com/conda-forge/miniforge/releases/download/4.14.0-0/Mambaforge-4.14.0-0-%s-%s.sh"
     if platform.system().lower() == "darwin":  # apple silicon
         system = "MacOSX"
         if platform.machine().lower() == "arm64":
-            sha256 = "59d847b17148ebd27a4b31775d0047302cf9f8f8dae7db1e75bf037f0a823d48"
+            sha256 = "35d05a65e19b8e5d596964936ddd6023ae66d664a25ba291a52fec18f06a73b6"
             machine = "arm64"
         else:  # intel
-            sha256 = "2301f866fb239ce6cda3e741e00be22ff7aa5ff76ba5683509ebae58df917546"
+            sha256 = "949f046b4404cc8e081807b048050e6642d8db5520c20d5158a7ef721fbf76c5"
             machine = "x86_64"
     else:
         system = "Linux"
         if platform.machine().lower() == "aarch64":  # raspberry pi
-            sha256 = "44e0a9f7c32e855e82a24af4df9a65ecf35a12b6eede8822b24dcf2308289d40"
+            sha256 = "37221b8d818951fab125c0bfb6cc6e83dac059f66892d2544a83192828d8e2c4"
             machine = "aarch64"
         else:  # intel
-            sha256 = "6c6fd04d688ceb7e6b540bba059dd3a541d60602e9adece3abaf754d15c83484"
+            sha256 = "d47b78b593e3cf5513bafbfa6a51eafcd9f0e164c41c79c790061bb583c82859"
             machine = "x86_64"
     path = path % (system, machine)
 
@@ -528,7 +528,7 @@ if __name__ == "__main__":
     # These are the same versions as in bob.devtools/conda/meta.yaml
     conda_version = "4"
     conda_build_version = "3"
-    mamba_version = "0.23"
+    mamba_version = "0.25"
     boa_version = "0.11"
 
     conda_verbosity = []

bob/devtools/data/conda_build_config.yaml

@@ -10,7 +10,7 @@ c_compiler:
   - clang                      # [osx]
 c_compiler_version:            # [unix]
   - 10                         # [linux]
-  - 13                         # [osx]
+  - 14                         # [osx]
   - 7                          # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux64]
   - 9                          # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux64]
   - 10                         # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux64]
@@ -20,13 +20,13 @@ cxx_compiler:
   - clangxx                    # [osx]
 cxx_compiler_version:          # [unix]
   - 10                         # [linux]
-  - 13                         # [osx]
+  - 14                         # [osx]
   - 7                          # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux64]
   - 9                          # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux64]
   - 10                         # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux64]
   - 10                         # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux64]
 llvm_openmp:                   # [osx]
-  - 13                         # [osx]
+  - 14                         # [osx]
 fortran_compiler:              # [unix or win64]
   - gfortran                   # [linux64 or (osx and x86_64)]
   - gfortran                   # [aarch64 or ppc64le or armv7l or s390x]
@@ -86,6 +86,7 @@ target_goos:
   - windows                    # [win]
 target_goarch:
   - amd64                      # [x86_64]
+  - arm64                      # [arm64 or aarch64]
 target_goexe:
   -                            # [unix]
   - .exe                       # [win]
@@ -96,8 +97,6 @@ target_gobin:
 # Rust Compiler Options
 rust_compiler:
   - rust
-rust_compiler_version:
-  - 1.40.0
 
 CONDA_BUILD_SYSROOT:            # [osx]
   - /opt/MacOSX10.9.sdk         # [osx and x86_64]
@@ -315,17 +314,13 @@ pin_run_as_build:
 
 # blas
 libblas:
-  - 3.8 *netlib  # [not (osx and arm64)]
-  - 3.9 *netlib  # [osx and arm64]
+  - 3.9 *netlib
 libcblas:
-  - 3.8 *netlib  # [not (osx and arm64)]
-  - 3.9 *netlib  # [osx and arm64]
+  - 3.9 *netlib
 liblapack:
-  - 3.8 *netlib  # [not (osx and arm64)]
-  - 3.9 *netlib  # [osx and arm64]
+  - 3.9 *netlib
 liblapacke:
-  - 3.8 *netlib  # [not (osx and arm64)]
-  - 3.9 *netlib  # [osx and arm64]
+  - 3.9 *netlib
 blas_impl:
   - openblas
   - mkl          # [x86 or x86_64]
@@ -362,19 +357,19 @@ click:
 click_plugins:
   - "1.1.1"
 cmake:
-  - "3.23.2"
+  - "3.24.2"
 coverage:
-  - "6.4.1"
+  - "6.4.4"
 dask:
-  - "2022.6.1"
+  - "2022.9.1"
 dask_jobqueue:
-  - "0.7.3"
+  - "0.8.0"
 dask_ml:
   - "2022.5.27"
 ddt:
   - "1.4.1"
 distributed:
-  - "2022.6.1"
+  - "2022.9.1"
 docker_py:
   - "5.0.3"
 docopt:
@@ -384,13 +379,13 @@ flaky:
 font_ttf_dejavu_sans_mono:
   - "2.37"
 freetype:
-  - "2.10.4"
+  - "2.12.1"
 graphviz:
-  - "4.0.0"
+  - "6.0.1"
 h5py:
-  - "3.6.0"
+  - "3.7.0"
 imageio:
-  - "2.19.3"
+  - "2.22.0"
 imageio_ffmpeg:
   - "0.4.7"
 jinja2:
@@ -398,9 +393,9 @@ jinja2:
 make:
   - "4.3"
 matplotlib:
-  - "3.5.2"
+  - "3.6.0"
 mne_base:
-  - "1.1.0"
+  - "1.1.1"
 ncurses:
   - "6.3"
 nose:
@@ -410,46 +405,46 @@ numba:
 numpy:
   - "1.22.4"
 opencv:
-  - "4.5.5"
+  - "4.6.0"
 pandas:
-  - "1.4.3"
+  - "1.5.0"
 pillow:
-  - "9.1.1"
+  - "9.2.0"
 pip:
-  - "22.1.2"
+  - "22.2.2"
 pkg_config:
   - "0.29.2"
 psutil:
-  - "5.9.1"
+  - "5.9.2"
 pybind11:
-  - "2.9.2"
+  - "2.10.0"
 pysoundfile:
-  - "0.10.3"
+  - "0.10.3.post1"
 pytest:
-  - "7.1.2"
+  - "7.1.3"
 pytest_cov:
   - "3.0.0"
 python_graphviz:
-  - "0.20"
+  - "0.20.1"
 pytorch:
-  - "1.11.0 cuda*"  # [linux]
-  - "1.11.0"  # [osx]
+  - "1.12.1 cuda*"  # [linux]
+  - "1.12.1"  # [osx]
 pytorch_lightning:
-  - "1.6.4"
+  - "1.6.5"
 pyyaml:
   - "6.0"
 pyzmq:
-  - "23.2.0"
+  - "24.0.0"
 requests:
-  - "2.28.0"
+  - "2.28.1"
 schema:
   - "0.7.5"
 scikit_image:
   - "0.19.3"
 scikit_learn:
-  - "1.1.1"
+  - "1.1.2"
 scipy:
-  - "1.8.1"
+  - "1.9.1"
 setuptools:
   - "59.5.0"
 simplejson:
@@ -467,25 +462,25 @@ sphinx_rtd_theme:
 sphinxcontrib_programoutput:
   - "0.17"
 sqlalchemy:
-  - "1.4.39"
+  - "1.4.41"
 tabulate:
   - "0.8.10"
 tensorboard:
-  - "2.8.0"
+  - "2.9.0"
 tensorflow:
-  - "2.8.1 cuda*"  # [linux]
-  - "2.8.1"  # [osx]
+  - "2.9.1 cuda*"  # [linux]
+  - "2.9.1"  # [osx]
 termcolor:
-  - "1.1.0"
-torchvision:
-  - "0.12.0"
+  - "2.0.1"
 tomli:
   - "2.0.1"
 tomli_w:
   - "1.0.0"
+torchvision:
+  - "0.13.0"
 tqdm:
-  - "4.64.0"
+  - "4.64.1"
 xarray:
-  - "2022.3.0"
+  - "2022.6.0"
 
 # AUTOMATIC PARSING END